applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deprecated GtkOptionMenu to GtkComboBox conversion. Ditto. Closes bug

Browse source 
2007-03-23  Priit Laes  <amd@store20.com>

	* gnome-window-properties.c: (double_click_titlebar_changed_callback),
	(reload_settings), (update_wm), (main): Deprecated GtkOptionMenu to
	GtkComboBox conversion.
	* gnome-window-properties.glade: Ditto.
	Closes bug #421210.


svn path=/trunk/; revision=7418
This commit is contained in:
Priit Laes 2007-03-23 18:36:35 +00:00 • committed by Priit Laes
parent 4dd31fc983
commit 8487561670
3 changed files with 25 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/windows/ChangeLog
View file

@ -1,3 +1,11 @@
2007-03-23 Priit Laes <amd@store20.com>
* gnome-window-properties.c: (double_click_titlebar_changed_callback),
(reload_settings), (update_wm), (main): Deprecated GtkOptionMenu to
GtkComboBox conversion.
* gnome-window-properties.glade: Ditto.
Closes bug #421210.
2007-02-22 Jens Granseuer <jensgr@gmx.net>
* gnome-window-properties.c: (alt_click_radio_toggled_callback),

38
capplets/windows/gnome-window-properties.c
View file

@ -111,7 +111,7 @@ double_click_titlebar_changed_callback (GtkWidget *optionmenu,
new_settings.flags = GNOME_WM_SETTING_DOUBLE_CLICK_ACTION;
new_settings.double_click_action =
gtk_option_menu_get_history (GTK_OPTION_MENU (optionmenu));
gtk_combo_box_get_active (GTK_COMBO_BOX (optionmenu));
if (current_wm != NULL && new_settings.double_click_action != settings->double_click_action)
gnome_window_manager_change_settings (current_wm, &new_settings);
@ -205,30 +205,6 @@ set_alt_click_value (const GnomeWMSettings *settings)
}
}
static void
rebuild_double_click_actions_menu (void)
{
int i;
GtkWidget *menu;
menu = gtk_menu_new ();
i = 0;
while (i < n_double_click_actions) {
GtkWidget *mi;
mi = gtk_menu_item_new_with_label (double_click_actions[i].human_readable_name);
gtk_menu_shell_append (GTK_MENU_SHELL (menu),
mi);
gtk_widget_show (mi);
++i;
}
gtk_option_menu_set_menu (GTK_OPTION_MENU (double_click_titlebar_optionmenu),
menu);
}
static void
reload_settings (void)
{
@ -265,7 +241,7 @@ reload_settings (void)
if (n_double_click_actions > 0 &&
new_settings.double_click_action != settings->double_click_action) {
gtk_option_menu_set_history (GTK_OPTION_MENU (double_click_titlebar_optionmenu),
gtk_combo_box_set_active (GTK_COMBO_BOX (double_click_titlebar_optionmenu),
new_settings.double_click_action);
}
@ -293,6 +269,8 @@ static void
update_wm (GdkScreen *screen,
gboolean load_settings)
{
int i;
g_assert (n_mouse_modifiers > 0);
if (current_wm != NULL) {
@ -316,7 +294,11 @@ update_wm (GdkScreen *screen,
}
rebuild_double_click_actions_menu ();
for (i = 0; i < n_double_click_actions; i++) {
gtk_combo_box_append_text (GTK_COMBO_BOX (double_click_titlebar_optionmenu),
double_click_actions[i].human_readable_name);
}
if (load_settings)
reload_settings ();
}
@ -450,7 +432,7 @@ main (int argc, char **argv)
set_alt_click_value (&new_settings);
gtk_range_set_value (GTK_RANGE (autoraise_delay_slider),
new_settings.autoraise_delay / 1000.0);
gtk_option_menu_set_history (GTK_OPTION_MENU (double_click_titlebar_optionmenu),
gtk_combo_box_set_active (GTK_COMBO_BOX (double_click_titlebar_optionmenu),
new_settings.double_click_action);
reload_settings (); /* must come before below signal connections */

18
capplets/windows/gnome-window-properties.glade
View file

@ -199,8 +199,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>
@ -224,7 +224,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>
@ -345,15 +345,11 @@
</child>
<child>
<widget class="GtkOptionMenu" id="double-click-titlebar-optionmenu">
<widget class="GtkComboBox" id="double-click-titlebar-optionmenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="history">-1</property>
<child>
<widget class="GtkMenu" id="menu1">
</widget>
</child>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<property name="items"></property>
</widget>
<packing>
<property name="padding">0</property>