Updating branch refs/heads/master to e50b87ae5721c8110ba86cc77d0acda18c7d88d6 (commit) from 74bb2f66a7ea49c9fabefc1cc61bdc03053be655 (commit)
commit e50b87ae5721c8110ba86cc77d0acda18c7d88d6 Author: Sean Davis <smd.seanda...@gmail.com> Date: Sun Feb 17 08:53:37 2013 -0500 GTK+3 Open Location dialog. .../{open-location.ui => open-location-3.ui} | 68 ++++++++++---------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location-3.ui similarity index 83% copy from data/interfaces/open-location.ui copy to data/interfaces/open-location-3.ui index 98eb497..69725ad 100644 --- a/data/interfaces/open-location.ui +++ b/data/interfaces/open-location-3.ui @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.24"/> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9,67 +8,64 @@ </object> <object class="GtkDialog" id="open-location"> <property name="can_focus">False</property> + <property name="border_width">5</property> <property name="title" translatable="yes">Open Network Location</property> - <property name="modal">True</property> <property name="default_width">450</property> <property name="icon_name">parole</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> + <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> + <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="cancel"> - <property name="label">gtk-cancel</property> + <object class="GtkButton" id="clear-history"> + <property name="label" translatable="yes">Clear History</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="use_stock">True</property> + <property name="image">image1</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> + <property name="secondary">True</property> + <property name="non_homogeneous">True</property> </packing> </child> <child> - <object class="GtkButton" id="open"> - <property name="label">gtk-open</property> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkButton" id="clear-history"> - <property name="label" translatable="yes">Clear History</property> + <object class="GtkButton" id="open"> + <property name="label">gtk-open</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="image">image1</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">2</property> - <property name="secondary">True</property> </packing> </child> </object> @@ -81,13 +77,13 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">5</property> <property name="spacing">12</property> <child> - <object class="GtkImage" id="image4"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="yalign">0</property> @@ -101,9 +97,10 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label1"> @@ -124,11 +121,19 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> + <property name="is_focus">True</property> <property name="has_entry">True</property> <property name="entry_text_column">0</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="input_purpose">url</property> + </object> + </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> @@ -147,15 +152,12 @@ <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> <action-widgets> + <action-widget response="0">clear-history</action-widget> <action-widget response="-6">cancel</action-widget> <action-widget response="-5">open</action-widget> - <action-widget response="0">clear-history</action-widget> </action-widgets> </object> </interface> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits