Commits

commits@gajim.org

17632 discussions

gajim: Refactor scrolling in XMLConsoleWindow
by Gajim 26 Sep '16

26 Sep '16

changeset 397061a92391 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=397061a92391 description: Refactor scrolling in XMLConsoleWindow Fixes automatic scrolling for the XMLConsole in GTK3 diffstat: src/dialogs.py | 26 +++++--------------------- 1 files changed, 5 insertions(+), 21 deletions(-) diffs (66 lines): diff -r e9644efd8b49 -r 397061a92391 src/dialogs.py --- a/src/dialogs.py Mon Sep 26 10:44:34 2016 +0200 +++ b/src/dialogs.py Mon Sep 26 10:46:22 2016 +0200 @@ -3347,9 +3347,8 @@ self.input_textview = self.xml.get_object('input_textview') self.stanzas_log_textview = self.xml.get_object('stanzas_log_textview') self.input_tv_buffer = self.input_textview.get_buffer() + self.parent = self.stanzas_log_textview.get_parent() buffer_ = self.stanzas_log_textview.get_buffer() - end_iter = buffer_.get_end_iter() - buffer_.create_mark('end', end_iter, False) self.tagIn = buffer_.create_tag('incoming') color = gajim.config.get('inmsgcolor') @@ -3436,17 +3435,6 @@ self.tagInIq.set_property('invisible', active) self.tagOutIq.set_property('invisible', active) - def scroll_to_end(self, ): - parent = self.stanzas_log_textview.get_parent() - buffer_ = self.stanzas_log_textview.get_buffer() - end_mark = buffer_.get_mark('end') - if not end_mark: - return False - self.stanzas_log_textview.scroll_to_mark(end_mark, 0, True, 0, 1) - adjustment = parent.get_hadjustment() - adjustment.set_value(0) - return False - def print_stanza(self, stanza, kind): # kind must be 'incoming' or 'outgoing' if not self.enabled: @@ -3454,13 +3442,9 @@ if not stanza: return + at_the_end = gtkgui_helpers.at_the_end(self.parent) + buffer = self.stanzas_log_textview.get_buffer() - at_the_end = False - end_iter = buffer.get_end_iter() - end_rect = self.stanzas_log_textview.get_iter_location(end_iter) - visible_rect = self.stanzas_log_textview.get_visible_rect() - if end_rect.y <= (visible_rect.y + visible_rect.height): - at_the_end = True end_iter = buffer.get_end_iter() type_ = '' @@ -3472,7 +3456,7 @@ type_ = 'iq' if type_: - type_ = kind + '_' + type_ + type_ = kind + '_' + type_ else: type_ = kind # 'incoming' or 'outgoing' @@ -3486,7 +3470,7 @@ buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') \ + '\n\n', type_) if at_the_end: - GLib.idle_add(self.scroll_to_end) + GLib.idle_add(gtkgui_helpers.scroll_to_end, self.parent) def _nec_stanza_received(self, obj): if obj.conn.name != self.account:

1 0

gajim: Fix button text in discovery window
by Gajim 25 Sep '16

25 Sep '16

changeset 2a8ba5d1ee38 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2a8ba5d1ee38 description: Fix button text in discovery window diffstat: src/disco.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 2e1f9cb8c36e -r 2a8ba5d1ee38 src/disco.py --- a/src/disco.py Sun Sep 25 23:44:38 2016 +0200 +++ b/src/disco.py Mon Sep 26 00:33:03 2016 +0200 @@ -932,7 +932,7 @@ self.window.action_buttonbox.add(self.browse_button) image = Gtk.Image.new_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON) self.browse_button.set_image(image) - label = _('_Browse') + label = _('Browse') self.browse_button.set_label(label) self.browse_button.show_all() @@ -1405,7 +1405,7 @@ self.window.action_buttonbox.add(self.execute_button) image = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.BUTTON) self.execute_button.set_image(image) - label = _('_Execute Command') + label = _('Execute Command') self.execute_button.set_label(label) self.execute_button.show_all() @@ -1420,7 +1420,7 @@ self.window.action_buttonbox.add(self.join_button) image = Gtk.Image.new_from_stock(Gtk.STOCK_CONNECT, Gtk.IconSize.BUTTON) self.join_button.set_image(image) - label = _('_Join') + label = _('Join') self.join_button.set_label(label) self.join_button.show_all() @@ -1429,7 +1429,7 @@ self.window.action_buttonbox.add(self.search_button) image = Gtk.Image.new_from_stock(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON) self.search_button.set_image(image) - label = _('_Search') + label = _('Search') self.search_button.set_label(label) self.search_button.show_all()

1 0

gajim: Catch keypress event in discovery window
by Gajim 25 Sep '16

25 Sep '16

changeset c5ed29c480f0 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c5ed29c480f0 description: Catch keypress event in discovery window diffstat: data/gui/service_discovery_window.ui | 1 + src/disco.py | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diffs (25 lines): diff -r 2a8ba5d1ee38 -r c5ed29c480f0 data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Mon Sep 26 00:33:03 2016 +0200 +++ b/data/gui/service_discovery_window.ui Mon Sep 26 01:09:52 2016 +0200 @@ -97,6 +97,7 @@ <object class="GtkEntry" id="address_entry"> <property name="can_focus">True</property> <property name="has_focus">True</property> + <signal name="key-press-event" handler="_on_entry_key_press_event" swapped="no"/> </object> </child> </object> diff -r 2a8ba5d1ee38 -r c5ed29c480f0 src/disco.py --- a/src/disco.py Mon Sep 26 00:33:03 2016 +0200 +++ b/src/disco.py Mon Sep 26 01:09:52 2016 +0200 @@ -857,6 +857,10 @@ if self.browser: self.browser.update_actions() + def _on_entry_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Return or event.keyval == Gdk.KEY_KP_Enter: + self.on_go_button_clicked(widget) + class AgentBrowser: """

1 0

gajim: Dont use deprecated method to set tooltip alignment
by Gajim 25 Sep '16

25 Sep '16

changeset 2e1f9cb8c36e in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2e1f9cb8c36e description: Dont use deprecated method to set tooltip alignment diffstat: src/chat_control.py | 3 ++- src/dataforms_widget.py | 9 ++++++--- src/tooltips.py | 38 +++++++++++++++++++++++++------------- 3 files changed, 33 insertions(+), 17 deletions(-) diffs (166 lines): diff -r 28985e72cebd -r 2e1f9cb8c36e src/chat_control.py --- a/src/chat_control.py Sun Sep 25 23:21:51 2016 +0200 +++ b/src/chat_control.py Sun Sep 25 23:44:38 2016 +0200 @@ -1573,7 +1573,8 @@ content_area = self.info_bar.get_content_area() self.info_bar_label = Gtk.Label() self.info_bar_label.set_use_markup(True) - self.info_bar_label.set_alignment(0, 0) + self.info_bar_label.set_halign(Gtk.Align.START) + self.info_bar_label.set_valign(Gtk.Align.START) content_area.add(self.info_bar_label) self.info_bar.set_no_show_all(True) widget = self.xml.get_object('vbox2') diff -r 28985e72cebd -r 2e1f9cb8c36e src/dataforms_widget.py --- a/src/dataforms_widget.py Sun Sep 25 23:21:51 2016 +0200 +++ b/src/dataforms_widget.py Sun Sep 25 23:44:38 2016 +0200 @@ -553,7 +553,8 @@ widget = Gtk.Label(label=field.value) widget.set_property('selectable', selectable) widget.set_sensitive(True) - widget.set_alignment(0.0, 0.5) + widget.set_halign(Gtk.Align.START) + widget.set_valign(Gtk.Align.CENTER) widget=decorate_with_tooltip(widget, field) self.attach(widget, 1, 2, linecounter, linecounter+1, yoptions=Gtk.AttachOptions.FILL) @@ -561,9 +562,11 @@ if commonlabel and field.label is not None: label = Gtk.Label(label=field.label) if commonlabelcenter: - label.set_alignment(0.0, 0.5) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.CENTER) else: - label.set_alignment(0.0, 0.0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label = decorate_with_tooltip(label, field) self.attach(label, 0, 1, linecounter, linecounter+1, xoptions=Gtk.AttachOptions.FILL, yoptions=Gtk.AttachOptions.FILL) diff -r 28985e72cebd -r 2e1f9cb8c36e src/tooltips.py --- a/src/tooltips.py Sun Sep 25 23:21:51 2016 +0200 +++ b/src/tooltips.py Sun Sep 25 23:44:38 2016 +0200 @@ -255,7 +255,8 @@ self.current_row += 1 self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) - self.text_label.set_alignment(0, 0) + self.text_label.set_halign(Gtk.Align.START) + self.text_label.set_valign(Gtk.Align.START) self.text_label.set_selectable(False) self.text_label.set_markup(text) self.table.attach(self.text_label, 1 + col_inc, self.current_row, @@ -292,14 +293,15 @@ image.set_from_file(f) break spacer = Gtk.Label(label=self.spacer_label) - image.set_halign(Gtk.Align.FILL) + image.set_halign(Gtk.Align.START) image.set_valign(Gtk.Align.CENTER) if indent: self.table.attach(spacer, 1, self.current_row, 1, 1) self.table.attach(image, 2, self.current_row, 1, 1) status_label = Gtk.Label() status_label.set_markup(str_status) - status_label.set_alignment(0, 0) + status_label.set_halign(Gtk.Align.START) + status_label.set_valign(Gtk.Align.START) status_label.set_line_wrap(True) self.table.attach(status_label, 3, self.current_row, 1, 1) if show_lock: @@ -363,7 +365,8 @@ self.account = None self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) - self.text_label.set_alignment(0, 0) + self.text_label.set_halign(Gtk.Align.START) + self.text_label.set_valign(Gtk.Align.START) self.text_label.set_selectable(False) self.avatar_image = Gtk.Image() @@ -432,14 +435,16 @@ label = Gtk.Label() if not properties: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) if property_[1]: label.set_markup(property_[0]) vcard_table.attach(label, 1, vcard_current_row, 1, 1) label = Gtk.Label() if not properties: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_markup(property_[1]) label.set_line_wrap(True) vcard_table.attach(label, 2, vcard_current_row, 1, 1) @@ -448,7 +453,8 @@ label.set_line_wrap(True) vcard_table.attach(label, 1, vcard_current_row, 2, 1) - self.avatar_image.set_alignment(0, 0) + self.avatar_image.set_halign(Gtk.Align.START) + self.avatar_image.set_valign(Gtk.Align.START) vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1) gajim.plugin_manager.gui_extension_point('gc_tooltip_populate', self, contact, vcard_table) @@ -668,14 +674,16 @@ label = Gtk.Label() if not properties and table_size == 4: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) if property_[1]: label.set_markup(property_[0]) vcard_table.attach(label, 1, vcard_current_row, 1, 1) label = Gtk.Label() if not properties and table_size == 4: label.set_vexpand(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_markup(property_[1]) label.set_line_wrap(True) vcard_table.attach(label, 2, vcard_current_row, 1, 1) @@ -686,7 +694,8 @@ else: label = property_[0] vcard_table.attach(label, 1, vcard_current_row, 2, 1) - self.avatar_image.set_alignment(0, 0) + self.avatar_image.set_halign(Gtk.Align.START) + self.avatar_image.set_valign(Gtk.Align.START) if table_size == 4: vcard_table.attach(self.avatar_image, 3, 2, 1, vcard_current_row - 1) @@ -793,12 +802,14 @@ property_ = properties.pop(0) current_row += 1 label = Gtk.Label() - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_markup(property_[0]) ft_table.attach(label, 1, 2, current_row, current_row + 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) label = Gtk.Label() - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_line_wrap(True) label.set_markup(property_[1]) ft_table.attach(label, 2, 3, current_row, current_row + 1, @@ -815,7 +826,8 @@ self.create_window() label = Gtk.Label() label.set_line_wrap(True) - label.set_alignment(0, 0) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.START) label.set_selectable(False) if status == 1: label.set_text(

1 0

gajim: Convert basestring to str
by Gajim 25 Sep '16

25 Sep '16

changeset 28985e72cebd in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=28985e72cebd description: Convert basestring to str Type basestring doesnt exist in python3 anymore diffstat: src/common/dataforms.py | 10 +++++----- src/groups.py | 4 ++-- src/gtkgui_helpers.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diffs (74 lines): diff -r 2d8e089a77b0 -r 28985e72cebd src/common/dataforms.py --- a/src/common/dataforms.py Sun Sep 25 23:07:46 2016 +0200 +++ b/src/common/dataforms.py Sun Sep 25 23:21:51 2016 +0200 @@ -146,7 +146,7 @@ return t def fset(self, value): - assert isinstance(value, basestring) + assert isinstance(value, str) self.setAttr('type', value) return locals() @@ -160,7 +160,7 @@ return self.getAttr('var') def fset(self, value): - assert isinstance(value, basestring) + assert isinstance(value, str) self.setAttr('var', value) def fdel(self): @@ -180,7 +180,7 @@ return l def fset(self, value): - assert isinstance(value, basestring) + assert isinstance(value, str) self.setAttr('label', value) def fdel(self): @@ -198,7 +198,7 @@ return self.getTagData('desc') or '' def fset(self, value): - assert isinstance(value, basestring) + assert isinstance(value, str) if value == '': fdel(self) else: @@ -351,7 +351,7 @@ return self.getTagData('value') or '' def fset(self, value): - assert isinstance(value, basestring) + assert isinstance(value, str) if value == '' and not self.required: return fdel(self) self.setTagData('value', value) diff -r 2d8e089a77b0 -r 28985e72cebd src/groups.py --- a/src/groups.py Sun Sep 25 23:07:46 2016 +0200 +++ b/src/groups.py Sun Sep 25 23:21:51 2016 +0200 @@ -31,8 +31,8 @@ Open new 'create post' window to create message for groupid on servicejid service """ - assert isinstance(servicejid, basestring) - assert isinstance(groupid, basestring) + assert isinstance(servicejid, str) + assert isinstance(groupid, str) self.account = account self.servicejid = servicejid diff -r 2d8e089a77b0 -r 28985e72cebd src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sun Sep 25 23:07:46 2016 +0200 +++ b/src/gtkgui_helpers.py Sun Sep 25 23:21:51 2016 +0200 @@ -315,7 +315,7 @@ sa, sd = self.algo, self.digest if isinstance(other, self.__class__): oa, od = other.algo, other.digest - elif isinstance(other, basestring): + elif isinstance(other, str): sa, oa, od = None, None, self.cleanID(other) elif isinstance(other, tuple) and len(other) == 2: oa, od = self.cleanID(other[0]), self.cleanID(other[1])

1 0

gajim: Dont use deprecated method to set tooltip alignment
by Gajim 25 Sep '16

25 Sep '16

changeset 2d8e089a77b0 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2d8e089a77b0 description: Dont use deprecated method to set tooltip alignment diffstat: src/tooltips.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r ad8ebf60d53c -r 2d8e089a77b0 src/tooltips.py --- a/src/tooltips.py Sun Sep 25 17:13:21 2016 +0200 +++ b/src/tooltips.py Sun Sep 25 23:07:46 2016 +0200 @@ -292,7 +292,8 @@ image.set_from_file(f) break spacer = Gtk.Label(label=self.spacer_label) - image.set_alignment(1, 0.5) + image.set_halign(Gtk.Align.FILL) + image.set_valign(Gtk.Align.CENTER) if indent: self.table.attach(spacer, 1, self.current_row, 1, 1) self.table.attach(image, 2, self.current_row, 1, 1)

1 0

gajim: Replace deprecated gtk-dialog-authentication icon
by Gajim 25 Sep '16

25 Sep '16

changeset ad8ebf60d53c in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ad8ebf60d53c description: Replace deprecated gtk-dialog-authentication icon diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r a10e0df42f31 -r ad8ebf60d53c src/roster_window.py --- a/src/roster_window.py Wed Sep 21 20:07:37 2016 +0200 +++ b/src/roster_window.py Sun Sep 25 17:13:21 2016 +0200 @@ -265,7 +265,7 @@ tls_pixbuf = None if gajim.account_is_securely_connected(account): - tls_pixbuf = gtkgui_helpers.get_icon_pixmap('gtk-dialog-authentication', 24) + tls_pixbuf = gtkgui_helpers.get_icon_pixmap('changes-prevent', 16) # the only way to create a pixbuf from stock # tls_pixbuf = self.window.render_icon_pixbuf( # Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) @@ -1048,7 +1048,7 @@ if gajim.account_is_securely_connected(account) and not self.regroup or\ self.regroup and num_of_secured and num_of_secured == num_of_accounts: - tls_pixbuf = gtkgui_helpers.get_icon_pixmap('gtk-dialog-authentication', 24) + tls_pixbuf = gtkgui_helpers.get_icon_pixmap('changes-prevent', 16) # the only way to create a pixbuf from stock # tls_pixbuf = self.window.render_icon_pixbuf( # Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU)

1 0

gajim-plugins: Select correct notebook tab - Fixes #133
by Gajim Plugins 22 Sep '16

22 Sep '16

changeset 254515ca906e in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=254515ca906e description: Select correct notebook tab - Fixes #133 diffstat: plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 876860d118c4 -r 254515ca906e plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Thu Sep 08 00:55:30 2016 +0200 +++ b/plugin_installer/manifest.ini Thu Sep 22 18:57:53 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.14 +version: 0.15 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 876860d118c4 -r 254515ca906e plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Thu Sep 08 00:55:30 2016 +0200 +++ b/plugin_installer/plugin_installer.py Thu Sep 22 18:57:53 2016 +0200 @@ -102,7 +102,8 @@ self.upgrading = True self.pl_menuitem.activate() nb = gajim.interface.instances['plugins'].plugins_notebook - GLib.idle_add(nb.set_current_page, 1) + page = nb.page_num(self.hpaned) + GLib.idle_add(nb.set_current_page, page) if plugins: plugins_str = '\n'.join(plugins) YesNoDialog(_('Plugins updates'), _('Some updates are available for'

1 0

gajim-plugins: Select correct notebook tab - Fixes #133
by Gajim Plugins 22 Sep '16

22 Sep '16

changeset 32f4e9334baf in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=32f4e9334baf description: Select correct notebook tab - Fixes #133 diffstat: plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r c77d2e02ad88 -r 32f4e9334baf plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Tue Sep 20 16:41:39 2016 +0200 +++ b/plugin_installer/manifest.ini Thu Sep 22 18:53:06 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.11.30 +version: 0.11.40 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r c77d2e02ad88 -r 32f4e9334baf plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Tue Sep 20 16:41:39 2016 +0200 +++ b/plugin_installer/plugin_installer.py Thu Sep 22 18:53:06 2016 +0200 @@ -97,7 +97,8 @@ self.upgrading = True self.pl_menuitem.activate() nb = gajim.interface.instances['plugins'].plugins_notebook - gobject.idle_add(nb.set_current_page, 1) + page = nb.page_num(self.hpaned) + gobject.idle_add(nb.set_current_page, page) if plugins: plugins_str = '\n'.join(plugins) YesNoDialog(_('Plugins updates'), _('Some updates are available for'

1 0

gajim: Add transients for some MUC dialogs
by Gajim 21 Sep '16

21 Sep '16

changeset a10e0df42f31 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a10e0df42f31 description: Add transients for some MUC dialogs diffstat: src/dialogs.py | 30 ++++++++++++++++++------------ src/groupchat_control.py | 4 ++-- src/gui_interface.py | 9 ++++++--- 3 files changed, 26 insertions(+), 17 deletions(-) diffs (138 lines): diff -r 9db52e975b8a -r a10e0df42f31 src/dialogs.py --- a/src/dialogs.py Sun Sep 18 15:46:39 2016 +0200 +++ b/src/dialogs.py Wed Sep 21 20:07:37 2016 +0200 @@ -2008,7 +2008,7 @@ """ def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler, - transient_for=None): + transient_for=None): self.dialog = self.xml.get_object('input_dialog') label = self.xml.get_object('label') self.dialog.set_title(title) @@ -2053,10 +2053,11 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None, transient_for=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') - CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, - cancel_handler, transient_for=transient_for) + CommonInputDialog.__init__(self, title, label_str, is_modal, + ok_handler, cancel_handler, + transient_for=transient_for) self.input_entry = self.xml.get_object('input_entry') if input_str: self.set_entry(input_str) @@ -2080,11 +2081,13 @@ """ def __init__(self, title, label_str, checktext='', input_str=None, - is_modal=True, ok_handler=None, cancel_handler=None): + is_modal=True, ok_handler=None, cancel_handler=None, + transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') InputDialog.__init__(self, title, label_str, input_str=input_str, - is_modal=is_modal, ok_handler=ok_handler, - cancel_handler=cancel_handler) + is_modal=is_modal, ok_handler=ok_handler, + cancel_handler=cancel_handler, + transient_for=transient_for) self.input_entry = self.xml.get_object('input_entry') if input_str: self.input_entry.set_text(input_str) @@ -2125,13 +2128,15 @@ """ def __init__(self, account, room_jid, title, prompt, check_text=None, - change_nick=False): + change_nick=False, transient_for=None): """ change_nick must be set to True when we are already occupant of the room and we are changing our nick """ InputDialogCheck.__init__(self, title, '', checktext=check_text, - input_str='', is_modal=True, ok_handler=None, cancel_handler=None) + input_str='', is_modal=True, ok_handler=None, + cancel_handler=None, + transient_for=transient_for) self.room_queue = [(account, room_jid, prompt, change_nick)] self.check_next() @@ -2216,10 +2221,11 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_text_dialog.ui') - CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, - cancel_handler) + CommonInputDialog.__init__(self, title, label_str, is_modal, + ok_handler, cancel_handler, + transient_for=transient_for) self.input_buffer = self.xml.get_object('input_textview').get_buffer() if input_str: self.input_buffer.set_text(input_str) diff -r 9db52e975b8a -r a10e0df42f31 src/groupchat_control.py --- a/src/groupchat_control.py Sun Sep 18 15:46:39 2016 +0200 +++ b/src/groupchat_control.py Wed Sep 21 20:07:37 2016 +0200 @@ -2225,7 +2225,7 @@ dialogs.InputTextDialog(_('Changing Subject'), _('Please specify the new subject:'), input_str=self.subject, - ok_handler=on_ok) + ok_handler=on_ok, transient_for=self.parent_win.window) def _on_disconnect_menuitem_activate(self, widget): self.force_non_minimizable = True @@ -2240,7 +2240,7 @@ prompt = _('Please specify the new nickname you want to use:') gajim.interface.instances['change_nick_dialog'] = \ dialogs.ChangeNickDialog(self.account, self.room_jid, title, - prompt, change_nick=True) + prompt, change_nick=True, transient_for=self.parent_win.window) def _on_configure_room_menuitem_activate(self, widget): c = gajim.contacts.get_gc_contact(self.account, self.room_jid, diff -r 9db52e975b8a -r a10e0df42f31 src/gui_interface.py --- a/src/gui_interface.py Sun Sep 18 15:46:39 2016 +0200 +++ b/src/gui_interface.py Wed Sep 21 20:07:37 2016 +0200 @@ -133,7 +133,7 @@ cls(obj.pri_txt, GLib.markup_escape_text(obj.sec_txt)) - def handle_ask_new_nick(self, account, room_jid): + def handle_ask_new_nick(self, account, room_jid, parent_win): title = _('Unable to join group chat') prompt = _('Your desired nickname in group chat %s is in use or ' 'registered by another occupant.\nPlease specify another nickname ' @@ -144,7 +144,7 @@ prompt) else: self.instances['change_nick_dialog'] = dialogs.ChangeNickDialog( - account, room_jid, title, prompt) + account, room_jid, title, prompt, transient_for=parent_win) def handle_event_http_auth(self, obj): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) @@ -294,6 +294,9 @@ def handle_event_gc_presence(self, obj): gc_control = obj.gc_control + parent_win = None + if gc_control.parent_win: + parent_win = gc_control.parent_win.window if obj.ptype == 'error': if obj.errcode == '503': # maximum user number reached @@ -328,7 +331,7 @@ _('You are not in the members list in groupchat %s.') % \ obj.room_jid) elif (obj.errcode == '409') or (obj.errcon == 'conflict'): - self.handle_ask_new_nick(obj.conn.name, obj.room_jid) + self.handle_ask_new_nick(obj.conn.name, obj.room_jid, parent_win) elif gc_control: gc_control.print_conversation('Error %s: %s' % (obj.errcode, obj.errmsg))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits