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

convert all instances GtkOptionMenu to GtkComboBox

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

	* appearance-ui.c: (ui_init):
	* appearance.glade: convert all instances GtkOptionMenu to
	GtkComboBox

svn path=/trunk/; revision=7533
This commit is contained in:
Jens Granseuer 2007-05-01 16:34:32 +00:00 • committed by Jens Granseuer
parent 76b657073e
commit 0f71452a50
3 changed files with 20 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/appearance/ChangeLog
View file

@ -1,3 +1,9 @@
2007-05-01 Jens Granseuer <jensgr@gmx.net>
* appearance-ui.c: (ui_init):
* appearance.glade: convert all instances GtkOptionMenu to
GtkComboBox
2007-05-01 Jens Granseuer <jensgr@gmx.net> 2007-05-01 Jens Granseuer <jensgr@gmx.net>
* appearance-main.c: (main): * appearance-main.c: (main):

4
capplets/appearance/appearance-ui.c
View file

@ -208,9 +208,9 @@ ui_init (AppearanceData *data)
"/desktop/gnome/interface/menus_have_icons", "/desktop/gnome/interface/menus_have_icons",
NULL)); NULL));
peditor = gconf_peditor_new_select_menu peditor = gconf_peditor_new_combo_box
(NULL, "/desktop/gnome/interface/toolbar_style", (NULL, "/desktop/gnome/interface/toolbar_style",
WID ("toolbar_style_omenu"), WID ("toolbar_style_select"),
"conv-to-widget-cb", toolbar_to_widget, "conv-to-widget-cb", toolbar_to_widget,
"conv-from-widget-cb", toolbar_from_widget, "conv-from-widget-cb", toolbar_from_widget,
NULL); NULL);

58
capplets/appearance/appearance.glade
View file

@ -986,10 +986,10 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkOptionMenu" id="style_menu2"> <widget class="GtkComboBox" id="style_menu2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="focus_on_click">True</property>
<property name="label" translatable="yes">Zoom </property> <property name="items" translatable="yes">Zoom</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1090,10 +1090,10 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkOptionMenu" id="color_menu2"> <widget class="GtkComboBox" id="color_menu2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="focus_on_click">True</property>
<property name="label" translatable="yes">Solid Color </property> <property name="label" translatable="yes">Solid Color</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1238,47 +1238,13 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkOptionMenu" id="toolbar_style_omenu"> <widget class="GtkComboBox" id="toolbar_style_select">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="focus_on_click">True</property>
<property name="items" translatable="yes">Text below items
<child internal-child="menu"> Text beside items
<widget class="GtkMenu" id="toolbar_style_menu"> Icons only
<property name="visible">True</property> Text only</property>
<child>
<widget class="GtkMenuItem" id="tb_style_text_below_icons">
<property name="visible">True</property>
<property name="label" translatable="yes">Text below icons</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="tb_style_text_beside_icons">
<property name="visible">True</property>
<property name="label" translatable="yes">Text beside icons</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="tb_style_icons_only">
<property name="visible">True</property>
<property name="label" translatable="yes">Icons only</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="tb_style_text_only">
<property name="visible">True</property>
<property name="label" translatable="yes">Text only</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>