diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-accounts-dialog.c | 4 | ||||
| -rw-r--r-- | src/empathy-accounts-dialog.ui | 203 |
2 files changed, 112 insertions, 95 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 8e85a3653..8b91d7b57 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -2066,7 +2066,9 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) gtk_window_set_title (GTK_WINDOW (dialog), _("Messaging and VoIP Accounts")); gtk_window_set_role (GTK_WINDOW (dialog), "accounts"); - gtk_window_set_default_size (GTK_WINDOW (dialog), 640, -1); + /* this suggested height is so that it doesn't display the vertical scroll bar + * in the right scrolled window unless it really needs to */ + gtk_window_set_default_size (GTK_WINDOW (dialog), 780, 400); gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui index 40851ed77..db5ec0cf1 100644 --- a/src/empathy-accounts-dialog.ui +++ b/src/empathy-accounts-dialog.ui @@ -44,7 +44,7 @@ <property name="homogeneous">True</property> <child> <object class="GtkButton" id="button_add"> - <property name="label" translatable="yes">_Add…</property> + <property name="label" translatable="yes">_Add…</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -75,7 +75,7 @@ </child> <child> <object class="GtkButton" id="button_import"> - <property name="label" translatable="yes">_Import…</property> + <property name="label" translatable="yes">_Import…</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_underline">True</property> @@ -99,109 +99,124 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox214"> + <object class="GtkScrolledWindow" id="sw_details"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkHBox" id="hbox_protocol"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label_protocol"> - <property name="visible">True</property> - <property name="label" translatable="yes">Protocol:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkVBox" id="vbox_details"> + <object class="GtkViewport" id="viewport_details"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <placeholder/> - </child> + <property name="resize_mode">queue</property> + <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment_infobar"> + <object class="GtkVBox" id="vbox214"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> <child> - <placeholder/> + <object class="GtkHBox" id="hbox_protocol"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label_protocol"> + <property name="visible">True</property> + <property name="label" translatable="yes">Protocol:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment_settings"> - <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">20</property> <child> - <placeholder/> + <object class="GtkVBox" id="vbox_details"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkAlignment" id="alignment_infobar"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment_settings"> + <property name="visible">True</property> + <property name="top_padding">6</property> + <property name="left_padding">20</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame_no_protocol"> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment21"> - <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">To add a new account, you first have to install a backend for each protocol you want to use.</property> - <property name="wrap">True</property> + <object class="GtkFrame" id="frame_no_protocol"> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment21"> + <property name="visible">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">To add a new account, you first have to install a backend for each protocol you want to use.</property> + <property name="wrap">True</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label_no_protocol"> + <property name="visible">True</property> + <property name="label" translatable="yes">No protocol installed</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <placeholder/> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label_no_protocol"> - <property name="visible">True</property> - <property name="label" translatable="yes">No protocol installed</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> </object> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> <packing> @@ -209,12 +224,12 @@ </packing> </child> </object> - <object class="GtkImage" id="remove_image"> - <property name="visible">True</property> - <property name="stock">gtk-remove</property> - </object> <object class="GtkImage" id="add_image"> <property name="visible">True</property> <property name="stock">gtk-add</property> </object> + <object class="GtkImage" id="remove_image"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + </object> </interface> |