From: Marcin Krzyżanowski <marcin.krzyzanowski@hakore.com>
Date: Thu, 4 Dec 2003 22:46:31 +0000 (+0000)
Subject: - add checkbox to configure wireframe metacity mode
X-Git-Tag: auto/ac/control-center-2_4_0-12~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcontrol-center.git;a=commitdiff_plain;h=4fe84eee1a4cc3fa4de46bc338274e89e2ca4ee9

- add checkbox to configure wireframe metacity mode

Changed files:
    control-center-reduced_resources.patch -> 1.1
---

diff --git a/control-center-reduced_resources.patch b/control-center-reduced_resources.patch
new file mode 100644
index 0000000..bb8ad5a
--- /dev/null
+++ b/control-center-reduced_resources.patch
@@ -0,0 +1,213 @@
+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;
+ static GnomeWindowManager *current_wm; /* may be NULL */
+ static GtkWidget *dialog_win;
++static GtkWidget *reduced_mode_checkbutton;
+ static GtkWidget *focus_mode_checkbutton;
+ static GtkWidget *autoraise_checkbutton;
+ static GtkWidget *autoraise_delay_slider;
+@@ -64,6 +65,13 @@
+ static void reload_mouse_modifiers (void);
+ 
+ static 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 @@
+ 
+         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)
+                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (focus_mode_checkbutton),
+                                               new_settings.focus_follows_mouse);
+@@ -441,6 +452,7 @@
+         }
+         
+         dialog_win = WID ("main-dialog");
++        reduced_mode_checkbutton = WID ("reduced-mode-checkbutton");
+         focus_mode_checkbutton = WID ("focus-mode-checkbutton");
+         autoraise_checkbutton = WID ("autoraise-checkbutton");
+         autoraise_delay_slider = WID ("autoraise-delay-slider");
+@@ -482,6 +494,8 @@
+         g_signal_connect (G_OBJECT (dialog_win), "destroy",
+                           G_CALLBACK (gtk_main_quit), NULL);
+ 
++        g_signal_connect (G_OBJECT (reduced_mode_checkbutton), "toggled",
++                          G_CALLBACK (reduced_mode_toggled_callback), NULL);
+ 
+         g_signal_connect (G_OBJECT (focus_mode_checkbutton), "toggled",
+                           G_CALLBACK (mouse_focus_toggled_callback), NULL);
+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"/>
+ 
+ <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>
++		    <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="GtkHBox" id="hbox6">
++			  <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>
++			</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="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="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="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="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>