[packages/control-center.git] / control-center-reduced_resources.patch

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>
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 @@
 msgid "_Select windows when the mouse moves over them"
 msgstr ""
 
+#: capplets/windows/gnome-window-properties.glade.h:7
+msgid "_Use wireframe move/resize"
+msgstr ""
+
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
 msgstr ""
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 @@
 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 "_Use wireframe move/resize"
+msgstr "_Wyświetlaj tylko ramkę podczas przenoszenia okna"
+
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
 msgstr "Ustawienia okien"
Commit	Line	Data
4fe84eee MK	1	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
	2	--- control-center-2.4.0.orig/capplets/windows/gnome-window-properties.c 2003-05-01 07:32:13.000000000 +0200
	3	+++ control-center-2.4.0/capplets/windows/gnome-window-properties.c 2003-12-04 23:09:55.000000000 +0100
	4	@@ -46,6 +46,7 @@
	5	static GladeXML *dialog;
	6	static GnomeWindowManager current_wm; / may be NULL */
	7	static GtkWidget *dialog_win;
	8	+static GtkWidget *reduced_mode_checkbutton;
	9	static GtkWidget *focus_mode_checkbutton;
	10	static GtkWidget *autoraise_checkbutton;
	11	static GtkWidget *autoraise_delay_slider;
	12	@@ -64,6 +65,13 @@
	13	static void reload_mouse_modifiers (void);
	14
	15	static void
	16	+reduced_mode_toggled_callback (GtkWidget button, void data)
	17	+{
	18	+ gconf_client_set_bool (gconf_client, "/apps/metacity/general/reduced_resources",
	19	+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)), NULL);
	20	+}
	21	+
	22	+static void
	23	mouse_focus_toggled_callback (GtkWidget *button,
	24	void *data)
	25	{
	26	@@ -79,7 +87,7 @@
	27
	28	static void
	29	autoraise_toggled_callback (GtkWidget *button,
	30	- void *data)
	31	+ void *data)
	32	{
	33	GnomeWMSettings new_settings;
	34
	35	@@ -271,6 +279,9 @@
	36
	37	init_settings_struct (&new_settings);
	38
	39	+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (reduced_mode_checkbutton),
	40	+ gconf_client_get_bool (gconf_client, "/apps/metacity/general/reduced_resources",NULL));
	41	+
	42	if (new_settings.focus_follows_mouse != settings.focus_follows_mouse)
	43	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (focus_mode_checkbutton),
	44	new_settings.focus_follows_mouse);
	45	@@ -441,6 +452,7 @@
	46	}
	47
	48	dialog_win = WID ("main-dialog");
	49	+ reduced_mode_checkbutton = WID ("reduced-mode-checkbutton");
	50	focus_mode_checkbutton = WID ("focus-mode-checkbutton");
	51	autoraise_checkbutton = WID ("autoraise-checkbutton");
	52	autoraise_delay_slider = WID ("autoraise-delay-slider");
	53	@@ -482,6 +494,8 @@
	54	g_signal_connect (G_OBJECT (dialog_win), "destroy",
	55	G_CALLBACK (gtk_main_quit), NULL);
	56
	57	+ g_signal_connect (G_OBJECT (reduced_mode_checkbutton), "toggled",
	58	+ G_CALLBACK (reduced_mode_toggled_callback), NULL);
	59
	60	g_signal_connect (G_OBJECT (focus_mode_checkbutton), "toggled",
	61	G_CALLBACK (mouse_focus_toggled_callback), NULL);
	62	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
	63	--- control-center-2.4.0.orig/capplets/windows/gnome-window-properties.glade 2003-08-04 17:33:23.000000000 +0200
	64	+++ control-center-2.4.0/capplets/windows/gnome-window-properties.glade 2003-12-04 21:06:38.000000000 +0100
65	@@ -2,6 +2,7 @@
66	<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
67
68	<glade-interface>
69	+<requires lib="gnome"/>
70
71	<widget class="GtkDialog" id="main-dialog">
72	<property name="border_width">5</property>
73	@@ -74,7 +75,7 @@
74	<widget class="GtkTable" id="table1">
75	<property name="visible">True</property>
76	<property name="n_rows">11</property>
77	- <property name="n_columns">20</property>
78	+ <property name="n_columns">21</property>
79	<property name="homogeneous">True</property>
80	<property name="row_spacing">6</property>
81	<property name="column_spacing">0</property>
82	@@ -231,6 +232,52 @@
83	</child>
84
85	<child>
86	+ <widget class="GtkAlignment" id="alignment5">
87	+ <property name="visible">True</property>
88	+ <property name="xalign">0.5</property>
89	+ <property name="yalign">0</property>
90	+ <property name="xscale">1</property>
91	+ <property name="yscale">0</property>
92	+
93	+ <child>
94	+ <widget class="GtkHBox" id="hbox6">
95	+ <property name="visible">True</property>
96	+ <property name="homogeneous">False</property>
97	+ <property name="spacing">6</property>
98	+
99	+ <child>
100	+ <widget class="GtkLabel" id="alt-click-label">
101	+ <property name="visible">True</property>
102	+ <property name="label" translatable="yes">To _move a window, press-and-hold this key then grab the window:</property>
103	+ <property name="use_underline">True</property>
104	+ <property name="use_markup">False</property>
105	+ <property name="justify">GTK_JUSTIFY_LEFT</property>
106	+ <property name="wrap">False</property>
107	+ <property name="selectable">False</property>
108	+ <property name="xalign">0</property>
109	+ <property name="yalign">0.5</property>
110	+ <property name="xpad">0</property>
111	+ <property name="ypad">0</property>
112	+ </widget>
113	+ <packing>
114	+ <property name="padding">0</property>
115	+ <property name="expand">True</property>
116	+ <property name="fill">True</property>
117	+ </packing>
118	+ </child>
119	+ </widget>
120	+ </child>
121	+ </widget>
122	+ <packing>
123	+ <property name="left_attach">0</property>
124	+ <property name="right_attach">20</property>
125	+ <property name="top_attach">9</property>
126	+ <property name="bottom_attach">11</property>
127	+ <property name="x_options">fill</property>
128	+ </packing>
129	+ </child>
130	+
131	+ <child>
132	<widget class="GtkAlignment" id="alignment3">
133	<property name="visible">True</property>
134	<property name="xalign">0.5</property>
135	@@ -254,8 +301,8 @@
136	<packing>
137	<property name="left_attach">0</property>
138	<property name="right_attach">20</property>
139	- <property name="top_attach">0</property>
140	- <property name="bottom_attach">2</property>
141	+ <property name="top_attach">2</property>
142	+ <property name="bottom_attach">4</property>
143	<property name="x_options">fill</property>
144	</packing>
145	</child>
146	@@ -284,14 +331,14 @@
147	<packing>
148	<property name="left_attach">1</property>
149	<property name="right_attach">20</property>
150	- <property name="top_attach">2</property>
151	- <property name="bottom_attach">4</property>
152	+ <property name="top_attach">3</property>
153	+ <property name="bottom_attach">5</property>
154	<property name="x_options">fill</property>
155	</packing>
156	</child>
157
158	<child>
159	- <widget class="GtkAlignment" id="alignment5">
160	+ <widget class="GtkAlignment" id="alignment6">
161	<property name="visible">True</property>
162	<property name="xalign">0.5</property>
163	<property name="yalign">0</property>
164	@@ -299,39 +346,23 @@
165	<property name="yscale">0</property>
166
167	<child>
168	- <widget class="GtkHBox" id="hbox6">
169	+ <widget class="GtkCheckButton" id="reduced-mode-checkbutton">
170	<property name="visible">True</property>
171	- <property name="homogeneous">False</property>
172	- <property name="spacing">6</property>
173	-
174	- <child>
175	- <widget class="GtkLabel" id="alt-click-label">
176	- <property name="visible">True</property>
177	- <property name="label" translatable="yes">To _move a window, press-and-hold this key then grab the window:</property>
178	- <property name="use_underline">True</property>
179	- <property name="use_markup">False</property>
180	- <property name="justify">GTK_JUSTIFY_LEFT</property>
181	- <property name="wrap">False</property>
182	- <property name="selectable">False</property>
183	- <property name="xalign">0</property>
184	- <property name="yalign">0.5</property>
185	- <property name="xpad">0</property>
186	- <property name="ypad">0</property>
187	- </widget>
188	- <packing>
189	- <property name="padding">0</property>
190	- <property name="expand">True</property>
191	- <property name="fill">True</property>
192	- </packing>
193	- </child>
194	+ <property name="can_focus">True</property>
195	+ <property name="label" translatable="yes">_Use wireframe move/resize</property>
196	+ <property name="use_underline">True</property>
197	+ <property name="relief">GTK_RELIEF_NORMAL</property>
198	+ <property name="active">False</property>
199	+ <property name="inconsistent">False</property>
200	+ <property name="draw_indicator">True</property>
201	</widget>
202	</child>
203	</widget>
204	<packing>
205	<property name="left_attach">0</property>
206	<property name="right_attach">20</property>
207	- <property name="top_attach">9</property>
208	- <property name="bottom_attach">11</property>
209	+ <property name="top_attach">0</property>
210	+ <property name="bottom_attach">2</property>
211	<property name="x_options">fill</property>
212	</packing>
213	</child>
695f4688 MK	214	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
	215	--- control-center-2.4.0.orig/po/control-center-2.0.pot 2003-08-27 21:02:41.000000000 +0200
	216	+++ control-center-2.4.0/po/control-center-2.0.pot 2003-12-05 00:31:19.744571640 +0100
	217	@@ -2323,6 +2323,10 @@
	218	msgid "_Select windows when the mouse moves over them"
	219	msgstr ""
	220
	221	+#: capplets/windows/gnome-window-properties.glade.h:7
	222	+msgid "_Use wireframe move/resize"
	223	+msgstr ""
	224	+
	225	#: capplets/windows/window-properties.desktop.in.h:1
	226	msgid "Window Properties"
	227	msgstr ""
	228	diff -Nuard control-center-2.4.0.orig/po/pl.po control-center-2.4.0/po/pl.po
	229	--- control-center-2.4.0.orig/po/pl.po 2003-09-02 21:34:47.000000000 +0200
	230	+++ control-center-2.4.0/po/pl.po 2003-12-05 00:33:08.050106696 +0100
	231	@@ -2408,6 +2408,10 @@
	232	msgid "_Select windows when the mouse moves over them"
	233	msgstr "_Zaznaczanie okna po umieszczeniu wskaźnika nad jego obszarem"
	234
	235	+#: capplets/windows/gnome-window-properties.glade.h:7
	236	+msgid "_Use wireframe move/resize"
	237	+msgstr "_Wyświetlaj tylko ramkę podczas przenoszenia okna"
	238	+
	239	#: capplets/windows/window-properties.desktop.in.h:1
	240	msgid "Window Properties"
	241	msgstr "Ustawienia okien"