]> git.pld-linux.org Git - packages/control-center.git/commitdiff
- update for gnome 2.8, aflinta please update pl translation here
authorMarcin Krzyżanowski <marcin.krzyzanowski@hakore.com>
Fri, 17 Sep 2004 13:52:52 +0000 (13:52 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    control-center-reduced_resources.patch -> 1.3

control-center-reduced_resources.patch

index 9fd21d223405e078d4e1d67bcd7abb6c64980ef5..9afa2e8cc5ac78b818a15119d58cb9751f60977e 100644 (file)
@@ -1,48 +1,38 @@
 diff -Nuard control-center-2.4.0.orig/capplets/windows/gnome-window-properties.c control-center-2.4.0/capplets/windows/gnome-window-properties.c
 --- control-center-2.4.0.orig/capplets/windows/gnome-window-properties.c       2003-05-01 07:32:13.000000000 +0200
 +++ control-center-2.4.0/capplets/windows/gnome-window-properties.c    2003-12-04 23:09:55.000000000 +0100
-@@ -46,6 +46,7 @@
- static GladeXML *dialog;
+@@ -47,6 +47,7 @@
  static GnomeWindowManager *current_wm; /* may be NULL */
  static GtkWidget *dialog_win;
-+static GtkWidget *reduced_mode_checkbutton;
  static GtkWidget *focus_mode_checkbutton;
++static GtkWidget *reduced_mode_checkbutton;
  static GtkWidget *autoraise_checkbutton;
  static GtkWidget *autoraise_delay_slider;
-@@ -64,6 +65,13 @@
- static void reload_mouse_modifiers (void);
+ static GtkWidget *autoraise_delay_hbox;
+@@ -62,6 +63,11 @@
+ static int n_mouse_modifiers = 0;
  
- static void
+ static void reload_mouse_modifiers (void);
 +reduced_mode_toggled_callback (GtkWidget *button, void      *data)
 +{
 +      gconf_client_set_bool (gconf_client, "/apps/metacity/general/reduced_resources",
 +              gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)), NULL);
 +}
-+
-+static void
- mouse_focus_toggled_callback (GtkWidget *button,
-                               void      *data)
- {
-@@ -79,7 +87,7 @@
  
  static void
- autoraise_toggled_callback (GtkWidget *button,
--                            void      *data)
-+                              void      *data)
- {
-         GnomeWMSettings new_settings;
-@@ -271,6 +279,9 @@
+ mouse_focus_toggled_callback (GtkWidget *button,
+@@ -278,6 +284,10 @@
  
          init_settings_struct (&new_settings);
          
++
 +        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (reduced_mode_checkbutton),
 +              gconf_client_get_bool (gconf_client, "/apps/metacity/general/reduced_resources",NULL));
-+      
-         if (new_settings.focus_follows_mouse != settings.focus_follows_mouse)
++
+         if (new_settings.focus_follows_mouse != settings->focus_follows_mouse)
                  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (focus_mode_checkbutton),
                                                new_settings.focus_follows_mouse);
-@@ -441,6 +452,7 @@
+@@ -452,6 +462,7 @@
          }
          
          dialog_win = WID ("main-dialog");
@@ -50,7 +40,7 @@ diff -Nuard control-center-2.4.0.orig/capplets/windows/gnome-window-properties.c
          focus_mode_checkbutton = WID ("focus-mode-checkbutton");
          autoraise_checkbutton = WID ("autoraise-checkbutton");
          autoraise_delay_slider = WID ("autoraise-delay-slider");
-@@ -482,6 +494,8 @@
+@@ -494,6 +505,8 @@
          g_signal_connect (G_OBJECT (dialog_win), "destroy",
                            G_CALLBACK (gtk_main_quit), NULL);
  
@@ -62,162 +52,167 @@ diff -Nuard control-center-2.4.0.orig/capplets/windows/gnome-window-properties.c
 diff -Nuard control-center-2.4.0.orig/capplets/windows/gnome-window-properties.glade control-center-2.4.0/capplets/windows/gnome-window-properties.glade
 --- control-center-2.4.0.orig/capplets/windows/gnome-window-properties.glade   2003-08-04 17:33:23.000000000 +0200
 +++ control-center-2.4.0/capplets/windows/gnome-window-properties.glade        2003-12-04 21:06:38.000000000 +0100
-@@ -2,6 +2,7 @@
- <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- <glade-interface>
-+<requires lib="gnome"/>
+@@ -12,6 +12,11 @@
+   <property name="modal">False</property>
+   <property name="resizable">False</property>
+   <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+   <property name="has_separator">False</property>
  
- <widget class="GtkDialog" id="main-dialog">
-   <property name="border_width">5</property>
-@@ -74,7 +75,7 @@
-               <widget class="GtkTable" id="table1">
-                 <property name="visible">True</property>
-                 <property name="n_rows">11</property>
--                <property name="n_columns">20</property>
-+                <property name="n_columns">21</property>
-                 <property name="homogeneous">True</property>
-                 <property name="row_spacing">6</property>
-                 <property name="column_spacing">0</property>
-@@ -231,6 +232,52 @@
-                 </child>
+   <child internal-child="vbox">
+@@ -33,6 +38,7 @@
+             <property name="label">gtk-help</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
++            <property name="focus_on_click">True</property>
+             <property name="response_id">-11</property>
+           </widget>
+         </child>
+@@ -46,6 +52,7 @@
+             <property name="label">gtk-close</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
++            <property name="focus_on_click">True</property>
+             <property name="response_id">-7</property>
+           </widget>
+         </child>
+@@ -111,6 +118,7 @@
+                         <property name="label" translatable="yes">_Select windows when the mouse moves over them</property>
+                         <property name="use_underline">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
++                        <property name="focus_on_click">True</property>
+                         <property name="active">False</property>
+                         <property name="inconsistent">False</property>
+                         <property name="draw_indicator">True</property>
+@@ -141,6 +149,7 @@
+                                 <property name="label" translatable="yes">_Raise selected windows after an interval</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="relief">GTK_RELIEF_NORMAL</property>
++                                <property name="focus_on_click">True</property>
+                                 <property name="active">False</property>
+                                 <property name="inconsistent">False</property>
+                                 <property name="draw_indicator">True</property>
+@@ -200,8 +209,8 @@
+                                         <property name="inverted">False</property>
+                                         <property name="adjustment">7.7 0 10 0.2 1 0</property>
+                                         <accessibility>
+-                                              <atkrelation target="autoraise-delay-label" type="labelled-by"/>
+-                                              <atkrelation target="label1" type="labelled-by"/>
++                                          <atkrelation target="label1" type="labelled-by"/>
++                                          <atkrelation target="autoraise-delay-label" type="labelled-by"/>
+                                         </accessibility>
+                                       </widget>
+                                       <packing>
+@@ -225,7 +234,7 @@
+                                         <property name="xpad">4</property>
+                                         <property name="ypad">0</property>
+                                         <accessibility>
+-                                              <atkrelation target="autoraise-delay-slider" type="label-for"/>
++                                          <atkrelation target="autoraise-delay-slider" type="label-for"/>
+                                         </accessibility>
+                                       </widget>
+                                       <packing>
+@@ -285,6 +294,85 @@
+         </child>
  
-                 <child>
-+                  <widget class="GtkAlignment" id="alignment5">
-+                    <property name="visible">True</property>
-+                    <property name="xalign">0.5</property>
-+                    <property name="yalign">0</property>
-+                    <property name="xscale">1</property>
-+                    <property name="yscale">0</property>
+         <child>
++          <widget class="GtkVBox" id="vbox9">
++            <property name="visible">True</property>
++            <property name="homogeneous">False</property>
++            <property name="spacing">12</property>
 +
-+                    <child>
-+                      <widget class="GtkHBox" id="hbox6">
-+                        <property name="visible">True</property>
-+                        <property name="homogeneous">False</property>
-+                        <property name="spacing">6</property>
++            <child>
++              <widget class="GtkLabel" id="label6">
++                <property name="visible">True</property>
++                <property name="label" translatable="yes">&lt;b&gt;Reduced Resources&lt;/b&gt;</property>
++                <property name="use_underline">False</property>
++                <property name="use_markup">True</property>
++                <property name="justify">GTK_JUSTIFY_LEFT</property>
++                <property name="wrap">False</property>
++                <property name="selectable">False</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0.5</property>
++                <property name="xpad">0</property>
++                <property name="ypad">0</property>
++              </widget>
++              <packing>
++                <property name="padding">0</property>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++              </packing>
++            </child>
 +
-+                        <child>
-+                          <widget class="GtkLabel" id="alt-click-label">
-+                            <property name="visible">True</property>
-+                            <property name="label" translatable="yes">To _move a window, press-and-hold this key then grab the window:</property>
-+                            <property name="use_underline">True</property>
-+                            <property name="use_markup">False</property>
-+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-+                            <property name="wrap">False</property>
-+                            <property name="selectable">False</property>
-+                            <property name="xalign">0</property>
-+                            <property name="yalign">0.5</property>
-+                            <property name="xpad">0</property>
-+                            <property name="ypad">0</property>
-+                          </widget>
-+                          <packing>
-+                            <property name="padding">0</property>
-+                            <property name="expand">True</property>
-+                            <property name="fill">True</property>
-+                          </packing>
-+                        </child>
-+                      </widget>
-+                    </child>
-+                  </widget>
-+                  <packing>
-+                    <property name="left_attach">0</property>
-+                    <property name="right_attach">20</property>
-+                    <property name="top_attach">9</property>
-+                    <property name="bottom_attach">11</property>
-+                    <property name="x_options">fill</property>
-+                  </packing>
-+                </child>
++            <child>
++              <widget class="GtkHBox" id="hbox16">
++                <property name="visible">True</property>
++                <property name="homogeneous">False</property>
++                <property name="spacing">0</property>
 +
 +                <child>
-                   <widget class="GtkAlignment" id="alignment3">
-                     <property name="visible">True</property>
-                     <property name="xalign">0.5</property>
-@@ -254,8 +301,8 @@
-                   <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">20</property>
--                    <property name="top_attach">0</property>
--                    <property name="bottom_attach">2</property>
-+                    <property name="top_attach">2</property>
-+                    <property name="bottom_attach">4</property>
-                     <property name="x_options">fill</property>
-                   </packing>
-                 </child>
-@@ -284,14 +331,14 @@
-                   <packing>
-                     <property name="left_attach">1</property>
-                     <property name="right_attach">20</property>
--                    <property name="top_attach">2</property>
--                    <property name="bottom_attach">4</property>
-+                    <property name="top_attach">3</property>
-+                    <property name="bottom_attach">5</property>
-                     <property name="x_options">fill</property>
-                   </packing>
-                 </child>
-                 <child>
--                  <widget class="GtkAlignment" id="alignment5">
-+                  <widget class="GtkAlignment" id="alignment6">
-                     <property name="visible">True</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0</property>
-@@ -299,39 +346,23 @@
-                     <property name="yscale">0</property>
-                     <child>
--                      <widget class="GtkHBox" id="hbox6">
++                  <widget class="GtkVBox" id="vbox10">
++                    <property name="visible">True</property>
++                    <property name="homogeneous">False</property>
++                    <property name="spacing">12</property>
++
++                    <child>
 +                      <widget class="GtkCheckButton" id="reduced-mode-checkbutton">
-                         <property name="visible">True</property>
--                        <property name="homogeneous">False</property>
--                        <property name="spacing">6</property>
--
--                        <child>
--                          <widget class="GtkLabel" id="alt-click-label">
--                            <property name="visible">True</property>
--                            <property name="label" translatable="yes">To _move a window, press-and-hold this key then grab the window:</property>
--                            <property name="use_underline">True</property>
--                            <property name="use_markup">False</property>
--                            <property name="justify">GTK_JUSTIFY_LEFT</property>
--                            <property name="wrap">False</property>
--                            <property name="selectable">False</property>
--                            <property name="xalign">0</property>
--                            <property name="yalign">0.5</property>
--                            <property name="xpad">0</property>
--                            <property name="ypad">0</property>
--                          </widget>
--                          <packing>
--                            <property name="padding">0</property>
--                            <property name="expand">True</property>
--                            <property name="fill">True</property>
--                          </packing>
--                        </child>
++                        <property name="visible">True</property>
 +                        <property name="can_focus">True</property>
 +                        <property name="label" translatable="yes">_Use wireframe move/resize</property>
 +                        <property name="use_underline">True</property>
 +                        <property name="relief">GTK_RELIEF_NORMAL</property>
++                        <property name="focus_on_click">True</property>
 +                        <property name="active">False</property>
 +                        <property name="inconsistent">False</property>
 +                        <property name="draw_indicator">True</property>
-                       </widget>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">20</property>
--                    <property name="top_attach">9</property>
--                    <property name="bottom_attach">11</property>
-+                    <property name="top_attach">0</property>
-+                    <property name="bottom_attach">2</property>
-                     <property name="x_options">fill</property>
-                   </packing>
-                 </child>
++                      </widget>
++                      <packing>
++                        <property name="padding">0</property>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                      </packing>
++                    </child>
++                  </widget>
++                  <packing>
++                    <property name="padding">18</property>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
++                  </packing>
++                </child>
++              </widget>
++              <packing>
++                <property name="padding">0</property>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++              </packing>
++            </child>
++          </widget>
++          <packing>
++            <property name="padding">0</property>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++          </packing>
++        </child>
++
++        <child>
+           <widget class="GtkVBox" id="vbox5">
+             <property name="visible">True</property>
+             <property name="homogeneous">False</property>
 diff -Nuard control-center-2.4.0.orig/po/control-center-2.0.pot control-center-2.4.0/po/control-center-2.0.pot
 --- control-center-2.4.0.orig/po/control-center-2.0.pot        2003-08-27 21:02:41.000000000 +0200
 +++ control-center-2.4.0/po/control-center-2.0.pot     2003-12-05 00:31:19.744571640 +0100
-@@ -2323,6 +2323,10 @@
+@@ -2305,6 +2305,14 @@
  msgid "_Select windows when the mouse moves over them"
  msgstr ""
  
++#: capplets/windows/gnome-window-properties.glade.h:7
++msgid "<b>Reduced Resources</b>"
++msgstr ""
++
 +#: capplets/windows/gnome-window-properties.glade.h:7
 +msgid "_Use wireframe move/resize"
 +msgstr ""
@@ -228,10 +223,14 @@ diff -Nuard control-center-2.4.0.orig/po/control-center-2.0.pot control-center-2
 diff -Nuard control-center-2.4.0.orig/po/pl.po control-center-2.4.0/po/pl.po
 --- control-center-2.4.0.orig/po/pl.po 2003-09-02 21:34:47.000000000 +0200
 +++ control-center-2.4.0/po/pl.po      2003-12-05 00:33:08.050106696 +0100
-@@ -2408,6 +2408,10 @@
+@@ -2420,6 +2420,14 @@
  msgid "_Select windows when the mouse moves over them"
  msgstr "_Zaznaczanie okna po umieszczeniu wskaźnika nad jego obszarem"
  
++#: capplets/windows/gnome-window-properties.glade.h:7
++msgid "<b>Reduced Resources</b>"
++msgstr ""
++
 +#: capplets/windows/gnome-window-properties.glade.h:7
 +msgid "_Use wireframe move/resize"
 +msgstr "_Wyświetlaj tylko ramkę podczas przenoszenia okna"
This page took 0.151522 seconds and 4 git commands to generate.