diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2009-07-18 01:39:02 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2009-07-18 01:39:02 -0400 |
| commit | 98655aa5cae4870b377cf21b9b442fb08c4d003d (patch) | |
| tree | bd80cfcb5d8e3b2a7524d1b634b373550bc5d79c /src | |
| parent | 96bfc42462ed8e297b010a57e1be8bfc6986a180 (diff) | |
Respect the button-images setting
Streamline the construction of some buttons, with the nice side-effect
that they now obey the button-images setting. See bug 588810.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-accounts-dialog.ui | 43 | ||||
| -rw-r--r-- | src/empathy-new-chatroom-dialog.ui | 43 |
2 files changed, 14 insertions, 72 deletions
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui index cf1b23ef..da00f45d 100644 --- a/src/empathy-accounts-dialog.ui +++ b/src/empathy-accounts-dialog.ui @@ -2,6 +2,10 @@ <interface> <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkImage" id="add_image"> + <property name="stock">gtk-add</property> + <property name="icon-size">4</property> + </object> <object class="GtkDialog" id="accounts_dialog"> <property name="border_width">5</property> <property name="title" translatable="yes">Accounts</property> @@ -56,42 +60,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Add...</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> + <property name="image">add_image</property> + <property name="label" translatable="yes">_Add...</property> + <property name="use_underline">True</property> </object> <packing> <property name="position">0</property> diff --git a/src/empathy-new-chatroom-dialog.ui b/src/empathy-new-chatroom-dialog.ui index a8fccf4a..c2fb1347 100644 --- a/src/empathy-new-chatroom-dialog.ui +++ b/src/empathy-new-chatroom-dialog.ui @@ -2,6 +2,10 @@ <interface> <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkImage" id="join_image"> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">4</property> + </object> <object class="GtkDialog" id="new_chatroom_dialog"> <property name="visible">True</property> <property name="border_width">5</property> @@ -245,42 +249,9 @@ <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox29"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-jump-to</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label79"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Join</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> + <property name="image">join_image</property> + <property name="label" translatable="yes">_Join</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> |