aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2010-04-14 00:55:48 +0800
committerXavier Claessens <xclaesse@gmail.com>2010-04-19 17:55:58 +0800
commitbf99966390e344166336746fd821561fc8064b7d (patch)
tree779ad47179e276d5ccfdbf851eb9a837e8c438dd
parentd8ee766305ccac5a7df6678e09938d95f63a2583 (diff)
downloadgsoc2013-empathy-bf99966390e344166336746fd821561fc8064b7d.tar
gsoc2013-empathy-bf99966390e344166336746fd821561fc8064b7d.tar.gz
gsoc2013-empathy-bf99966390e344166336746fd821561fc8064b7d.tar.bz2
gsoc2013-empathy-bf99966390e344166336746fd821561fc8064b7d.tar.lz
gsoc2013-empathy-bf99966390e344166336746fd821561fc8064b7d.tar.xz
gsoc2013-empathy-bf99966390e344166336746fd821561fc8064b7d.tar.zst
gsoc2013-empathy-bf99966390e344166336746fd821561fc8064b7d.zip
Move the spinner next to the expander label in new chatroom dialog
-rw-r--r--src/empathy-new-chatroom-dialog.c8
-rw-r--r--src/empathy-new-chatroom-dialog.ui31
2 files changed, 23 insertions, 16 deletions
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 9cd439874..7c330b22c 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -65,6 +65,7 @@ typedef struct {
GtkWidget *label_room;
GtkWidget *entry_room;
GtkWidget *expander_browse;
+ GtkWidget *hbox_expander;
GtkWidget *throbber;
GtkWidget *treeview;
GtkTreeModel *model;
@@ -201,6 +202,7 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
"treeview", &dialog->treeview,
"button_join", &dialog->button_join,
"expander_browse", &dialog->expander_browse,
+ "hbox_expander", &dialog->hbox_expander,
"label_error_message", &dialog->label_error_message,
"viewport_error", &dialog->viewport_error,
NULL);
@@ -235,10 +237,8 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
/* Add throbber */
dialog->throbber = gtk_spinner_new ();
- gtk_table_attach (GTK_TABLE (dialog->table_info),
- dialog->throbber,
- 2, 3, 0, 1,
- 0, 0, 0, 0);
+ gtk_box_pack_start (GTK_BOX (dialog->hbox_expander), dialog->throbber,
+ TRUE, TRUE, 0);
/* Account chooser for custom */
dialog->account_chooser = empathy_account_chooser_new ();
diff --git a/src/empathy-new-chatroom-dialog.ui b/src/empathy-new-chatroom-dialog.ui
index 903877f20..6162d526d 100644
--- a/src/empathy-new-chatroom-dialog.ui
+++ b/src/empathy-new-chatroom-dialog.ui
@@ -3,8 +3,7 @@
<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>
+ <property name="stock">gtk-jump-to</property>
</object>
<object class="GtkDialog" id="new_chatroom_dialog">
<property name="visible">True</property>
@@ -26,7 +25,7 @@
<object class="GtkTable" id="table_info">
<property name="visible">True</property>
<property name="n_rows">3</property>
- <property name="n_columns">3</property>
+ <property name="n_columns">2</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
@@ -39,7 +38,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
@@ -68,7 +67,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
+ <property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
@@ -104,9 +103,6 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -121,7 +117,6 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkViewport" id="viewport_error">
@@ -207,9 +202,21 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkHBox" id="hbox_expander">
<property name="visible">True</property>
- <property name="label" translatable="yes">Room List</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Room List</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -243,6 +250,7 @@
</child>
<child>
<object class="GtkButton" id="button_join">
+ <property name="label" translatable="yes">_Join</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -250,7 +258,6 @@
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="image">join_image</property>
- <property name="label" translatable="yes">_Join</property>
<property name="use_underline">True</property>
</object>
<packing>