Commit ee187e87 authored by Stephen Browne's avatar Stephen Browne

Removed config of keep-menus-in memory and confirm panel removal

from the global properties dialog.
Both are always on now.
Someone still needs to clean up the panel-global-config.schemas file
and the code that accesses global_config.* vars that are not used anymore.
I vote for Gman to do it.
parent a546cd12
2001-12-14 Stephen Browne <stephen.browne@sun.com>
* gnome-panel-properties.c, gnome-panel-properties.glade,
gnome-panel-properties.glade.h
Removed keep menus in memory option (always on now)
Removed Confirm panel removal option (always on now)
Thu Dec 13 15:30:01 2001 George Lebl <jirka@5z.com>
* launcher.c: some fixes in getting/setting locale specific
......
......@@ -234,8 +234,7 @@ static void
load_checkboxes (void)
{
gchar* checkboxes[] = {"drawer-autoclose", "auto-raise-panel",
"confirm-panel-remove", "keep-menus-in-memory",
"enable-animations", "enable-key-bindings",
"enable-animations", "enable-key-bindings",
"auto-update-menus", NULL };
int i = 0;
......@@ -248,11 +247,12 @@ load_checkboxes (void)
checked = gconf_client_get_bool(gconf_client,key,NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox),
checked);
g_signal_connect(G_OBJECT(checkbox),"clicked",
G_CALLBACK(checkbox_clicked), key);
g_signal_connect_data(G_OBJECT(checkbox),"clicked",
G_CALLBACK(checkbox_clicked), key,
(GClosureNotify)g_free,
0 /* connect_flags */);
update_sensitive_for_checkbox(key, checked);
i++;
/*g_free(key);*/
}
}
......
......@@ -234,8 +234,7 @@ static void
load_checkboxes (void)
{
gchar* checkboxes[] = {"drawer-autoclose", "auto-raise-panel",
"confirm-panel-remove", "keep-menus-in-memory",
"enable-animations", "enable-key-bindings",
"enable-animations", "enable-key-bindings",
"auto-update-menus", NULL };
int i = 0;
......@@ -248,11 +247,12 @@ load_checkboxes (void)
checked = gconf_client_get_bool(gconf_client,key,NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox),
checked);
g_signal_connect(G_OBJECT(checkbox),"clicked",
G_CALLBACK(checkbox_clicked), key);
g_signal_connect_data(G_OBJECT(checkbox),"clicked",
G_CALLBACK(checkbox_clicked), key,
(GClosureNotify)g_free,
0 /* connect_flags */);
update_sensitive_for_checkbox(key, checked);
i++;
/*g_free(key);*/
}
}
......
......@@ -124,34 +124,6 @@ Keep panels above other windows
</widget>
</widget>
<widget>
<class>GtkCheckButton</class>
<name>confirm-panel-remove</name>
<can_focus>True</can_focus>
<label>Confirm the removal of panels with a _dialog</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkCheckButton</class>
<name>keep-menus-in-memory</name>
<can_focus>True</can_focus>
<label>_Keep menus in memory</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkCheckButton</class>
<name>auto-update-menus</name>
......@@ -226,7 +198,7 @@ Keep panels above other windows
<widget>
<class>GtkLabel</class>
<name>label13</name>
<label>Animation speed</label>
<label>Animation speed:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -274,7 +246,7 @@ Slow
<widget>
<class>GtkLabel</class>
<name>label8</name>
<label>Hide delay (ms)</label>
<label>Hide delay (ms):</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
......@@ -300,7 +272,7 @@ Slow
<widget>
<class>GtkLabel</class>
<name>label9</name>
<label>Show delay (ms)</label>
<label>Show delay (ms):</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
......@@ -565,7 +537,7 @@ Disabled
<widget>
<class>GtkLabel</class>
<name>label15</name>
<label>Popup meny key</label>
<label>Popup menu key:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
......@@ -591,7 +563,7 @@ Disabled
<widget>
<class>GtkLabel</class>
<name>label16</name>
<label>Run dialog key</label>
<label>Run dialog key:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
......
......@@ -10,18 +10,15 @@ gchar *s = N_("_Raise panels on mouse-over");
gchar *s = N_("Keep panels below other windows");
gchar *s = N_("Keep panels on same level as other windows");
gchar *s = N_("Keep panels above other windows");
gchar *s = N_("Confirm the removal of panels with a _dialog");
gchar *s = N_("_Try to avoid overlapping panels");
gchar *s = N_("_Keep menus in memory");
gchar *s = N_("Automatically re-check menus for newly installed software");
gchar *s = N_("General");
gchar *s = N_("_Enable animation");
gchar *s = N_("Animation speed");
gchar *s = N_("Animation speed:");
gchar *s = N_("Fast");
gchar *s = N_("Medium");
gchar *s = N_("Slow");
gchar *s = N_("Hide delay (ms)");
gchar *s = N_("Show delay (ms)");
gchar *s = N_("Hide delay (ms):");
gchar *s = N_("Show delay (ms):");
gchar *s = N_("Animation");
gchar *s = N_("_Enable key bindings");
gchar *s = N_("Grab key...");
......@@ -36,6 +33,6 @@ gchar *s = N_("Control-Mod1-r");
gchar *s = N_("Menu");
gchar *s = N_("Disabled");
gchar *s = N_("Mod1-F2");
gchar *s = N_("Popup meny key");
gchar *s = N_("Run dialog key");
gchar *s = N_("Popup menu key:");
gchar *s = N_("Run dialog key:");
gchar *s = N_("Key bindings");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment