aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-07-18 13:39:02 +0800
committerMatthias Clasen <mclasen@redhat.com>2009-07-18 13:39:02 +0800
commit98655aa5cae4870b377cf21b9b442fb08c4d003d (patch)
treebd80cfcb5d8e3b2a7524d1b634b373550bc5d79c
parent96bfc42462ed8e297b010a57e1be8bfc6986a180 (diff)
downloadgsoc2013-empathy-98655aa5cae4870b377cf21b9b442fb08c4d003d.tar
gsoc2013-empathy-98655aa5cae4870b377cf21b9b442fb08c4d003d.tar.gz
gsoc2013-empathy-98655aa5cae4870b377cf21b9b442fb08c4d003d.tar.bz2
gsoc2013-empathy-98655aa5cae4870b377cf21b9b442fb08c4d003d.tar.lz
gsoc2013-empathy-98655aa5cae4870b377cf21b9b442fb08c4d003d.tar.xz
gsoc2013-empathy-98655aa5cae4870b377cf21b9b442fb08c4d003d.tar.zst
gsoc2013-empathy-98655aa5cae4870b377cf21b9b442fb08c4d003d.zip
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.
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.ui84
-rw-r--r--src/empathy-accounts-dialog.ui43
-rw-r--r--src/empathy-new-chatroom-dialog.ui43
3 files changed, 28 insertions, 142 deletions
diff --git a/libempathy-gtk/empathy-new-message-dialog.ui b/libempathy-gtk/empathy-new-message-dialog.ui
index e24095fba..a7b43818c 100644
--- a/libempathy-gtk/empathy-new-message-dialog.ui
+++ b/libempathy-gtk/empathy-new-message-dialog.ui
@@ -1,6 +1,14 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
+ <object class="GtkImage" id="call_image">
+ <property name="icon_name">audio-input-microphone</property>
+ <property name="icon-size">4</property>
+ </object>
+ <object class="GtkImage" id="chat_image">
+ <property name="icon_name">im-message-new</property>
+ <property name="icon-size">4</property>
+ </object>
<object class="GtkDialog" id="new_message_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
@@ -82,41 +90,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="icon_name">audio-input-microphone</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">C_all</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">call_image</property>
+ <property name="label" translatable="yes">C_all</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="position">1</property>
@@ -128,41 +104,9 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</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="icon_name">im-message-new</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">C_hat</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">chat_image</property>
+ <property name="label" translatable="yes">C_hat</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="position">2</property>
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index cf1b23ef4..da00f45d7 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 a8fccf4a0..c2fb13470 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>