Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 06 Jul '19

06 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e9f972e by Philipp Hörist at 2019-07-06T07:47:58Z Remove unused import - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -82,7 +82,6 @@ from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.discovery import ServiceDiscoveryWindow -from gajim.gtk.accounts import AccountsWindow from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.subscription_request import SubscriptionRequestWindow View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e9f972efae8786da35143c994f2e77a4b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e9f972efae8786da35143c994f2e77a4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move Accounts menu
by Philipp Hörist 06 Jul '19

06 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7fa0b97b by Philipp Hörist at 2019-07-06T00:10:26Z Move Accounts menu Fixes #8955 - - - - - 7 changed files: - gajim/app_actions.py - gajim/application.py - gajim/data/gui/account_context_menu.ui - gajim/data/gui/application_menu.ui - gajim/data/gui/zeroconf_context_menu.ui - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -73,10 +73,14 @@ def on_plugins(action, param): def on_accounts(action, param): window = app.get_app_window(AccountsWindow) if window is None: - AccountsWindow() + window = AccountsWindow() else: window.present() + account = param.get_string() + if account: + window.select_account(account) + def on_history_manager(action, param): from gajim.history_manager import HistoryManager ===================================== gajim/application.py ===================================== @@ -392,7 +392,6 @@ class GajimApplication(Gtk.Application): general_actions = [ ('quit', app_actions.on_quit), - ('accounts', app_actions.on_accounts), ('add-account', app_actions.on_add_account), ('join-groupchat', app_actions.on_join_gc), ('manage-proxies', app_actions.on_manage_proxies), @@ -412,6 +411,11 @@ class GajimApplication(Gtk.Application): ('show-next-pending-event', app_actions.show_next_pending_event), ] + act = Gio.SimpleAction.new('accounts', GLib.VariantType.new('s')) + act.connect("activate", app_actions.on_accounts) + self.add_action(act) + self.set_accels_for_action('app.accounts::', ['<Alt>A']) + act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) act.connect("activate", app_actions.on_add_contact_jid) self.add_action(act) ===================================== gajim/data/gui/account_context_menu.ui ===================================== @@ -84,7 +84,7 @@ <object class="GtkMenuItem" id="edit_account_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Modify Account...</property> + <property name="label" translatable="yes">_Modify Account…</property> <property name="use_underline">True</property> </object> </child> ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -67,11 +67,6 @@ </menu> <menu id="appmenu"> <section> - <item> - <attribute name="label" translatable="yes">Accounts</attribute> - <attribute name="action">app.accounts</attribute> - <attribute name="accel"><Primary><Shift>A</attribute> - </item> <item> <attribute name="label" translatable="yes">Start Chat</attribute> <attribute name="action">app.start-chat</attribute> ===================================== gajim/data/gui/zeroconf_context_menu.ui ===================================== @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="zeroconf_properties_menuitem"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Modify Account...</property> + <property name="label" translatable="yes">_Modify Account…</property> <property name="use_underline">True</property> </object> </child> ===================================== gajim/gui_menu_builder.py ===================================== @@ -807,18 +807,27 @@ def build_accounts_menu(): acc_menu = menubar.get_item_link(menu_position, 'submenu') acc_menu.remove_all() + accounts_list = sorted(app.contacts.get_accounts()) if not accounts_list: - no_accounts = _('No Accounts available') - acc_menu.append_item(Gio.MenuItem.new(no_accounts, None)) + modify_account_item = Gio.MenuItem.new(_('_Add Account…'), + 'app.accounts::') + acc_menu.append_item(modify_account_item) return + if len(accounts_list) > 1: + modify_account_item = Gio.MenuItem.new(_('_Modify Accounts…'), + 'app.accounts::') + acc_menu.append_item(modify_account_item) for acc in accounts_list: label = escape_mnemonic(app.get_account_label(acc)) acc_menu.append_submenu( label, get_account_menu(acc)) else: acc_menu = get_account_menu(accounts_list[0]) + modify_account_item = Gio.MenuItem.new(_('_Modify Account…'), + 'app.accounts::') + acc_menu.insert_item(0, modify_account_item) menubar.remove(menu_position) menubar.insert_submenu(menu_position, _('Accounts'), acc_menu) @@ -837,19 +846,21 @@ def build_bookmark_menu(account): acc_menu = menubar.get_item_link(menu_position, 'submenu') # We have more than one Account active - if acc_menu.get_item_link(0, 'submenu'): + if acc_menu.get_item_link(1, 'submenu'): for i in range(acc_menu.get_n_items()): label = acc_menu.get_item_attribute_value(i, 'label') account_label = escape_mnemonic( app.config.get_per('accounts', account, 'account_label')) if label.get_string() in (account_label, account): menu = acc_menu.get_item_link(i, 'submenu') + bookmark_position = 1 else: # We have only one Account active menu = acc_menu + bookmark_position = 2 label = menu.get_item_attribute_value(1, 'label').get_string() - menu.remove(1) - menu.insert_submenu(1, label, bookmark_menu) + menu.remove(bookmark_position) + menu.insert_submenu(bookmark_position, label, bookmark_menu) def get_encryption_menu(control_id, type_id, zeroconf=False): ===================================== gajim/roster_window.py ===================================== @@ -3076,14 +3076,6 @@ class RosterWindow: mw.set_active_tab(ctrl) self.remove_groupchat(jid, account, maximize=True) - def on_edit_account(self, widget, account): - window = app.get_app_window(AccountsWindow) - if window is None: - window = AccountsWindow() - else: - window.present() - window.select_account(account) - def on_change_status_message_activate(self, widget, account): show = app.SHOW_LIST[app.connections[account].connected] def on_response(message, pep_dict): @@ -4892,8 +4884,8 @@ class RosterWindow: else: pep_menuitem.set_sensitive(False) - edit_account_menuitem.connect('activate', self.on_edit_account, - account) + edit_account_menuitem.set_detailed_action_name( + 'app.accounts::%s' % account) if app.connections[account].roster_supported: add_contact_menuitem.connect('activate', self.on_add_new_contact, account) @@ -4950,8 +4942,8 @@ class RosterWindow: sub_menu.append(item) item.connect('activate', self.change_status, account, 'offline') - zeroconf_properties_menuitem.connect('activate', - self.on_edit_account, account) + zeroconf_properties_menuitem.set_detailed_action_name( + 'app.accounts::%s' % account) return account_context_menu View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7fa0b97bc1df6a1e41fb12c1ee20334642… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7fa0b97bc1df6a1e41fb12c1ee20334642… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AdvancedConfig: Layout changes and code cleanup
by Philipp Hörist 05 Jul '19

05 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f94f3b06 by Daniel Brötzmann at 2019-07-05T23:07:11Z AdvancedConfig: Layout changes and code cleanup - - - - - 4 changed files: - + gajim/data/gui/advanced_configuration.ui - − gajim/data/gui/advanced_configuration_window.ui - gajim/gtk/advanced_config.py - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/advanced_configuration.ui ===================================== @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkInfoBar" id="restart_warning"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="message_type">warning</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="content_area"> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="spacing">16</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">You should restart Gajim for some changes to take effect</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </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="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Filter</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">filter_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="filter_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="placeholder_text" translatable="yes">Type to search for values...</property> + <signal name="changed" handler="_on_filter_entry_changed" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="width_request">600</property> + <property name="height_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="advanced_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="rules_hint">True</property> + <signal name="row-activated" handler="_on_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"> + <signal name="changed" handler="_on_treeview_selection_changed" swapped="no"/> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">1</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Description</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="description"> + <property name="height_request">40</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="wrap">True</property> + <property name="max_width_chars">60</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="reset_button"> + <property name="label" translatable="yes">_Reset Value</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Resets value to default</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_reset_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/gui/advanced_configuration_window.ui deleted ===================================== @@ -1,240 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkWindow" id="advanced_configuration_window"> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Advanced Configuration Editor (ACE)</property> - <property name="role">ace</property> - <property name="window_position">center-on-parent</property> - <property name="default_width">650</property> - <property name="default_height">540</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_advanced_configuration_window_destroy" swapped="no"/> - <child> - <placeholder/> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkInfoBar" id="restart_warning"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="message_type">warning</property> - <child internal-child="action_area"> - <object class="GtkButtonBox"> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child internal-child="content_area"> - <object class="GtkBox"> - <property name="can_focus">False</property> - <property name="spacing">16</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">You should restart Gajim for some changes to take effect</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </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="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Filter</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">advanced_entry</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="advanced_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_advanced_entry_changed" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="height_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="advanced_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="rules_hint">True</property> - <signal name="row-activated" handler="on_advanced_treeview_row_activated" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">1</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Description</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="description"> - <property name="height_request">30</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="reset_button"> - <property name="label" translatable="yes">_Reset to default</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_reset_button_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="advanced_close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_advanced_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/gtk/advanced_config.py ===================================== @@ -21,12 +21,14 @@ from enum import IntEnum, unique -from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GLib +from gi.repository import Gtk from gi.repository import Pango from gajim.common import app from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.gtk.util import get_builder @@ -37,16 +39,19 @@ class Column(IntEnum): VALUE = 1 TYPE = 2 + def rate_limit(rate): """ Call func at most *rate* times per second """ def decorator(func): timeout = [None] + def f(*args, **kwargs): if timeout[0] is not None: GLib.source_remove(timeout[0]) timeout[0] = None + def timeout_func(): func(*args, **kwargs) timeout[0] = None @@ -54,12 +59,14 @@ def rate_limit(rate): return f return decorator + def tree_model_iter_children(model, treeiter): it = model.iter_children(treeiter) while it: yield it it = model.iter_next(it) + def tree_model_pre_order(model, treeiter): yield treeiter for childiter in tree_model_iter_children(model, treeiter): @@ -67,10 +74,17 @@ def tree_model_pre_order(model, treeiter): yield it -class AdvancedConfig: - def __init__(self, transient): - self._ui = get_builder('advanced_configuration_window.ui') - self._ui.advanced_configuration_window.set_transient_for(transient) +class AdvancedConfig(Gtk.ApplicationWindow): + def __init__(self): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_name('AdvancedConfig') + self.set_title(_('Advanced Configuration Editor (ACE)')) + + self._ui = get_builder('advanced_configuration.ui') + self.add(self._ui.box) # Format: # key = option name (root/subopt/opt separated by \n then) @@ -80,53 +94,59 @@ class AdvancedConfig: # For i18n self.right_true_dict = {True: _('Activated'), False: _('Deactivated')} self.types = { - 'boolean': _('Boolean'), - 'integer': _('Integer'), - 'string': _('Text'), - 'color': _('Color')} + 'boolean': Q_('?config type:Boolean'), + 'integer': Q_('?config type:Integer'), + 'string': Q_('?config type:Text'), + 'color': Q_('?config type:Color')} treeview = self._ui.advanced_treeview self.treeview = treeview self.model = Gtk.TreeStore(str, str, str) - self.fill_model() + self._fill_model() self.model.set_sort_column_id(0, Gtk.SortType.ASCENDING) self.modelfilter = self.model.filter_new() - self.modelfilter.set_visible_func(self.visible_func) + self.modelfilter.set_visible_func(self._visible_func) renderer_text = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('Preference Name'), renderer_text, text=0) + renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) + col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), + renderer_text, text=0) treeview.insert_column(col, -1) + col.props.expand = True + col.props.sizing = Gtk.TreeViewColumnSizing.FIXED col.set_resizable(True) - renderer_text = Gtk.CellRendererText() - renderer_text.connect('edited', self.on_config_edited) - renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn(_('Value'), renderer_text, text=1) + self.renderer_text = Gtk.CellRendererText() + self.renderer_text.connect('edited', self._on_config_edited) + self.renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) + col = Gtk.TreeViewColumn( + Q_('?config:Value'), self.renderer_text, text=1) treeview.insert_column(col, -1) - col.set_cell_data_func(renderer_text, self.cb_value_column_data) - - col.props.resizable = True + col.set_cell_data_func(self.renderer_text, + self._value_column_data_callback) col.props.expand = True col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_resizable(True) renderer_text = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(_('Type'), renderer_text, text=2) + col = Gtk.TreeViewColumn(Q_('?config:Type'), renderer_text, text=2) treeview.insert_column(col, -1) col.props.sizing = Gtk.TreeViewColumnSizing.FIXED treeview.set_model(self.modelfilter) - # Connect signal for selection change - treeview.get_selection().connect('changed', - self.on_advanced_treeview_selection_changed) - + self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) - self._ui.advanced_configuration_window.show_all() - app.interface.instances['advanced_config'] = self + self.show_all() - def cb_value_column_data(self, col, cell, model, iter_, data): + def _on_key_press(self, _widget, event): + editing = self.renderer_text.get_property('editing') + if event.keyval == Gdk.KEY_Escape and not editing: + self.destroy() + + def _value_column_data_callback(self, col, cell, model, iter_, data): """ - Check if it's boolean or holds password stuff and if yes make the + Check if it's boolean or holds password stuff and if yes, make the cellrenderertext not editable, else - it's editable """ optname = model[iter_][Column.NAME] @@ -137,7 +157,7 @@ class AdvancedConfig: cell.set_property('editable', True) @staticmethod - def get_option_path(model, iter_): + def _get_option_path(model, iter_): # It looks like path made from reversed array # path[0] is the true one optname # path[1] is the key name @@ -150,11 +170,11 @@ class AdvancedConfig: parent = model.iter_parent(parent) return path - def on_advanced_treeview_selection_changed(self, treeselection): + def _on_treeview_selection_changed(self, treeselection): model, iter_ = treeselection.get_selected() # Check for GtkTreeIter if iter_: - opt_path = self.get_option_path(model, iter_) + opt_path = self._get_option_path(model, iter_) # Get text from first column in this row desc = None if len(opt_path) == 3: @@ -164,23 +184,22 @@ class AdvancedConfig: if desc: self._ui.description.set_text(desc) else: - # We talk about option description in advanced configuration editor - self._ui.description.set_text(_('(None)')) - if len(opt_path) == 3 or (len(opt_path) == 1 and not \ - model.iter_has_child(iter_)): + self._ui.description.set_text(Q_('?config description:None')) + if (len(opt_path) == 3 or + (len(opt_path) == 1 and not model.iter_has_child(iter_))): self._ui.reset_button.set_sensitive(True) else: self._ui.reset_button.set_sensitive(False) else: self._ui.reset_button.set_sensitive(False) - def remember_option(self, option, oldval, newval): + def _remember_option(self, option, oldval, newval): if option in self.changed_opts: self.changed_opts[option] = (self.changed_opts[option][0], newval) else: self.changed_opts[option] = (oldval, newval) - def on_advanced_treeview_row_activated(self, treeview, path, column): + def _on_treeview_row_activated(self, treeview, path, column): modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] option = modelrow[0] @@ -195,22 +214,26 @@ class AdvancedConfig: modelpath.up() keyrow = self.model[modelpath] key = keyrow[0] - self.remember_option(option + '\n' + key + '\n' + optname, - modelrow[1], newval) + self._remember_option( + option + '\n' + key + '\n' + optname, + modelrow[1], + newval) app.config.set_per(optname, key, option, newval) else: - self.remember_option(option, modelrow[1], newval) + self._remember_option(option, modelrow[1], newval) app.config.set(option, newval) modelrow[1] = self.right_true_dict[newval] - self.check_for_restart() + self._check_for_restart() - def check_for_restart(self): + def _check_for_restart(self): self._ui.restart_warning.hide() for opt in self.changed_opts: opt_path = opt.split('\n') if len(opt_path) == 3: - restart = app.config.get_restart_per(opt_path[2], opt_path[1], - opt_path[0]) + restart = app.config.get_restart_per( + opt_path[2], + opt_path[1], + opt_path[0]) else: restart = app.config.get_restart(opt_path[0]) if restart: @@ -219,38 +242,36 @@ class AdvancedConfig: self._ui.restart_warning.show() break - def on_config_edited(self, cell, path, text): + def _on_config_edited(self, cell, path, text): # Convert modelfilter path to model path path = Gtk.TreePath.new_from_string(path) modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] option = modelrow[0] if modelpath.get_depth() > 2: - modelpath.up() # Get parent + modelpath.up() # Get parent keyrow = self.model[modelpath] key = keyrow[0] - modelpath.up() # Get parent + modelpath.up() # Get parent optnamerow = self.model[modelpath] optname = optnamerow[0] - self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], - text) + self._remember_option( + option + '\n' + key + '\n' + optname, + modelrow[1], + text) app.config.set_per(optname, key, option, text) else: - self.remember_option(option, modelrow[1], text) + self._remember_option(option, modelrow[1], text) app.config.set(option, text) modelrow[1] = text - self.check_for_restart() - - @staticmethod - def on_advanced_configuration_window_destroy(widget): - del app.interface.instances['advanced_config'] + self._check_for_restart() - def on_reset_button_clicked(self, widget): + def _on_reset_button_clicked(self, widget): model, iter_ = self.treeview.get_selection().get_selected() # Check for GtkTreeIter if iter_: path = model.get_path(iter_) - opt_path = self.get_option_path(model, iter_) + opt_path = self._get_option_path(model, iter_) if len(opt_path) == 1: default = app.config.get_default(opt_path[0]) elif len(opt_path) == 3: @@ -267,36 +288,38 @@ class AdvancedConfig: optname = optnamerow[0] keyrow = self.model[modelpath[:2]] key = keyrow[0] - self.remember_option(option + '\n' + key + '\n' + optname, - modelrow[Column.VALUE], default) + self._remember_option( + option + '\n' + key + '\n' + optname, + modelrow[Column.VALUE], + default) app.config.set_per(optname, key, option, default) else: - self.remember_option(option, modelrow[Column.VALUE], default) + self._remember_option( + option, + modelrow[Column.VALUE], + default) app.config.set(option, default) modelrow[Column.VALUE] = self.right_true_dict[default] - self.check_for_restart() + self._check_for_restart() else: if str(default) == model[iter_][Column.VALUE]: return - self.on_config_edited(None, path.to_string(), str(default)) + self._on_config_edited(None, path.to_string(), str(default)) - def on_advanced_close_button_clicked(self, widget): - self._ui.advanced_configuration_window.destroy() - - def fill_model(self, node=None, parent=None): + def _fill_model(self, node=None, parent=None): for item, option in app.config.get_children(node): name = item[-1] - if option is None: # Node + if option is None: # Node newparent = self.model.append(parent, [name, '', '']) - self.fill_model(item, newparent) - else: # Leaf + self._fill_model(item, newparent) + else: if len(item) == 1: type_ = self.types[app.config.get_type(name)] elif len(item) == 3: - type_ = self.types[app.config.get_type_per(item[0], - item[2])] + type_ = self.types[app.config.get_type_per( + item[0], item[2])] if name == 'password': - value = _('Hidden') + value = Q_('?password:Hidden') else: if type_ == self.types['boolean']: value = self.right_true_dict[option] @@ -307,22 +330,22 @@ class AdvancedConfig: value = option self.model.append(parent, [name, value, type_]) - def visible_func(self, model, treeiter, data): - search_string = self._ui.advanced_entry.get_text().lower() + def _visible_func(self, model, treeiter, data): + search_string = self._ui.filter_entry.get_text().lower() for it in tree_model_pre_order(model, treeiter): if model[it][Column.TYPE] != '': - opt_path = self.get_option_path(model, it) + opt_path = self._get_option_path(model, it) if len(opt_path) == 3: desc = app.config.get_desc_per(opt_path[2], opt_path[0]) elif len(opt_path) == 1: desc = app.config.get_desc(opt_path[0]) - if search_string in model[it][Column.NAME] or (desc and \ - search_string in desc.lower()): + if (search_string in model[it][Column.NAME] or + (desc and search_string in desc.lower())): return True return False @rate_limit(3) - def on_advanced_entry_changed(self, widget): + def _on_filter_entry_changed(self, widget): self.modelfilter.refilter() if not widget.get_text(): # Maybe the expanded rows should be remembered here ... ===================================== gajim/gtk/preferences.py ===================================== @@ -1003,8 +1003,9 @@ class Preferences(Gtk.ApplicationWindow): app.set_win_debug_mode(widget.get_active()) # Advanced Config Editor (ACE) - def on_open_advanced_editor_button_clicked(self, widget, data=None): - if 'advanced_config' in app.interface.instances: - app.interface.instances['advanced_config'].window.present() + def on_open_advanced_editor_button_clicked(self, _widget): + window = app.get_app_window(AdvancedConfig) + if window is None: + AdvancedConfig() else: - app.interface.instances['advanced_config'] = AdvancedConfig(self) + window.present() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f94f3b0658f24b3169f735a9cba87a1b5d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f94f3b0658f24b3169f735a9cba87a1b5d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add View Certificate menu item to account context menu
by Philipp Hörist 05 Jul '19

05 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 20107b4c by Daniel Brötzmann at 2019-07-05T22:57:10Z Add View Certificate menu item to account context menu - - - - - 2 changed files: - gajim/data/gui/account_context_menu.ui - gajim/roster_window.py Changes: ===================================== gajim/data/gui/account_context_menu.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="account_context_menu"> @@ -66,6 +66,14 @@ <property name="use_underline">True</property> </object> </child> + <child> + <object class="GtkMenuItem" id="view_certificate_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_View Certificate</property> + <property name="use_underline">True</property> + </object> + </child> <child> <object class="GtkSeparatorMenuItem" id="seperator1"> <property name="visible">True</property> ===================================== gajim/roster_window.py ===================================== @@ -72,6 +72,7 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog +from gajim.gtk.dialogs import CertificateDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.single_message import SingleMessageWindow @@ -3585,6 +3586,11 @@ class RosterWindow: jid = jid + '/' + resource AdHocCommand(account, jid) + def on_view_certificate(self, widget, account): + con = app.connections[account] + cert = con.connection.Connection.ssl_certificate + CertificateDialog(self.window, account, cert) + def on_roster_window_focus_in_event(self, widget, event): # roster received focus, so if we had urgency REMOVE IT # NOTE: we do not have to read the message to remove urgency @@ -4812,6 +4818,8 @@ class RosterWindow: 'service_discovery_menuitem') execute_command_menuitem = xml.get_object( 'execute_command_menuitem') + view_certificate_menuitem = xml.get_object( + 'view_certificate_menuitem') edit_account_menuitem = xml.get_object('edit_account_menuitem') sub_menu = Gtk.Menu() status_menuitem.set_submenu(sub_menu) @@ -4898,6 +4906,8 @@ class RosterWindow: account=account) # Fake contact execute_command_menuitem.connect('activate', self.on_execute_command, contact, account) + view_certificate_menuitem.connect('activate', + self.on_view_certificate, account) gc_sub_menu = Gtk.Menu() # gc is always a submenu join_group_chat_menuitem.set_submenu(gc_sub_menu) @@ -4907,7 +4917,7 @@ class RosterWindow: if not app.account_is_connected(account): for widget in (add_contact_menuitem, service_discovery_menuitem, join_group_chat_menuitem, execute_command_menuitem, - pep_menuitem): + view_certificate_menuitem, pep_menuitem): widget.set_sensitive(False) else: xml = get_builder('zeroconf_context_menu.ui') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/20107b4c52786458a8392ebc4b5af3a3bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/20107b4c52786458a8392ebc4b5af3a3bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Pass only JID to bookmark module
by Philipp Hörist 05 Jul '19

05 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0557fda by Philipp Hörist at 2019-07-05T21:51:34Z Pass only JID to bookmark module Fixes #9754 - - - - - 4acecfef by Philipp Hörist at 2019-07-05T21:56:29Z MUC: Automatically set bookmarks on join/leave - When we join a MUC add a bookmark with autojoin enabled - When we leave a MUC modify the bookmark and disable autojoin - - - - - d369ff91 by Philipp Hörist at 2019-07-05T22:53:39Z Refactor MUCData - Make jid property a JID - Add occupant_jid property - nbxmpp: Use new muc_jid attribute - - - - - 8 changed files: - gajim/command_system/implementation/standard.py - gajim/common/modules/bookmarks.py - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/groupchat_control.py - gajim/gtk/discovery.py - gajim/gtk/join_groupchat.py - gajim/roster_window.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -308,6 +308,7 @@ class StandardGroupChatCommands(CommandContainer): @command('part', 'close', raw=True, empty=True) @doc(_("Leave the groupchat, optionally giving a reason, and close tab or window")) def leave(self, reason): + self.connection.get_module('MUC').leave(self.room_jid) self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND, reason) @command(raw=True, empty=True) ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -21,6 +21,7 @@ from typing import Optional import copy import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.structs import BookmarkData from nbxmpp.const import BookmarkStoreType @@ -129,7 +130,7 @@ class Bookmarks(BaseModule): if not bookmark_copy.name: # No name was given for this bookmark # Use the first part of JID instead - name = bookmark_copy.jid.split("@")[0] + name = bookmark_copy.jid.getNode() bookmark_copy = bookmark_copy._replace(name=name) if short_name: @@ -206,12 +207,33 @@ class Bookmarks(BaseModule): self._account, str(bookmark.jid), bookmark.nick, bookmark.password, minimize=minimize) - def add_bookmark(self, name, jid, autojoin, password, nick): - bookmark = BookmarkData(jid=jid, - name=name, - autojoin=autojoin, - password=password, - nick=nick) + def add_bookmark(self, + name: str, + jid: JID, + autojoin: bool, + password: str, + nick: str) -> None: + + bookmark = self.get_bookmark_from_jid(jid) + if bookmark is None: + bookmark = BookmarkData(jid=jid, + name=name, + autojoin=autojoin, + password=password, + nick=nick) + self._bookmarks.append(bookmark) + self.store_bookmarks() + + elif not bookmark.autojoin: + self.set_autojoin(jid, True) + + def set_autojoin(self, jid, enabled): + bookmark = self.get_bookmark_from_jid(jid) + if bookmark is None: + return + self._log.info('Set autojoin for: %s to %s', jid, enabled) + self._bookmarks.remove(bookmark) + bookmark = bookmark._replace(autojoin=enabled) self._bookmarks.append(bookmark) self.store_bookmarks() ===================================== gajim/common/modules/muc.py ===================================== @@ -134,39 +134,39 @@ class MUC(BaseModule): if not app.account_is_connected(self._account): return - self._muc_data[room_jid] = MUCData(room_jid, nick, - password, rejoin, config) + muc_data = MUCData(room_jid, nick, password, rejoin, config) + self._muc_data[room_jid] = muc_data self._con.get_module('Discovery').disco_muc( - room_jid, partial(self._join, room_jid)) + room_jid, partial(self._join, muc_data)) - def _join(self, room_jid): + def _join(self, muc_data): show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) - muc = self._get_muc_data(room_jid) presence = self._con.get_module('Presence').get_presence( - '%s/%s' % (room_jid, muc.nick), + muc_data.occupant_jid, show=show, status=self._con.status) muc_x = presence.setTag(nbxmpp.NS_MUC + ' x') - if room_jid is not None: - self._add_history_query(muc_x, room_jid, muc.rejoin) + self._add_history_query(muc_x, str(muc_data.jid), muc_data.rejoin) - if muc.password is not None: - muc_x.setTagData('password', muc.password) + if muc_data.password is not None: + muc_x.setTagData('password', muc_data.password) - self._log.info('Join MUC: %s', room_jid) - self._set_muc_state(room_jid, MUCJoinedState.JOINING) + self._log.info('Join MUC: %s', muc_data.jid) + self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.connection.send(presence) def leave(self, room_jid): self._log.info('Leave MUC: %s', room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) - muc = self._get_muc_data(room_jid) + muc_data = self._get_muc_data(room_jid) self._con.get_module('Presence').send_presence( - '%s/%s' % (room_jid, muc.nick), + muc_data.occupant_jid, typ='unavailable') + # We leave a group chat, disable bookmark autojoin + self._con.get_module('Bookmarks').set_autojoin(room_jid, False) def configure_room(self, room_jid): self._nbxmpp('MUC').request_config(room_jid, @@ -184,8 +184,8 @@ class MUC(BaseModule): self._log.info('Configure room: %s', result.jid) - muc = self._get_muc_data(result.jid) - self._apply_config(result.form, muc.config) + muc_data = self._get_muc_data(result.jid) + self._apply_config(result.form, muc_data.config) self.set_config(result.jid, result.form, callback=self._on_config_result) @@ -245,16 +245,15 @@ class MUC(BaseModule): def update_presence(self, auto=False): mucs = self.get_mucs_with_state([MUCJoinedState.JOINED, MUCJoinedState.JOINING]) - for muc in mucs: - self._send_presence(muc.jid, auto) + for muc_data in mucs: + self._send_presence(muc_data, auto) - def _send_presence(self, room_jid, auto): + def _send_presence(self, muc_data, auto): show = app.SHOW_LIST[self._con.connected] if show in ('invisible', 'offline'): # FIXME: Check if this return - muc = self._get_muc_data(room_jid) status = self._con.status xmpp_show = helpers.get_xmpp_show(show) @@ -265,13 +264,11 @@ class MUC(BaseModule): idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) - full_jid = '%s/%s' % (room_jid, muc.nick) - self._log.info('Send presence: %s, show: %s, status: %s, idle_time: %s', - full_jid, xmpp_show, status, idle_time) + muc_data.occupant_jid, xmpp_show, status, idle_time) self._con.get_module('Presence').send_presence( - full_jid, + muc_data.occupant_jid, show=xmpp_show, status=status, caps=True, @@ -317,13 +314,13 @@ class MUC(BaseModule): muc_x.setTag('history', tags) def _on_muc_presence(self, _con, _stanza, properties): - muc = self._get_muc_data(properties.jid.getBare()) + muc_data = self._get_muc_data(properties.muc_jid) if (properties.error.type == Error.CONFLICT and - muc.state == MUCJoinedState.JOINING): - muc.nick += '_' + muc_data.state == MUCJoinedState.JOINING): + muc_data.nick += '_' self._log.info('Nickname conflict: %s change to %s', - muc.jid, muc.nick) - self._join(muc.jid) + muc_data.jid, muc_data.nick) + self._join(muc_data) return self._raise_muc_event('muc-presence-error', properties) @@ -331,7 +328,7 @@ class MUC(BaseModule): if properties.type == PresenceType.ERROR: return - room_jid = properties.jid.getBare() + room_jid = str(properties.muc_jid) if room_jid not in self._muc_data: self._log.warning('Presence from unknown MUC') self._log.warning(stanza) @@ -347,7 +344,7 @@ class MUC(BaseModule): return contact = app.contacts.get_gc_contact(self._account, - properties.jid.getBare(), + room_jid, properties.muc_nickname) if properties.is_nickname_changed: @@ -498,7 +495,7 @@ class MUC(BaseModule): if not properties.is_muc_subject: return - jid = properties.jid.getBare() + jid = str(properties.muc_jid) contact = app.contacts.get_groupchat_contact(self._account, jid) if contact is None: return @@ -513,8 +510,15 @@ class MUC(BaseModule): nickname=properties.muc_nickname, user_timestamp=properties.user_timestamp)) - if self._get_muc_state(jid) == MUCJoinedState.JOINING: + muc_data = self._get_muc_data(jid) + if muc_data.state == MUCJoinedState.JOINING: self._set_muc_state(jid, MUCJoinedState.JOINED) + # We successfully joined a MUC, set autojoin bookmark + self._con.get_module('Bookmarks').add_bookmark(None, + muc_data.jid, + True, + muc_data.password, + muc_data.nick) raise nbxmpp.NodeProcessed @@ -530,7 +534,7 @@ class MUC(BaseModule): app.nec.push_incoming_event( NetworkEvent('muc-voice-approval', account=self._account, - room_jid=properties.jid.getBare(), + room_jid=str(properties.muc_jid), form=properties.voice_request.form)) raise nbxmpp.NodeProcessed @@ -557,7 +561,7 @@ class MUC(BaseModule): if not properties.is_muc_config_change: return - room_jid = properties.jid.getBare() + room_jid = str(properties.muc_jid) self._log.info('Received config change: %s %s', room_jid, properties.muc_status_codes) app.nec.push_incoming_event( ===================================== gajim/common/structs.py ===================================== @@ -14,6 +14,8 @@ from collections import namedtuple +from nbxmpp.protocol import JID + from gajim.common.const import MUCJoinedState URI = namedtuple('URI', 'type action data') @@ -25,7 +27,7 @@ CapsIdentity = namedtuple('CapsIdentity', 'category type name lang') class MUCData: def __init__(self, room_jid, nick, password, rejoin, config=None): - self._room_jid = room_jid + self._room_jid = JID(room_jid) self._nick = nick self._password = password self._rejoin = rejoin @@ -36,6 +38,12 @@ class MUCData: def jid(self): return self._room_jid + @property + def occupant_jid(self): + jid = self._room_jid.copy() + jid.setResource(self._nick) + return jid + @property def nick(self): return self._nick ===================================== gajim/groupchat_control.py ===================================== @@ -33,6 +33,7 @@ import logging from enum import IntEnum, unique import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation from nbxmpp.const import Role @@ -642,6 +643,7 @@ class GroupchatControl(ChatControlBase): prompt, change_nick=True, transient_for=self.parent_win.window) def _on_disconnect(self, action, param): + app.connections[self.account].get_module('MUC').leave(self.room_jid) self.force_non_minimizable = True self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND) self.force_non_minimizable = False @@ -705,7 +707,7 @@ class GroupchatControl(ChatControlBase): password = app.gc_passwords.get(self.room_jid, '') con = app.connections[self.account] con.get_module('Bookmarks').add_bookmark(self.name, - self.room_jid, + JID(self.room_jid), True, password, self.nick) @@ -2229,9 +2231,6 @@ class GroupchatControl(ChatControlBase): for handler in self._event_handlers: app.ged.remove_event_handler(*handler) - if self.is_connected: - app.connections[self.account].get_module('MUC').leave(self.room_jid) - nick_list = app.contacts.get_nick_list(self.account, self.room_jid) for nick in nick_list: # Update pm chat window ===================================== gajim/gtk/discovery.py ===================================== @@ -46,6 +46,7 @@ import weakref import uuid import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.structs import DiscoIdentity @@ -1740,7 +1741,7 @@ class MucBrowser(AgentBrowser): return con.get_module('Bookmarks').add_bookmark(room_jid.split('@')[0], - room_jid, + JID(room_jid), False, '', '') ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -17,6 +17,7 @@ from gi.repository import Gtk from gi.repository import Gdk import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.structs import DiscoIdentity @@ -267,7 +268,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Add as bookmark, with autojoin and not minimized name = app.get_nick_from_jid(self.room_jid) con.get_module('Bookmarks').add_bookmark(name, - self.room_jid, + JID(self.room_jid), autojoin, password, nickname) ===================================== gajim/roster_window.py ===================================== @@ -2965,6 +2965,7 @@ class RosterWindow: """ When disconnect menuitem is activated: disconnect from room """ + app.connections[account].get_module('MUC').leave(jid) if jid in app.interface.minimized_controls[account]: ctrl = app.interface.minimized_controls[account][jid] ctrl.shutdown() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0c9cd26a0111976f17b32f59fda533cee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0c9cd26a0111976f17b32f59fda533cee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 5 commits: JID: Add method to make the JID bare
by Philipp Hörist 05 Jul '19

05 Jul '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 90d5e6da by Philipp Hörist at 2019-07-05T20:21:20Z JID: Add method to make the JID bare - - - - - de0a912a by Philipp Hörist at 2019-07-05T20:22:03Z DiscoInfo: Add property is_muc - - - - - c5d36cd0 by Philipp Hörist at 2019-07-05T20:24:15Z JID: Use isinstance for type check - - - - - f39d0057 by Philipp Hörist at 2019-07-05T20:25:40Z JID: Add copy() method - - - - - 1795473b by Philipp Hörist at 2019-07-05T20:43:58Z Add muc_jid attribute to Message and Presence Attribute contains a bare JID object if the Message or Presence is from a MUC - - - - - 3 changed files: - nbxmpp/modules/muc.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/muc.py ===================================== @@ -97,6 +97,8 @@ class MUC: if muc is None: return properties.from_muc = True + properties.muc_jid = properties.jid.copy() + properties.muc_jid.setBare() properties.muc_nickname = properties.jid.getResource() def _process_muc_user_presence(self, _con, stanza, properties): @@ -104,6 +106,8 @@ class MUC: if muc_user is None: return properties.from_muc = True + properties.muc_jid = properties.jid.copy() + properties.muc_jid.setBare() destroy = muc_user.getTag('destroy') if destroy is not None: @@ -158,6 +162,8 @@ class MUC: def _process_groupchat_message(self, _con, stanza, properties): properties.from_muc = True + properties.muc_jid = properties.jid.copy() + properties.muc_jid.setBare() properties.muc_nickname = properties.jid.getResource() or None muc_user = stanza.getTag('x', namespace=NS_MUC_USER) @@ -185,6 +191,8 @@ class MUC: return properties.from_muc = True + properties.muc_jid = properties.jid.copy() + properties.muc_jid.setBare() if not properties.jid.isBare: return @@ -249,6 +257,8 @@ class MUC: return properties.from_muc = True + properties.muc_jid = properties.jid.copy() + properties.muc_jid.setBare() data = {} @@ -291,6 +301,9 @@ class MUC: return properties.voice_request = VoiceRequest(form=data_form) + properties.from_muc = True + properties.muc_jid = properties.jid.copy() + properties.muc_jid.setBare() @call_on_response('_affiliation_received') def get_affiliation(self, jid, affiliation): ===================================== nbxmpp/protocol.py ===================================== @@ -816,7 +816,8 @@ class JID: """ if not jid and not domain: raise ValueError('JID must contain at least domain name') - elif type(jid) == type(self): + + if isinstance(jid, JID): self.node, self.domain = jid.node, jid.domain self.resource = jid.resource elif domain: @@ -824,6 +825,9 @@ class JID: else: self.node, self.domain, self.resource = parse_jid(jid) + def copy(self): + return JID(self) + def getNode(self): """ Return the node part of the JID @@ -874,6 +878,12 @@ class JID: """ return self.__str__(0) + def setBare(self): + """ + Deletes the resource which makes the JID bare + """ + self.resource = '' + @property def isBare(self): return self.node and self.domain and not self.resource ===================================== nbxmpp/structs.py ===================================== @@ -23,6 +23,7 @@ from nbxmpp.protocol import JID from nbxmpp.protocol import NS_STANZAS from nbxmpp.protocol import NS_MAM_1 from nbxmpp.protocol import NS_MAM_2 +from nbxmpp.protocol import NS_MUC from nbxmpp.const import MessageType from nbxmpp.const import AvatarState from nbxmpp.const import StatusCode @@ -131,6 +132,15 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' except Exception: return None + @property + def is_muc(self): + for identity in self.identities: + if identity.category == 'conference': + if NS_MUC in self.features: + return True + return False + + class DiscoIdentity(namedtuple('DiscoIdentity', 'category type name lang')): @@ -236,6 +246,7 @@ class MessageProperties: self.http_auth = None self.nickname = None self.from_muc = False + self.muc_jid = None self.muc_nickname = None self.muc_status_codes = None self.muc_private_message = False @@ -364,6 +375,7 @@ class PresenceProperties: self.error = None self.avatar_sha = None self.avatar_state = AvatarState.IGNORE + self.muc_jid = None self.muc_status_codes = None self.muc_user = None self.muc_nickname = None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3946f35bfc334812d969934c4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/3946f35bfc334812d969934c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add Create Group Chat Dialog
by Philipp Hörist 04 Jul '19

04 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0c9cd26a by Daniel Brötzmann at 2019-07-04T21:26:31Z Add Create Group Chat Dialog - - - - - 7 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/const.py - gajim/data/gui/application_menu.ui - + gajim/data/gui/groupchat_creation.ui - + gajim/gtk/groupchat_creation.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -31,6 +31,7 @@ from gajim.gtk.server_info import ServerInfoDialog from gajim.gtk.mam_preferences import MamPreferences from gajim.gtk.preferences import Preferences from gajim.gtk.join_groupchat import JoinGroupchatWindow +from gajim.gtk.groupchat_creation import CreateGroupchatWindow from gajim.gtk.start_chat import StartChatDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.single_message import SingleMessageWindow @@ -151,6 +152,14 @@ def on_join_gc(_action, param): window.present() +def on_create_gc(_action, param): + window = app.get_app_window(CreateGroupchatWindow) + if window is None: + CreateGroupchatWindow(param.get_string() or None) + else: + window.present() + + def on_add_contact(_action, param): account, jid = param.get_strv() if not jid: ===================================== gajim/application.py ===================================== @@ -424,6 +424,10 @@ class GajimApplication(Gtk.Application): act.connect("activate", app_actions.open_link) self.add_action(act) + act = Gio.SimpleAction.new('create-groupchat', GLib.VariantType.new('s')) + act.connect("activate", app_actions.on_create_gc) + self.add_action(act) + act = Gio.SimpleAction.new('browse-history', GLib.VariantType.new('a{sv}')) act.connect("activate", app_actions.on_browse_history) ===================================== gajim/common/const.py ===================================== @@ -2,6 +2,7 @@ from enum import IntEnum, Enum, unique from collections import namedtuple from gajim.common.i18n import _ +from gajim.common.i18n import Q_ EncryptionData = namedtuple('EncryptionData', 'additional_data') EncryptionData.__new__.__defaults__ = (None,) # type: ignore @@ -209,6 +210,25 @@ class MUCJoinedState(Enum): return self.name +MUC_CREATION_EXAMPLES = [ + (Q_('?Group chat name:Team'), + Q_('?Group chat description:Project discussion'), + Q_('?Group chat address:team')), + (Q_('?Group chat name:Family'), + Q_('?Group chat description:Spring gathering'), + Q_('?Group chat address:family')), + (Q_('?Group chat name:Vacation'), + Q_('?Group chat description:Trip planning'), + Q_('?Group chat address:vacation')), + (Q_('?Group chat name:Repairs'), + Q_('?Group chat description:Local help group'), + Q_('?Group chat address:repairs')), + (Q_('?Group chat name:News'), + Q_('?Group chat description:Local news and reports'), + Q_('?Group chat address:news')), +] + + EME_MESSAGES = { 'urn:xmpp:otr:0': _('This message was encrypted with OTR ' ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -77,6 +77,12 @@ <attribute name="action">app.start-chat</attribute> <attribute name="accel"><Primary>N</attribute> </item> + <item> + <attribute name="label" translatable="yes">Create Group Chat</attribute> + <attribute name="action">app.create-groupchat</attribute> + <attribute name="accel"><Primary>G</attribute> + <attribute name="target"></attribute> + </item> <item> <attribute name="label" translatable="yes">Bookmarks</attribute> <attribute name="action">app.bookmarks</attribute> ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -0,0 +1,344 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="account_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkPopover" id="public_private_popover"> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="border_width">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Public or Private?</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Private:</b> If you plan to chat encrypted, you would typically want to create a private group chat. You have to invite people so they can join.</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <property name="width_chars">40</property> + <property name="max_width_chars">40</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Public:</b> Anyone who knows the address can join.</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkBox" id="create_group_chat"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Create Group Chat</property> + <property name="wrap">True</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">name_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Description</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">description_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="description_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="show_emoji_icon">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="margin_top">12</property> + <property name="label" translatable="yes">_Public</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">public_switch</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">12</property> + <property name="spacing">12</property> + <child> + <object class="GtkSwitch" id="public_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="relief">none</property> + <property name="popover">public_private_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">dialog-information-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Address</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">address_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="address_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="activate" handler="_on_address_entry_activate" swapped="no"/> + <signal name="changed" handler="_on_address_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="account_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">center</property> + <property name="model">account_liststore</property> + <property name="id_column">0</property> + <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Account</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">account_combo</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="margin_top">12</property> + <property name="spacing">12</property> + <child> + <object class="GtkSpinner" id="spinner"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="create_button"> + <property name="label" translatable="yes">_Create</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_create_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -0,0 +1,245 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import logging +import random + +from gi.repository import Gtk +from gi.repository import Gdk + +from nbxmpp.protocol import InvalidJid +from nbxmpp.protocol import JID +from nbxmpp.util import is_error_result + +from gajim.common import app +from gajim.common.const import MUC_CREATION_EXAMPLES +from gajim.common.i18n import _ + +from gajim.gtk.dialogs import ErrorDialog +from gajim.gtk.util import get_builder +from gajim.gtk.util import ensure_not_destroyed + +log = logging.getLogger('gajim.gtk.groupchat_creation') + + +class CreateGroupchatWindow(Gtk.ApplicationWindow): + def __init__(self, account): + Gtk.ApplicationWindow.__init__(self) + self.set_name('CreateGroupchat') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_resizable(True) + self.set_title(_('Create Group Chat')) + + self._ui = get_builder('groupchat_creation.ui') + self.add(self._ui.create_group_chat) + + self._destroyed = False + + not_muc_error = _('Address does not belong to a group chat server') + self._error_messages = { + 'remote-server-not-found': _('Remote server not found'), + 'remote-server-timeout': _('Remote server timeout'), + 'service-unavailable': not_muc_error, + 'subscription-required': not_muc_error, + 'not-muc-service': not_muc_error, + 'already-exists': _('Group chat already exists') + } + + self._account = self._fill_account_combo(account) + + self._create_entry_completion() + self._fill_placeholders() + + self._ui.connect_signals(self) + self.connect('key-press-event', self._on_key_press_event) + self.connect('destroy', self._on_destroy) + + self.show_all() + self.set_focus(self._ui.address_entry) + + def _fill_account_combo(self, account): + accounts = app.get_enabled_accounts_with_labels() + account_liststore = self._ui.account_combo.get_model() + for acc in accounts: + account_liststore.append(acc) + + # Hide account combobox if there is only one account + if len(accounts) == 1: + self._ui.account_combo.hide() + self._ui.account_label.hide() + + if account is None: + account = accounts[0][0] + + self._ui.account_combo.set_active_id(account) + return account + + def _create_entry_completion(self): + entry_completion = Gtk.EntryCompletion() + model = Gtk.ListStore(str) + entry_completion.set_model(model) + entry_completion.set_text_column(0) + + entry_completion.set_inline_completion(True) + entry_completion.set_popup_single_match(False) + + self._ui.address_entry.set_completion(entry_completion) + + def _fill_placeholders(self): + placeholder = random.choice(MUC_CREATION_EXAMPLES) + server = app.get_muc_domain(self._account) or 'muc.example.com' + + self._ui.name_entry.set_placeholder_text( + placeholder[0] + _(' (optional)...')) + self._ui.description_entry.set_placeholder_text( + placeholder[1] + _(' (optional)...')) + self._ui.address_entry.set_placeholder_text( + '%s@%s' % (placeholder[2], server)) + + def _on_key_press_event(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _on_account_combo_changed(self, combo): + self._account = combo.get_active_id() + self._fill_placeholders() + + def _update_entry_completion(self, entry, text): + text = entry.get_text() + if '@' in text: + text = text.split('@', 1)[0] + + model = entry.get_completion().get_model() + model.clear() + + server = app.get_muc_domain(self._account) or 'muc.example.com' + model.append(['%s@%s' % (text, server)]) + + def _validate_jid(self, text): + if not text: + self._set_warning_icon(False) + self._ui.create_button.set_sensitive(False) + return + + try: + jid = JID(text) + if jid.getResource(): + raise InvalidJid + + except InvalidJid: + self._set_warning(_('Invalid Address')) + else: + self._set_warning_icon(False) + self._ui.create_button.set_sensitive(True) + + def _set_processing_state(self, enabled): + if enabled: + self._ui.spinner.start() + self._ui.create_button.set_sensitive(False) + else: + self._ui.spinner.stop() + self._ui.grid.set_sensitive(not enabled) + + def _set_warning_icon(self, enabled): + icon = 'dialog-warning-symbolic' if enabled else None + self._ui.address_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + + def _set_warning_tooltip(self, text): + self._ui.address_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, text) + + def _set_warning(self, text): + self._set_warning_icon(True) + self._set_warning_tooltip(text) + self._ui.create_button.set_sensitive(False) + + def _set_warning_from_error(self, error): + text = self._error_messages.get(error.type, str(error)) + self._set_warning(text) + + def _set_warning_from_error_code(self, error_code): + self._set_warning(self._error_messages[error_code]) + + def _on_address_entry_changed(self, entry): + text = entry.get_text() + self._update_entry_completion(entry, text) + self._validate_jid(text) + + def _on_server_entry_changed(self, _widget): + self._update_create_button() + + def _on_address_entry_activate(self, _widget): + self._on_create_clicked() + + def _on_create_clicked(self, *args): + if not app.account_is_connected(self._account): + ErrorDialog( + _('Not Connected'), + _('You have to be connected to create a group chat.')) + return + + room_jid = self._ui.address_entry.get_text() + + self._set_processing_state(True) + con = app.connections[self._account] + con.get_module('Discovery').disco_info( + room_jid, callback=self._disco_info_received) + + @ensure_not_destroyed + def _disco_info_received(self, result): + if is_error_result(result): + if result.type == 'item-not-found': + self._create_muc(result.jid) + return + self._set_warning_from_error(result) + + else: + self._set_warning_from_error_code( + 'already-exists' if result.is_muc else 'not-muc-service') + + self._set_processing_state(False) + + def _create_muc(self, room_jid): + name = self._ui.name_entry.get_text() + description = self._ui.description_entry.get_text() + is_public = self._ui.public_switch.get_active() + + config = { + # XEP-0045 options + 'muc#roomconfig_roomname': name, + 'muc#roomconfig_roomdesc': description, + 'muc#roomconfig_publicroom': is_public, + 'muc#roomconfig_membersonly': not is_public, + 'muc#roomconfig_whois': 'moderators' if is_public else 'anyone', + 'muc#roomconfig_changesubject': not is_public, + + # Ejabberd options + 'public_list': is_public, + } + + # Create new group chat by joining + app.interface.join_gc_room( + self._account, + str(room_jid), + app.nicks[self._account], + None, + config=config) + + self.destroy() + + def _on_destroy(self, *args): + self._destroyed = True ===================================== gajim/roster_window.py ===================================== @@ -3558,6 +3558,13 @@ class RosterWindow: app.app.activate_action('%s-join-groupchat' % account, GLib.Variant('as', [account, ''])) + def on_create_gc_activate(self, widget, account): + """ + When the create gc menuitem is clicked, show the create gc window + """ + app.app.activate_action('create-groupchat', + GLib.Variant('s', account)) + def on_show_transports_action(self, action, param): app.config.set('show_transports_group', param.get_boolean()) action.set_state(param) @@ -5342,7 +5349,9 @@ class RosterWindow: """ item = Gtk.MenuItem.new_with_mnemonic(_('_Join New Group Chat')) item.connect('activate', self.on_join_gc_activate, account) - + gc_sub_menu.append(item) + item = Gtk.MenuItem.new_with_mnemonic(_('_Create Group Chat')) + item.connect('activate', self.on_create_gc_activate, account) gc_sub_menu.append(item) # User has at least one bookmark. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0c9cd26a0111976f17b32f59fda533cee0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0c9cd26a0111976f17b32f59fda533cee0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServiceDiscovery: Fix window.destroy
by Philipp Hörist 04 Jul '19

04 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86005f2b by Daniel Brötzmann at 2019-07-04T13:30:58Z ServiceDiscovery: Fix window.destroy - - - - - 1 changed file: - gajim/gtk/discovery.py Changes: ===================================== gajim/gtk/discovery.py ===================================== @@ -342,8 +342,9 @@ class ServicesCache: # Some services list it in features and respond to # NS_DISCO_ITEMS anyways. # Allow browsing for unknown types as well. - if (not features and not identities) or \ - nbxmpp.NS_DISCO_ITEMS in features or nbxmpp.NS_BROWSE in features: + if ((not features and not identities) or + nbxmpp.NS_DISCO_ITEMS in features or + nbxmpp.NS_BROWSE in features): return ToplevelAgentBrowser return None @@ -1038,7 +1039,7 @@ class AgentBrowser: if not items: if not self.window.address_comboboxtext: # We can't travel anywhere else. - self.window.destroy() + self.window.window.destroy() ErrorDialog(_('The service is not browsable'), _('This service does not contain any items ' 'to browse.'), @@ -1405,8 +1406,8 @@ class ToplevelAgentBrowser(AgentBrowser): if self.search_button and nbxmpp.NS_SEARCH in features: self.search_button.set_sensitive(True) # Don't authorize to register with a server via disco - if self.register_button and nbxmpp.NS_REGISTER in features and \ - jid != self.jid: + if (self.register_button and nbxmpp.NS_REGISTER in features and + jid != self.jid): # We can register this agent registered_transports = [] jid_list = app.contacts.get_jid_list(self.account) @@ -1766,7 +1767,7 @@ class MucBrowser(AgentBrowser): else: window.set_room(service) window.present() - self.window.destroy() + self.window.window.destroy() def update_actions(self): sens = \ @@ -1862,8 +1863,8 @@ class MucBrowser(AgentBrowser): name = identities[0].name or '' for form in data: typefield = form.vars.get('FORM_TYPE') - if typefield and typefield.value == \ - 'http://jabber.org/protocol/muc#roominfo': + if (typefield and typefield.value == + 'http://jabber.org/protocol/muc#roominfo'): # Fill model row from the form's fields users = form.vars.get('muc#roominfo_occupants') descr = form.vars.get('muc#roominfo_description') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/86005f2b95a9fb297c55b99eb397856b75… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/86005f2b95a9fb297c55b99eb397856b75… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ManageProxies: Layout changes and code cleanup
by Philipp Hörist 03 Jul '19

03 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1165bde2 by Daniel Brötzmann at 2019-07-03T19:15:10Z ManageProxies: Layout changes and code cleanup - - - - - 6 changed files: - gajim/app_actions.py - + gajim/data/gui/manage_proxies.ui - − gajim/data/gui/manage_proxies_window.ui - gajim/gtk/account_wizard.py - gajim/gtk/preferences.py - gajim/gtk/proxies.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -252,10 +252,11 @@ def on_xml_console(action, param): def on_manage_proxies(action, param): - if 'manage_proxies' in app.interface.instances: - app.interface.instances['manage_proxies'].window.present() + window = app.get_app_window(ManageProxies) + if window is None: + ManageProxies() else: - app.interface.instances['manage_proxies'] = ManageProxies() + window.present() # Admin Actions ===================================== gajim/data/gui/manage_proxies.ui ===================================== @@ -0,0 +1,439 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes" context="proxy configuration">HTTP Connect</col> + </row> + <row> + <col id="0" translatable="yes" context="proxy configuration">SOCKS5</col> + </row> + <row> + <col id="0" translatable="yes" context="proxy configuration">BOSH</col> + </row> + </data> + </object> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="proxies_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <signal name="cursor-changed" handler="_on_proxies_treeview_cursor_changed" swapped="no"/> + <signal name="key-press-event" handler="_on_proxies_treeview_key_press_event" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="add_proxy_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Add Proxy</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="_on_add_proxy_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="remove_proxy_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Remove Proxy</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="_on_remove_proxy_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <style> + <class name="inline-toolbar"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="settings_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkEntry" id="proxypass_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="input_purpose">password</property> + <signal name="changed" handler="_on_proxypass_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Pass_word</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxypass_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyuser_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="_on_proxyuser_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="useauth_checkbutton"> + <property name="label" translatable="yes">Use proxy auth_entication</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="margin_top">12</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_useauth_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Username</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxyuser_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyport_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="placeholder_text">9050</property> + <property name="input_purpose">number</property> + <signal name="changed" handler="_on_proxyport_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Port</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxyport_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyhost_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="placeholder_text" translatable="yes">example.org</property> + <property name="input_purpose">url</property> + <signal name="changed" handler="_on_proxyhost_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Host</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxyhost_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="bosh_useproxy_checkbutton"> + <property name="label" translatable="yes">Use HTTP prox_y</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="_on_bosh_useproxy_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="boshuri_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="margin_bottom">12</property> + <property name="placeholder_text" translatable="yes">https://example.org/http-bind/</property> + <property name="input_purpose">url</property> + <signal name="changed" handler="_on_boshuri_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="boshuri_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes">_BOSH URL</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">boshuri_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">12</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Settings</property> + <property name="use_markup">True</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="proxytype_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore1</property> + <signal name="changed" handler="_on_proxytype_combobox_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Type</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxytype_combobox</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">proxyname_entry</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="proxyname_entry"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <signal name="changed" handler="_on_proxyname_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Proxy</property> + <property name="use_markup">True</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/gui/manage_proxies_window.ui deleted ===================================== @@ -1,442 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">HTTP Connect</col> - </row> - <row> - <col id="0" translatable="yes">SOCKS5</col> - </row> - <row> - <col id="0" translatable="yes">BOSH</col> - </row> - </data> - </object> - <object class="GtkWindow" id="manage_proxies_window"> - <property name="width_request">500</property> - <property name="height_request">440</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="title" translatable="yes">Manage Proxy Profiles</property> - <property name="window_position">center-on-parent</property> - <property name="default_width">500</property> - <property name="default_height">440</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="_on_destroy" swapped="no"/> - <signal name="key-press-event" handler="_on_key_press" swapped="no"/> - <child> - <placeholder/> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkBox"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="proxies_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <signal name="cursor-changed" handler="on_proxies_treeview_cursor_changed" swapped="no"/> - <signal name="key-press-event" handler="on_proxies_treeview_key_press_event" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkToolbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="add_proxy_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Add Proxy</property> - <property name="use_underline">True</property> - <property name="icon_name">list-add-symbolic</property> - <signal name="clicked" handler="on_add_proxy_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="remove_proxy_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Remove Proxy</property> - <property name="use_underline">True</property> - <property name="icon_name">list-remove-symbolic</property> - <signal name="clicked" handler="on_remove_proxy_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <style> - <class name="inline-toolbar"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Properties</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Name</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Type</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyname_entry"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyname_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="proxytype_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_proxytype_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="proxy_table"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="boshuri_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_BOSH URL</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="boshuri_entry"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_boshuri_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="boshuseproxy_checkbutton"> - <property name="label" translatable="yes">Use HTTP prox_y</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_boshuseproxy_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Proxy _Host</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyhost_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyhost_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Proxy _Port</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyport_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyport_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Username</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="useauth_checkbutton"> - <property name="label" translatable="yes">Use proxy auth_entication</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_useauth_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxyuser_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_proxyuser_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Pass_word</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxypass_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <signal name="changed" handler="on_proxypass_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Settings</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/gtk/account_wizard.py ===================================== @@ -347,11 +347,12 @@ class AccountCreationWizard: model.append([proxy]) proxies_combobox.set_active(0) - def on_manage_proxies_button_clicked(self, widget): - if 'manage_proxies' in app.interface.instances: - app.interface.instances['manage_proxies'].window.present() + def on_manage_proxies_button_clicked(self, _widget): + window = app.get_app_window(ManageProxies) + if window is None: + ManageProxies() else: - app.interface.instances['manage_proxies'] = ManageProxies() + window.present() def on_custom_host_port_checkbutton_toggled(self, widget): self.xml.get_object('custom_host_hbox').set_sensitive( ===================================== gajim/gtk/preferences.py ===================================== @@ -972,11 +972,12 @@ class Preferences(Gtk.ApplicationWindow): proxy = '' app.config.set('global_proxy', proxy) - def on_manage_proxies_button_clicked(self, widget): - if 'manage_proxies' in app.interface.instances: - app.interface.instances['manage_proxies'].window.present() + def on_manage_proxies_button_clicked(self, _widget): + window = app.get_app_window(ManageProxies) + if window is None: + ManageProxies() else: - app.interface.instances['manage_proxies'] = ManageProxies() + window.present() def update_proxy_list(self): our_proxy = app.config.get('global_proxy') ===================================== gajim/gtk/proxies.py ===================================== @@ -16,54 +16,70 @@ from gi.repository import Gdk from gi.repository import Gtk from gajim.common import app +from gajim.common.i18n import _ from gajim.gtk.util import get_builder -class ManageProxies: +class ManageProxies(Gtk.ApplicationWindow): def __init__(self): - self._ui = get_builder('manage_proxies_window.ui') - self.window = self._ui.manage_proxies_window - self.window.set_transient_for(app.app.get_active_window()) - - self.init_list() - self.block_signal = False + Gtk.ApplicationWindow.__init__(self) + self.set_name('ManageProxies') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_default_size(500, -1) + self.set_show_menubar(False) + self.set_title(_('Manage Proxies')) + + self._ui = get_builder('manage_proxies.ui') + self.add(self._ui.box) + + self._init_list() + self._block_signal = False + + self.connect('key-press-event', self._on_key_press) + self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) - self.window.show_all() + self.show_all() - # hide the BOSH fields by default - self.show_bosh_fields() - self._ui.boshuri_entry.hide() - self._ui.boshuri_label.hide() - self._ui.boshuseproxy_checkbutton.hide() + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() - def show_bosh_fields(self, show=True): + def _on_destroy(self, *args): + # Window callbacks for updating proxy comboboxes + window_pref = app.get_app_window('Preferences') + window_accounts = app.get_app_window('AccountsWindow') + if window_pref is not None: + window_pref.update_proxy_list() + if window_accounts is not None: + window_accounts.update_proxy_list() + + def _show_bosh_fields(self, show=True): if show: self._ui.boshuri_entry.show() self._ui.boshuri_label.show() - self._ui.boshuseproxy_checkbutton.show() - act = self._ui.boshuseproxy_checkbutton.get_active() + self._ui.bosh_useproxy_checkbutton.show() + act = self._ui.bosh_useproxy_checkbutton.get_active() self._ui.proxyhost_entry.set_sensitive(act) self._ui.proxyport_entry.set_sensitive(act) else: - self._ui.boshuseproxy_checkbutton.hide() - self._ui.boshuseproxy_checkbutton.set_active(True) - self.on_boshuseproxy_checkbutton_toggled( - self._ui.boshuseproxy_checkbutton) self._ui.boshuri_entry.hide() self._ui.boshuri_label.hide() + self._ui.bosh_useproxy_checkbutton.hide() + self._ui.proxyhost_entry.set_sensitive(True) + self._ui.proxyport_entry.set_sensitive(True) - def fill_proxies_treeview(self): + def _fill_proxies_treeview(self): model = self._ui.proxies_treeview.get_model() model.clear() for proxy in app.config.get_per('proxies'): iter_ = model.append() model.set(iter_, 0, proxy) - def init_list(self): + def _init_list(self): self._ui.remove_proxy_button.set_sensitive(False) - self._ui.proxytype_combobox.set_sensitive(False) - self._ui.proxy_table.set_sensitive(False) + self._ui.settings_grid.set_sensitive(False) model = Gtk.ListStore(str) self._ui.proxies_treeview.set_model(model) col = Gtk.TreeViewColumn('Proxies') @@ -71,10 +87,10 @@ class ManageProxies: renderer = Gtk.CellRendererText() col.pack_start(renderer, True) col.add_attribute(renderer, 'text', 0) - self.fill_proxies_treeview() + self._fill_proxies_treeview() self._ui.proxytype_combobox.set_active(0) - def on_add_proxy_button_clicked(self, _widget): + def _on_add_proxy_button_clicked(self, _widget): model = self._ui.proxies_treeview.get_model() proxies = app.config.get_per('proxies') i = 1 @@ -85,7 +101,7 @@ class ManageProxies: app.config.add_per('proxies', 'proxy' + str(i)) self._ui.proxies_treeview.set_cursor(model.get_path(iter_)) - def on_remove_proxy_button_clicked(self, _widget): + def _on_remove_proxy_button_clicked(self, _widget): sel = self._ui.proxies_treeview.get_selection() if not sel: return @@ -96,12 +112,12 @@ class ManageProxies: model.remove(iter_) app.config.del_per('proxies', proxy) self._ui.remove_proxy_button.set_sensitive(False) - self.block_signal = True - self.on_proxies_treeview_cursor_changed(self._ui.proxies_treeview) - self.block_signal = False + self._block_signal = True + self._on_proxies_treeview_cursor_changed(self._ui.proxies_treeview) + self._block_signal = False - def on_useauth_checkbutton_toggled(self, widget): - if self.block_signal: + def _on_useauth_toggled(self, widget): + if self._block_signal: return act = widget.get_active() proxy = self._ui.proxyname_entry.get_text() @@ -109,20 +125,17 @@ class ManageProxies: self._ui.proxyuser_entry.set_sensitive(act) self._ui.proxypass_entry.set_sensitive(act) - def on_boshuseproxy_checkbutton_toggled(self, widget): - if self.block_signal: + def _on_bosh_useproxy_toggled(self, checkbutton): + if self._block_signal: return - act = widget.get_active() + act = checkbutton.get_active() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'bosh_useproxy', act) self._ui.proxyhost_entry.set_sensitive(act) self._ui.proxyport_entry.set_sensitive(act) - def on_proxies_treeview_cursor_changed(self, widget): - #FIXME: check if off proxy settings are correct (see - # http://trac.gajim.org/changeset/1921#file2 line 1221 - - self.block_signal = True + def _on_proxies_treeview_cursor_changed(self, widget): + self._block_signal = True self._ui.proxyhost_entry.set_text('') self._ui.proxyport_entry.set_text('') self._ui.proxyuser_entry.set_text('') @@ -136,9 +149,8 @@ class ManageProxies: iter_ = None if not iter_: self._ui.proxyname_entry.set_text('') - self._ui.proxytype_combobox.set_sensitive(False) - self._ui.proxy_table.set_sensitive(False) - self.block_signal = False + self._ui.settings_grid.set_sensitive(False) + self._block_signal = False return proxy = model[iter_][0] @@ -146,20 +158,19 @@ class ManageProxies: proxytype = app.config.get_per('proxies', proxy, 'type') - self.show_bosh_fields(proxytype == 'bosh') + self._show_bosh_fields(proxytype == 'bosh') - self._ui.proxyname_entry.set_editable(True) - self._ui.proxyname_entry.set_sensitive(True) self._ui.remove_proxy_button.set_sensitive(True) - self._ui.proxytype_combobox.set_sensitive(True) - self._ui.proxy_table.set_sensitive(True) + self._ui.proxyname_entry.set_editable(True) + + self._ui.settings_grid.set_sensitive(True) self._ui.boshuri_entry.set_text( app.config.get_per('proxies', proxy, 'bosh_uri')) - self._ui.boshuseproxy_checkbutton.set_active( + self._ui.bosh_useproxy_checkbutton.set_active( app.config.get_per('proxies', proxy, 'bosh_useproxy')) if proxytype == 'bosh': - act = self._ui.boshuseproxy_checkbutton.get_active() + act = self._ui.bosh_useproxy_checkbutton.get_active() self._ui.proxyhost_entry.set_sensitive(act) self._ui.proxyport_entry.set_sensitive(act) @@ -181,14 +192,14 @@ class ManageProxies: self._ui.proxyuser_entry.set_sensitive(act) self._ui.proxypass_entry.set_sensitive(act) - self.block_signal = False + self._block_signal = False - def on_proxies_treeview_key_press_event(self, widget, event): + def _on_proxies_treeview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Delete: - self.on_remove_proxy_button_clicked(widget) + self._on_remove_proxy_button_clicked(widget) - def on_proxyname_entry_changed(self, widget): - if self.block_signal: + def _on_proxyname_entry_changed(self, widget): + if self._block_signal: return sel = self._ui.proxies_treeview.get_selection() if not sel: @@ -209,59 +220,48 @@ class ManageProxies: app.config.set_per('proxies', new_name, option, config[option]) model.set_value(iter_, 0, new_name) - def on_proxytype_combobox_changed(self, _widget): - if self.block_signal: + def _on_proxytype_combobox_changed(self, _widget): + if self._block_signal: return types = ['http', 'socks5', 'bosh'] type_ = self._ui.proxytype_combobox.get_active() - self.show_bosh_fields(types[type_] == 'bosh') + self._ui.proxyhost_entry.set_sensitive(True) + self._ui.proxyport_entry.set_sensitive(True) + self._show_bosh_fields(types[type_] == 'bosh') proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'type', types[type_]) - def on_boshuri_entry_changed(self, widget): - if self.block_signal: + def _on_boshuri_entry_changed(self, entry): + if self._block_signal: return - value = widget.get_text() + value = entry.get_text() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'bosh_uri', value) - def on_proxyhost_entry_changed(self, widget): - if self.block_signal: + def _on_proxyhost_entry_changed(self, entry): + if self._block_signal: return - value = widget.get_text() + value = entry.get_text() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'host', value) - def on_proxyport_entry_changed(self, widget): - if self.block_signal: + def _on_proxyport_entry_changed(self, entry): + if self._block_signal: return - value = widget.get_text() + value = entry.get_text() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'port', value) - def on_proxyuser_entry_changed(self, widget): - if self.block_signal: + def _on_proxyuser_entry_changed(self, entry): + if self._block_signal: return - value = widget.get_text() + value = entry.get_text() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'user', value) - def on_proxypass_entry_changed(self, widget): - if self.block_signal: + def _on_proxypass_entry_changed(self, entry): + if self._block_signal: return - value = widget.get_text() + value = entry.get_text() proxy = self._ui.proxyname_entry.get_text() app.config.set_per('proxies', proxy, 'pass', value) - - def _on_key_press(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.window.destroy() - - def _on_destroy(self, *args): - window_pref = app.get_app_window('Preferences') - window_accounts = app.get_app_window('AccountsWindow') - if window_pref is not None: - window_pref.update_proxy_list() - if window_accounts is not None: - window_accounts.update_proxy_list() - del app.interface.instances['manage_proxies'] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1165bde27b1ce89e0eac7eda22e2668297… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1165bde27b1ce89e0eac7eda22e2668297… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: StartChat: Use _ui scheme
by Philipp Hörist 03 Jul '19

03 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cc9d1804 by Daniel Brötzmann at 2019-07-03T18:50:28Z StartChat: Use _ui scheme - - - - - 5214a2f2 by Daniel Brötzmann at 2019-07-03T18:50:28Z StartChat: Use Join Group Chat as label - - - - - 3af3b647 by Daniel Brötzmann at 2019-07-03T18:53:01Z StartChat: Use AvatarSize.CHAT for avatars - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -48,19 +48,15 @@ class StartChatDialog(Gtk.ApplicationWindow): self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) - self.set_title(_('Start new Conversation')) + self.set_title(_('Start New Conversation')) self.set_default_size(-1, 400) self.ready_to_destroy = False self._parameter_form = None self._destroyed = False self._search_stopped = False - self.builder = get_builder('start_chat_dialog.ui') - self.listbox = self.builder.get_object('listbox') - self.search_entry = self.builder.get_object('search_entry') - self.box = self.builder.get_object('box') - - self.add(self.box) + self._ui = get_builder('start_chat_dialog.ui') + self.add(self._ui.box) self.new_contact_row_visible = False self.new_contact_rows = {} @@ -69,21 +65,21 @@ class StartChatDialog(Gtk.ApplicationWindow): self.add_contacts() self.add_groupchats() - self.search_entry.connect('search-changed', - self._on_search_changed) - self.search_entry.connect('next-match', - self._select_new_match, 'next') - self.search_entry.connect('previous-match', - self._select_new_match, 'prev') - self.search_entry.connect('stop-search', - lambda *args: self.search_entry.set_text('')) + self._ui.search_entry.connect('search-changed', + self._on_search_changed) + self._ui.search_entry.connect('next-match', + self._select_new_match, 'next') + self._ui.search_entry.connect('previous-match', + self._select_new_match, 'prev') + self._ui.search_entry.connect( + 'stop-search', lambda *args: self._ui.search_entry.set_text('')) - self.listbox.set_filter_func(self._filter_func, None) - self.listbox.set_sort_func(self._sort_func, None) - self.listbox.connect('row-activated', self._on_row_activated) + self._ui.listbox.set_filter_func(self._filter_func, None) + self._ui.listbox.set_sort_func(self._sort_func, None) + self._ui.listbox.connect('row-activated', self._on_row_activated) self._muc_search_listbox = MUCSearch() - self._current_listbox = self.listbox + self._current_listbox = self._ui.listbox self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._destroy) @@ -102,7 +98,7 @@ class StartChatDialog(Gtk.ApplicationWindow): continue row = ContactRow(account, contact, jid, contact.get_shown_name(), show_account) - self.listbox.add(row) + self._ui.listbox.add(row) def add_groupchats(self): show_account = len(self.accounts) > 1 @@ -125,7 +121,7 @@ class StartChatDialog(Gtk.ApplicationWindow): name = app.get_nick_from_jid(jid) row = ContactRow(account, None, jid, name, show_account, True) - self.listbox.add(row) + self._ui.listbox.add(row) def _on_row_activated(self, listbox, row): row = row.get_child() @@ -133,23 +129,23 @@ class StartChatDialog(Gtk.ApplicationWindow): def _on_key_press(self, widget, event): if event.keyval in (Gdk.KEY_Down, Gdk.KEY_Tab): - self.search_entry.emit('next-match') + self._ui.search_entry.emit('next-match') return True if (event.state == Gdk.ModifierType.SHIFT_MASK and event.keyval == Gdk.KEY_ISO_Left_Tab): - self.search_entry.emit('previous-match') + self._ui.search_entry.emit('previous-match') return True if event.keyval == Gdk.KEY_Up: - self.search_entry.emit('previous-match') + self._ui.search_entry.emit('previous-match') return True if event.keyval == Gdk.KEY_Escape: self._search_stopped = True self._muc_search_listbox.remove_all() - if self.search_entry.get_text() != '': - self.search_entry.emit('stop-search') + if self._ui.search_entry.get_text() != '': + self._ui.search_entry.emit('stop-search') else: self.destroy() return True @@ -160,12 +156,12 @@ class StartChatDialog(Gtk.ApplicationWindow): self._start_search() return True - row = self.listbox.get_selected_row() + row = self._ui.listbox.get_selected_row() if row is not None: row.emit('activate') return True - self.search_entry.grab_focus_without_selecting() + self._ui.search_entry.grab_focus_without_selecting() def _start_new_chat(self, row): if row.new: @@ -188,14 +184,14 @@ class StartChatDialog(Gtk.ApplicationWindow): def _set_listbox(self, listbox): if self._current_listbox == listbox: return - viewport = self.builder.scrolledwindow.get_child() + viewport = self._ui.scrolledwindow.get_child() viewport.remove(viewport.get_child()) - self.builder.scrolledwindow.remove(viewport) - self.builder.scrolledwindow.add(listbox) + self._ui.scrolledwindow.remove(viewport) + self._ui.scrolledwindow.add(listbox) self._current_listbox = listbox def _current_listbox_is(self, box): - if self._current_listbox == self.listbox: + if self._current_listbox == self._ui.listbox: return box == Search.CONTACT return box == Search.MUC @@ -205,13 +201,13 @@ class StartChatDialog(Gtk.ApplicationWindow): self._set_listbox(self._muc_search_listbox) return - self._set_listbox(self.listbox) + self._set_listbox(self._ui.listbox) if '@' in search_text: self._add_new_jid_row() self._update_new_jid_rows(search_text) else: self._remove_new_jid_row() - self.listbox.invalidate_filter() + self._ui.listbox.invalidate_filter() def _add_new_jid_row(self): if self.new_contact_row_visible: @@ -222,8 +218,8 @@ class StartChatDialog(Gtk.ApplicationWindow): self.new_contact_rows[account] = row group_row = ContactRow(account, None, '', None, show_account, True) self.new_groupchat_rows[account] = group_row - self.listbox.add(row) - self.listbox.add(group_row) + self._ui.listbox.add(row) + self._ui.listbox.add(group_row) row.get_parent().show_all() self.new_contact_row_visible = True @@ -231,8 +227,10 @@ class StartChatDialog(Gtk.ApplicationWindow): if not self.new_contact_row_visible: return for account in self.new_contact_rows: - self.listbox.remove(self.new_contact_rows[account].get_parent()) - self.listbox.remove(self.new_groupchat_rows[account].get_parent()) + self._ui.listbox.remove( + self.new_contact_rows[account].get_parent()) + self._ui.listbox.remove( + self.new_groupchat_rows[account].get_parent()) self.new_contact_row_visible = False def _update_new_jid_rows(self, search_text): @@ -241,7 +239,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self.new_groupchat_rows[account].update_jid(search_text) def _select_new_match(self, entry, direction): - selected_row = self.listbox.get_selected_row() + selected_row = self._ui.listbox.get_selected_row() if selected_row is None: return @@ -253,11 +251,11 @@ class StartChatDialog(Gtk.ApplicationWindow): index -= 1 while True: - new_selected_row = self.listbox.get_row_at_index(index) + new_selected_row = self._ui.listbox.get_row_at_index(index) if new_selected_row is None: return if new_selected_row.get_child_visible(): - self.listbox.select_row(new_selected_row) + self._ui.listbox.select_row(new_selected_row) new_selected_row.grab_focus() return if direction == 'next': @@ -266,11 +264,11 @@ class StartChatDialog(Gtk.ApplicationWindow): index -= 1 def select_first_row(self): - first_row = self.listbox.get_row_at_y(0) - self.listbox.select_row(first_row) + first_row = self._ui.listbox.get_row_at_y(0) + self._ui.listbox.select_row(first_row) def _filter_func(self, row, user_data): - search_text = self.search_entry.get_text().lower() + search_text = self._ui.search_entry.get_text().lower() search_text_list = search_text.split() row_text = row.get_child().get_search_text().lower() for text in search_text_list: @@ -317,7 +315,7 @@ class StartChatDialog(Gtk.ApplicationWindow): except NotConnected: return - text = self.search_entry.get_text() + text = self._ui.search_entry.get_text() text = text[2:].strip() self._muc_search_listbox.start_search() @@ -406,14 +404,14 @@ class ContactRow(Gtk.Grid): else: scale = self.get_scale_factor() avatar = app.contacts.get_avatar( - account, jid, AvatarSize.ROSTER, scale) + account, jid, AvatarSize.CHAT, scale) if avatar is None: image = Gtk.Image.new_from_icon_name( 'avatar-default', Gtk.IconSize.DND) else: image = Gtk.Image.new_from_surface(avatar) - image.set_size_request(AvatarSize.ROSTER, AvatarSize.ROSTER) + image.set_size_request(AvatarSize.CHAT, AvatarSize.CHAT) self.add(image) middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) @@ -421,9 +419,9 @@ class ContactRow(Gtk.Grid): if self.name is None: if self.groupchat: - self.name = _('New Groupchat') + self.name = _('Join Group Chat') else: - self.name = _('New Contact') + self.name = _('Add Contact') self.name_label = Gtk.Label(label=self.name) self.name_label.set_ellipsize(Pango.EllipsizeMode.END) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fa5c352518bb9a8d341a375e23707e921… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fa5c352518bb9a8d341a375e23707e921… You're receiving this email because of your account on dev.gajim.org.

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