From 7e467e04f888c24fda1a7612292474bf217eae2c Mon Sep 17 00:00:00 2001 From: Dimitur Kirov Date: Fri, 19 May 2006 22:30:23 +0000 Subject: [PATCH] shrink account and protocol comboboxes --- data/glade/add_new_contact_window.glade | 237 ++++++++++++++---------- src/dialogs.py | 10 +- 2 files changed, 142 insertions(+), 105 deletions(-) diff --git a/data/glade/add_new_contact_window.glade b/data/glade/add_new_contact_window.glade index 77d62ceb8..bb5313a53 100644 --- a/data/glade/add_new_contact_window.glade +++ b/data/glade/add_new_contact_window.glade @@ -141,24 +141,6 @@ - - - True - - False - True - - - - 1 - 2 - 2 - 3 - fill - fill - - - True @@ -244,85 +226,6 @@ - - - True - _Protocol: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - _User ID: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - uid_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - True - - - - 1 - 2 - 1 - 2 - - - - True @@ -352,11 +255,108 @@ - + True - - False - True + True + True + True + 0 + + True + * + True + + + + 1 + 2 + 2 + 3 + + + + + + + True + _User ID: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + uid_entry + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + _Protocol: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + uid_entry + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + False + 0 + + + + True + + False + True + + + 0 + False + False + + + + + + 1 @@ -367,6 +367,41 @@ fill + + + + True + False + 0 + + + + True + + False + True + + + + 0 + False + False + + + + + + + + + 1 + 2 + 1 + 2 + fill + fill + + 0 diff --git a/src/dialogs.py b/src/dialogs.py index 58ac9b086..699987a7b 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -378,10 +378,12 @@ class AddNewContactWindow: accounts = [self.account] self.xml = gtkgui_helpers.get_glade('add_new_contact_window.glade') self.account_combobox = self.xml.get_widget('account_combobox') + self.account_hbox = self.xml.get_widget('account_hbox') self.account_label = self.xml.get_widget('account_label') self.window = self.xml.get_widget('add_new_contact_window') self.uid_entry = self.xml.get_widget('uid_entry') self.protocol_combobox = self.xml.get_widget('protocol_combobox') + self.protocol_hbox = self.xml.get_widget('protocol_hbox') self.jid_entry = self.xml.get_widget('jid_entry') self.nickname_entry = self.xml.get_widget('nickname_entry') if account and len(gajim.connections) >= 2: @@ -443,16 +445,16 @@ _('Please fill in the data of the contact you want to add in account %s') %accou if not jid_agents: # There are no transports, so hide the protocol combobox and label - self.protocol_combobox.hide() - self.protocol_combobox.set_no_show_all(True) + self.protocol_hbox.hide() + self.protocol_hbox.set_no_show_all(True) protocol_label = self.xml.get_widget('protocol_label') protocol_label.hide() protocol_label.set_no_show_all(True) if self.account: self.account_label.hide() - self.account_combobox.hide() + self.account_hbox.hide() self.account_label.set_no_show_all(True) - self.account_combobox.set_no_show_all(True) + self.account_hbox.set_no_show_all(True) else: liststore = gtk.ListStore(str, str) for acct in accounts: