From 8644b710942ce2358ee2345ceb6bf35326dab26b Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Fri, 19 Mar 2010 11:14:51 -0700 Subject: Make the account details pane scrollable, in case the Advanced section is too large to fit on the screen all at once. Fixes Gnome bug #613272. --- src/empathy-accounts-dialog.c | 4 +- src/empathy-accounts-dialog.ui | 203 ++++++++++++++++++++++------------------- 2 files changed, 112 insertions(+), 95 deletions(-) (limited to 'src') 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 @@ True - _Add… + _Add… True True True @@ -75,7 +75,7 @@ - _Import… + _Import… True True True @@ -99,109 +99,124 @@ - + True - vertical - 18 - - - True - 6 - - - True - Protocol: - - - False - False - 0 - - - - - - - - False - False - 0 - - + True + automatic + automatic - + True - vertical - 18 - - - + queue + none - + True + vertical + 18 - + + True + 6 + + + True + Protocol: + + + False + False + 0 + + + + + + + + False + False + 0 + - - - False - 1 - - - - - True - 6 - 20 - + + True + vertical + 18 + + + + + + True + + + + + + False + 1 + + + + + True + 6 + 20 + + + + + + 2 + + + + + 1 + - - - 2 - - - - - 1 - - - - - 0 - none - - - True - 6 - 12 - - True - To add a new account, you first have to install a backend for each protocol you want to use. - True + + 0 + none + + + True + 6 + 12 + + + True + To add a new account, you first have to install a backend for each protocol you want to use. + True + + + + + + + True + No protocol installed + + + + + + + False + False + 2 + + + + - - - - - True - No protocol installed - - - - - False - False - 2 - - - - @@ -209,12 +224,12 @@ - - True - gtk-remove - True gtk-add + + True + gtk-remove + -- cgit v1.2.3 From 4eb6eb2634f170ac8dc8c44bf6293d05f5b80733 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Wed, 24 Mar 2010 10:29:16 -0700 Subject: Another way to fix Gnome bug #613272. This puts the Advanced expander content for each of the problem protocols in a scrolled window, instead of the entire Details section. --- src/empathy-accounts-dialog.c | 4 +- src/empathy-accounts-dialog.ui | 203 +++++++++++++++++++---------------------- 2 files changed, 95 insertions(+), 112 deletions(-) (limited to 'src') diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 8b91d7b57..8e85a3653 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -2066,9 +2066,7 @@ 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"); - /* 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_default_size (GTK_WINDOW (dialog), 640, -1); 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 db5ec0cf1..40851ed77 100644 --- a/src/empathy-accounts-dialog.ui +++ b/src/empathy-accounts-dialog.ui @@ -44,7 +44,7 @@ True - _Add… + _Add… True True True @@ -75,7 +75,7 @@ - _Import… + _Import… True True True @@ -99,124 +99,109 @@ - + True - True - automatic - automatic + vertical + 18 - + True - queue - none + 6 + + + True + Protocol: + + + False + False + 0 + + + + + + + + False + False + 0 + + + + + True + vertical + 18 - + + + + True - vertical - 18 - - True - 6 - - - True - Protocol: - - - False - False - 0 - - - - - - - - False - False - 0 - + + + + False + 1 + + + + + True + 6 + 20 - - True - vertical - 18 - - - - - - True - - - - - - False - 1 - - - - - True - 6 - 20 - - - - - - 2 - - - - - 1 - + + + + 2 + + + + + 1 + + + + + 0 + none + + + True + 6 + 12 - - 0 - none - - - True - 6 - 12 - - - True - To add a new account, you first have to install a backend for each protocol you want to use. - True - - - - - - - True - No protocol installed - - - - - + + True + To add a new account, you first have to install a backend for each protocol you want to use. + True - - False - False - 2 - - - - + + + True + No protocol installed + + + + + + + False + False + 2 + + + + @@ -224,12 +209,12 @@ - - True - gtk-add - True gtk-remove + + True + gtk-add + -- cgit v1.2.3 From 4bbaced7e7674a62c4c071d483e5d9f9058a6603 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Fri, 26 Mar 2010 10:57:43 -0700 Subject: Set a default empathy-accounts window size such that any scrolled Advanced section will be somewhat-reasonably-sized. --- src/empathy-accounts-dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 8e85a3653..3e8daf340 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -2066,7 +2066,7 @@ 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); + gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 450); gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); -- cgit v1.2.3