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

port from deprecated GtkOptionMenu to GtkComboBox

Browse source 
2007-05-08  Jens Granseuer  <jensgr@gmx.net>

	* gnome-mouse-properties.c: (cursor_size_from_widget),
	(setup_dialog):
	* gnome-mouse-properties.glade: port from deprecated GtkOptionMenu to
	GtkComboBox

svn path=/trunk/; revision=7575
This commit is contained in:
Jens Granseuer 2007-05-07 22:31:51 +00:00 • committed by Jens Granseuer
parent b0ea25cd5c
commit f51b1f9dea
3 changed files with 21 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
capplets/mouse/ChangeLog
View file

@ -1,3 +1,10 @@
2007-05-08 Jens Granseuer <jensgr@gmx.net>
* gnome-mouse-properties.c: (cursor_size_from_widget),
(setup_dialog):
* gnome-mouse-properties.glade: port from deprecated GtkOptionMenu to
GtkComboBox
2007-04-27 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-mouse.desktop.in.in: renamed Bugzilla product.

16
capplets/mouse/gnome-mouse-properties.c
View file

@ -279,26 +279,30 @@ cursor_size_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
GConfValue *new_value;
gint radio_val;
gint size;
radio_val = gconf_value_get_int (value);
new_value = gconf_value_new (GCONF_VALUE_INT);
switch (radio_val) {
case 0:
gconf_value_set_int (new_value, 12);
size = 12;
break;
case 1:
gconf_value_set_int (new_value, 24);
size = 24;
break;
case 2:
gconf_value_set_int (new_value, 36);
size = 36;
break;
case -1:
return NULL;
default:
g_assert_not_reached ();
break;
}
new_value = gconf_value_new (GCONF_VALUE_INT);
gconf_value_set_int (new_value, size);
return new_value;
}
@ -922,7 +926,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
gconf_peditor_new_boolean
(changeset, "/desktop/gnome/peripherals/mouse/locate_pointer", WID ("locate_pointer_toggle"), NULL);
peditor = gconf_peditor_new_select_menu
peditor = gconf_peditor_new_combo_box
(changeset, "/desktop/gnome/peripherals/mouse/cursor_size", WID ("cursor_size_omenu"),
"conv-to-widget-cb", cursor_size_to_widget,
"conv-from-widget-cb", cursor_size_from_widget,

36
capplets/mouse/gnome-mouse-properties.glade
View file

@ -629,40 +629,12 @@
</child>
<child>
<widget class="GtkOptionMenu" id="cursor_size_omenu">
<widget class="GtkComboBox" id="cursor_size_omenu">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="history">0</property>
<child internal-child="menu">
<widget class="GtkMenu" id="convertwidget1">
<property name="visible">True</property>
<child>
<widget class="GtkMenuItem" id="convertwidget2">
<property name="visible">True</property>
<property name="label" translatable="yes">Small</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget3">
<property name="visible">True</property>
<property name="label" translatable="yes">Medium</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget4">
<property name="visible">True</property>
<property name="label" translatable="yes">Large</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
</child>
<property name="items" translatable="yes">Small
Medium
Large</property>
</widget>
<packing>
<property name="padding">0</property>