From 9ff5c310bd2dde248f12d568bc719ab78fcaafab Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 9 Nov 2014 17:32:20 +0100 Subject: [PATCH] fix opening join groupchat dialog. Fixes #7861 --- data/gui/join_groupchat_window.ui | 218 ++++++++++++++---------------- src/dialogs.py | 25 ++-- 2 files changed, 108 insertions(+), 135 deletions(-) diff --git a/data/gui/join_groupchat_window.ui b/data/gui/join_groupchat_window.ui index 9e018f731..bc625b573 100644 --- a/data/gui/join_groupchat_window.ui +++ b/data/gui/join_groupchat_window.ui @@ -1,6 +1,7 @@ + - + True False @@ -19,32 +20,85 @@ - + True False + vertical 12 - + True False - 8 - 2 - 12 6 + 12 True True - True True 1 - 2 3 - 4 - + + + + + False + True + 0 + Account + + + 0 + 0 + + + + + False + True + + + + 1 + 0 + + + + + True + False + 0 + Recently: + + + 0 + 1 + + + + + True + False + + + + 1 + 1 + + + + + True + False + 0 + Nickname: + + + 0 + 2 @@ -56,10 +110,7 @@ 1 - 2 2 - 3 - @@ -70,53 +121,20 @@ Room: + 0 3 - 4 - GTK_FILL - - + True False 0 - Nickname: + Server: - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - Recently: - - - 1 - 2 - GTK_FILL - - - - - - True - False - - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL + 0 + 4 @@ -127,10 +145,8 @@ Password: + 0 5 - 6 - GTK_FILL - @@ -142,54 +158,7 @@ 1 - 2 5 - 6 - - - - - - Join this room _automatically when I connect - True - False - True - False - True - 0 - True - - - 2 - 7 - 8 - GTK_FILL - - - - - - False - True - 0 - Account - - - GTK_FILL - - - - - - False - True - - - - 1 - 2 - GTK_FILL - GTK_FILL @@ -204,32 +173,49 @@ - 2 + 0 6 - 7 - GTK_FILL - + 2 - + + Join this room _automatically when I connect True - False + False + True + False + True 0 - Server: + True - 4 - 5 + 0 + 7 + 2 - + True False 6 - + + True + False + True + + + False + + + + + True + True + 0 + @@ -242,7 +228,7 @@ - True + False True end 1 @@ -251,10 +237,7 @@ 1 - 2 4 - 5 - GTK_EXPAND @@ -265,7 +248,7 @@ - + True False 12 @@ -308,7 +291,6 @@ False True - end 1 diff --git a/src/dialogs.py b/src/dialogs.py index 777590d80..04d0a3f1f 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -2428,6 +2428,7 @@ class JoinGroupchatWindow: self._room_jid_entry = self.xml.get_object('room_jid_entry') self._nickname_entry = self.xml.get_object('nickname_entry') self._password_entry = self.xml.get_object('password_entry') + self.server_comboboxtext = self.xml.get_object('server_comboboxtext') self._nickname_entry.set_text(nick) if password: @@ -2443,16 +2444,6 @@ class JoinGroupchatWindow: title = _('Join Group Chat') self.window.set_title(title) - - self.server_model = Gtk.ListStore(str) - self.server_comboboxentry = Gtk.ComboBox.new_with_model_and_entry( - self.server_model) - self.server_comboboxentry.set_entry_text_column(0) - hbox1 = self.xml.get_object('hbox1') - hbox1.pack_start(self.server_comboboxentry, False, False, 0) - - entry = self.server_comboboxentry.child - entry.connect('changed', self.on_server_entry_changed) self.browse_button = self.xml.get_object('browse_rooms_button') self.browse_button.set_sensitive(False) @@ -2482,7 +2473,7 @@ class JoinGroupchatWindow: server_list.append(server) for s in server_list: - self.server_model.append([s]) + self.server_comboboxtext.append_text(s) self._set_room_jid(room_jid) @@ -2544,8 +2535,8 @@ class JoinGroupchatWindow: room_jid, server = text.split('@', 1) self._room_jid_entry.set_text(room_jid) if server: - self.server_comboboxentry.get_child().set_text(server) - self.server_comboboxentry.grab_focus() + self.server_comboboxtext.get_child().set_text(server) + self.server_comboboxtext.grab_focus() def on_account_combobox_changed(self, widget): model = widget.get_model() @@ -2557,8 +2548,8 @@ class JoinGroupchatWindow: room_jid, nick = gajim.get_room_and_nick_from_fjid(full_jid) room, server = gajim.get_name_and_server_from_jid(room_jid) self._room_jid_entry.set_text(room) - model = self.server_comboboxentry.get_model() - self.server_comboboxentry.get_child().set_text(server) + model = self.server_comboboxtext.get_model() + self.server_comboboxtext.get_child().set_text(server) if nick: self._nickname_entry.set_text(nick) @@ -2569,7 +2560,7 @@ class JoinGroupchatWindow: self._set_room_jid(full_jid) def on_browse_rooms_button_clicked(self, widget): - server = self.server_comboboxentry.get_child().get_text() + server = self.server_comboboxtext.get_child().get_text() self.requested_jid = server gajim.connections[self.account].discoverInfo(server) @@ -2636,7 +2627,7 @@ class JoinGroupchatWindow: 'groupchat.')) return nickname = self._nickname_entry.get_text() - server = self.server_comboboxentry.get_child().get_text() + server = self.server_comboboxtext.get_child().get_text() room = self._room_jid_entry.get_text().strip() room_jid = room + '@' + server password = self._password_entry.get_text()