Fix the support for both_horiz as the toolbar style.
2002-05-06 Anders Carlsson <andersca@gnu.org> * gnome-ui-properties.c: (create_dialog): Fix the support for both_horiz as the toolbar style. * gnome-ui-properties.glade: Re-add all option menu items; Somehow they got lost.
This commit is contained in:
Anders Carlsson
Anders Carlsson
parent
55803cc239
commit
013a056251
3 changed files with 132 additions and 25 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2002-05-06 Anders Carlsson <andersca@gnu.org>
|
||||
|
||||
* gnome-ui-properties.c: (create_dialog):
|
||||
Fix the support for both_horiz as the toolbar style.
|
||||
|
||||
* gnome-ui-properties.glade:
|
||||
Re-add all option menu items; Somehow they got lost.
|
||||
|
||||
2002-04-29 Kjartan Maraas <kmaraas@gnome.org>
|
||||
|
||||
* ui-properties.glade: Remove translatable="yes" for a wrong case.
|
||||
|
|
|
|||
|
|
@ -38,9 +38,10 @@ enum
|
|||
|
||||
static GConfEnumStringPair toolbar_style_enums[] = {
|
||||
{ 0, "both" },
|
||||
{ 0, "both_horiz" },
|
||||
{ 1, "icons" },
|
||||
{ 2, "text" }
|
||||
{ 1, "both_horiz" },
|
||||
{ 2, "icons" },
|
||||
{ 3, "text" },
|
||||
{ -1, NULL },
|
||||
};
|
||||
|
||||
static GConfValue *
|
||||
|
|
@ -92,7 +93,6 @@ create_dialog (void)
|
|||
GladeXML *dialog;
|
||||
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
|
||||
/* dialog = glade_xml_new ("gnome2-ui-properties.glade", "gnome_ui_properties_dialog", NULL);*/
|
||||
return dialog;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
<child>
|
||||
<widget class="GtkFrame" id="frame4">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Toolbar</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
|
||||
|
||||
<child>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<widget class="GtkOptionMenu" id="toolbar_style_omenu">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="history">-1</property>
|
||||
<property name="history">0</property>
|
||||
<accessibility>
|
||||
<atkaction action_name="press" description="Select the toolbar style."/>
|
||||
</accessibility>
|
||||
|
|
@ -111,18 +111,33 @@
|
|||
<child>
|
||||
<widget class="GtkMenuItem" id="convertwidget2">
|
||||
<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="convertwidget3">
|
||||
<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="convertwidget4">
|
||||
<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="text_only1">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Text Only</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="activate" handler="on_text_only1_activate" last_modification_time="Mon, 06 May 2002 07:03:54 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
|
@ -163,8 +178,8 @@
|
|||
<child>
|
||||
<widget class="GtkFrame" id="toolbar_frame">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Sample Toolbar</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
|
||||
<accessibility>
|
||||
<atkproperty name="AtkObject::accessible_description" translatable="yes">A preview of what a toolbar looks like with these settings.</atkproperty>
|
||||
|
|
@ -218,6 +233,25 @@
|
|||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label6">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Sample Toolbar</property>
|
||||
<property name="use_underline">False</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.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
|
|
@ -227,6 +261,25 @@
|
|||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label1">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Toolbar</property>
|
||||
<property name="use_underline">False</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.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
|
|
@ -238,8 +291,8 @@
|
|||
<child>
|
||||
<widget class="GtkFrame" id="frame5">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Menus</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
|
||||
|
||||
<child>
|
||||
|
|
@ -270,8 +323,8 @@
|
|||
<child>
|
||||
<widget class="GtkFrame" id="frame3">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Sample Menubar</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
|
||||
<accessibility>
|
||||
<atkproperty name="AtkObject::accessible_description" translatable="yes">A preview of what a menubar looks like with these settings.</atkproperty>
|
||||
|
|
@ -285,12 +338,14 @@
|
|||
<child>
|
||||
<widget class="GtkImageMenuItem" id="menu1">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">_Menu</property>
|
||||
<property name="use_underline">True</property>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="convertwidget8">
|
||||
<widget class="GtkImage" id="image6">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gnome-stock-about</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="icon_size">1</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
|
|
@ -300,18 +355,19 @@
|
|||
|
||||
<child>
|
||||
<widget class="GtkMenu" id="menu1_menu">
|
||||
<property name="visible">True</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImageMenuItem" id="menu_item_1">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Menu Item 1</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="activate" handler="on_menu_item_1_activate"/>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="convertwidget10">
|
||||
<widget class="GtkImage" id="image7">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-new</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="icon_size">1</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
|
|
@ -324,13 +380,15 @@
|
|||
<child>
|
||||
<widget class="GtkImageMenuItem" id="menu_item_2">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Menu Item 2</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="activate" handler="on_menu_item_2_activate"/>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="convertwidget12">
|
||||
<widget class="GtkImage" id="image8">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-open</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="icon_size">1</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
|
|
@ -343,13 +401,14 @@
|
|||
<child>
|
||||
<widget class="GtkImageMenuItem" id="menu_item_3">
|
||||
<property name="visible">True</property>
|
||||
<signal name="activate" handler="on_menu_item_3_activate"/>
|
||||
<property name="label" translatable="yes">Menu Item 3</property>
|
||||
<property name="use_underline">True</property>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="convertwidget14">
|
||||
<widget class="GtkImage" id="image9">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-save</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="icon_size">1</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
|
|
@ -368,13 +427,14 @@
|
|||
<child>
|
||||
<widget class="GtkImageMenuItem" id="menu_item_4">
|
||||
<property name="visible">True</property>
|
||||
<signal name="activate" handler="on_menu_item_5_activate"/>
|
||||
<property name="label" translatable="yes">Menu Item 4</property>
|
||||
<property name="use_underline">True</property>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="convertwidget16">
|
||||
<widget class="GtkImage" id="image10">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-print</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="icon_size">1</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
|
|
@ -393,13 +453,14 @@
|
|||
<child>
|
||||
<widget class="GtkImageMenuItem" id="menu_item_5">
|
||||
<property name="visible">True</property>
|
||||
<signal name="activate" handler="on_menu_item_6_activate"/>
|
||||
<property name="label" translatable="yes">Menu Item 5</property>
|
||||
<property name="use_underline">True</property>
|
||||
|
||||
<child internal-child="image">
|
||||
<widget class="GtkImage" id="convertwidget18">
|
||||
<widget class="GtkImage" id="image11">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-quit</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="icon_size">1</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
|
|
@ -414,6 +475,25 @@
|
|||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label8">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Sample Menubar</property>
|
||||
<property name="use_underline">False</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.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
|
|
@ -423,6 +503,25 @@
|
|||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label7">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Menus</property>
|
||||
<property name="use_underline">False</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.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue