Commits November 2019

commits@gajim.org

1 participants
84 discussions

[Git][gajim/gajim][master] 3 commits: Themes: Switch active theme when adding or removing theme
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 819e64fd by Daniel Brötzmann at 2019-11-17T19:26:41Z Themes: Switch active theme when adding or removing theme When adding a new theme, it is automatically applied. This enables users to view their changes directly without switching the active theme in Preferences first. Deleting the currently active theme will fallback to default. - - - - - 5e018f61 by Daniel Brötzmann at 2019-11-17T19:26:41Z Themes: Rearrange dialog buttons, close popover after adding option - - - - - e089f9f6 by Daniel Brötzmann at 2019-11-17T19:26:41Z Themes: Make Add Setting button sensivite in all circumstances This enabled the user to directly add a setting without having to add a theme first. - - - - - 2 changed files: - gajim/data/gui/themes_window.ui - gajim/gtk/themes.py Changes: ===================================== gajim/data/gui/themes_window.ui ===================================== @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.18"/> - <object class="GtkPopover" id="popover1"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkPopover" id="option_popover"> <property name="can_focus">False</property> <child> <object class="GtkScrolledWindow"> @@ -32,6 +32,27 @@ </object> </child> </object> + <object class="GtkBox" id="placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Add a setting you would like to change</property> + <style> + <class name="bold"/> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> <object class="GtkListStore" id="theme_store"> <columns>  @@ -41,7 +62,6 @@ <object class="GtkGrid" id="theme_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> <object class="GtkScrolledWindow"> @@ -82,62 +102,6 @@ <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_add_new_theme" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_theme_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_remove_theme" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <style> - <class name="linked"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> @@ -174,18 +138,44 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> <child> <object class="GtkMenuButton" id="add_option_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="popover">popover1</property> + <property name="popover">option_popover</property> <child> - <object class="GtkImage"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - <property name="icon_size">1</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add-symbolic</property> + <property name="icon_size">1</property> + </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">Add Setting</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> @@ -196,12 +186,52 @@ <property name="position">0</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_size">2</property> + <child> + <object class="GtkToolButton" id="add_theme_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Add new Theme</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="_on_add_new_theme" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="remove_theme_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Remove Theme</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="_on_remove_theme" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> <style> - <class name="linked"/> + <class name="inline-toolbar"/> </style> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">1</property> </packing> </child> ===================================== gajim/gtk/themes.py ===================================== @@ -185,14 +185,12 @@ class Themes(Gtk.ApplicationWindow): widgets = ['option_listbox', 'remove_theme_button', 'theme_store', 'theme_treeview', 'choose_option_listbox', - 'add_option_button'] + 'placeholder', 'option_popover'] for widget in widgets: setattr(self, '_%s' % widget, self.builder.get_object(widget)) - # Doesnt work if we set it in Glade - self._add_option_button.set_sensitive(False) - self._get_themes() + self._option_listbox.set_placeholder(self._placeholder) self.builder.connect_signals(self) self.connect('destroy', self._on_destroy) @@ -242,7 +240,6 @@ class Themes(Gtk.ApplicationWindow): theme = store[iter_][Column.THEME] app.css_config.change_preload_theme(theme) - self._add_option_button.set_sensitive(True) self._remove_theme_button.set_sensitive(True) self._load_options(theme) @@ -259,11 +256,18 @@ class Themes(Gtk.ApplicationWindow): self._option_listbox.add(row) def _add_option(self, listbox, row): + # Add theme if there is none + store, iter_ = self._theme_treeview.get_selection().get_selected() + first = store.get_iter_first() + if first is None: + self._on_add_new_theme() + for option in self._option_listbox.get_children(): if option == row: return row = Option(row.option, None) self._option_listbox.add(row) + self._option_popover.popdown() def _clear_options(self): self._option_listbox.foreach(self._remove_option) @@ -284,6 +288,21 @@ class Themes(Gtk.ApplicationWindow): self._remove_theme_button.set_sensitive(True) iter_ = self._theme_store.append([name]) self._select_theme_row(iter_) + self._apply_theme(name) + + def _apply_theme(self, theme): + app.config.set('roster_theme', theme) + app.css_config.change_theme(theme) + app.nec.push_incoming_event(NetworkEvent('theme-update')) + + # Begin repainting themed widgets throughout + app.interface.roster.repaint_themed_widgets() + app.interface.roster.change_roster_style(None) + + # Update Preferences theme combobox + window = get_app_window('Preferences') + if window is not None: + window.update_theme_list() @staticmethod def _create_theme_name(): @@ -298,28 +317,28 @@ class Themes(Gtk.ApplicationWindow): return theme = store[iter_][Column.THEME] - if theme == app.config.get('roster_theme'): - ErrorDialog( - _('Active Theme'), - _('You tried to delete the currently active theme. ' - 'Please switch to a different theme first.'), - transient_for=self) - return def _remove_theme(): + if theme == app.config.get('roster_theme'): + self._apply_theme('default') + app.css_config.remove_theme(theme) store.remove(iter_) first = store.get_iter_first() if first is None: self._remove_theme_button.set_sensitive(False) - self._add_option_button.set_sensitive(False) self._clear_options() + text = _('Do you want to delete this theme?') + if theme == app.config.get('roster_theme'): + text = _('This is the theme you are currently using.\n' + 'Do you want to delete this theme?') + NewConfirmationDialog( _('Delete'), _('Delete Theme'), - _('Do you want to permanently delete this theme?'), + text, [DialogButton.make('Cancel'), DialogButton.make('Delete', callback=_remove_theme)], @@ -351,6 +370,7 @@ class Option(Gtk.ListBoxRow): remove_button = Gtk.Button.new_from_icon_name( 'list-remove-symbolic', Gtk.IconSize.MENU) + remove_button.set_tooltip_text(_('Remove Setting')) remove_button.get_style_context().add_class('theme_remove_button') remove_button.connect('clicked', self._on_remove) self._box.add(remove_button) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7d755dc2bd4b238d68036b106b30be698… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7d755dc2bd4b238d68036b106b30be698… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Handle malformed error stanzas
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 47e73f72 by Philipp Hörist at 2019-11-17T18:55:48Z Handle malformed error stanzas Fixes #89 - - - - - 1 changed file: - nbxmpp/util.py Changes: ===================================== nbxmpp/util.py ===================================== @@ -152,9 +152,15 @@ def raise_error(log_method, stanza, condition=None, text=None): if log_method.__name__ not in ('warning', 'error'): log_method = log_method.__self__.warning - error = error_factory(stanza, condition, text) - log_method(error) + try: + error = error_factory(stanza, condition, text) + except Exception: + log.exception('Malformed error stanza') + log.error(stanza) + error = StanzaMalformedError(stanza, text) + return error + log_method(error) if log_method.__name__ in ('warning', 'error'): log_method(stanza) return error View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/47e73f72b00418645606c49631… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/47e73f72b00418645606c49631… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Shortcuts: Update shortcuts and descriptions
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7d755dc2 by Daniel Brötzmann at 2019-11-17T17:55:40Z Shortcuts: Update shortcuts and descriptions - - - - - 1 changed file: - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -97,7 +97,14 @@ <object class="GtkShortcutsShortcut"> <property name="visible">1</property> <property name="accelerator"><ctrl>l</property> - <property name="title" translatable="yes">Clear</property> + <property name="title" translatable="yes">Clear chat window</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>h</property> + <property name="title" translatable="yes">Show chat history</property> </object> </child> </object> @@ -178,7 +185,21 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl><shift>a</property> + <property name="accelerator"><ctrl>n</property> + <property name="title" translatable="yes">Start a new chat</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>g</property> + <property name="title" translatable="yes">Create new group chat</property> + </object> + </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><alt>a</property> <property name="title" translatable="yes">Accounts</property> </object> </child> @@ -192,29 +213,29 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>t</property> - <property name="title" translatable="yes">File transfers</property> + <property name="accelerator"><ctrl>e</property> + <property name="title" translatable="yes">Plugins</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>n</property> - <property name="title" translatable="yes">Start a new chat</property> + <property name="accelerator"><ctrl>t</property> + <property name="title" translatable="yes">File transfers</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>j</property> - <property name="title" translatable="yes">Join a group chat</property> + <property name="accelerator"><ctrl>s</property> + <property name="title" translatable="yes">Set the status message</property> </object> </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><ctrl>s</property> - <property name="title" translatable="yes">Set the status message</property> + <property name="accelerator"><ctrl><shift>x</property> + <property name="title" translatable="yes">Show XML console</property> </object> </child> <child> @@ -251,6 +272,13 @@ <property name="title" translatable="yes">Enable contact list filtering</property> </object> </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><ctrl>r</property> + <property name="title" translatable="yes">Show / hide contact list</property> + </object> + </child> </object> </child> <child> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d755dc2bd4b238d68036b106b30be698c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7d755dc2bd4b238d68036b106b30be698c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 13 commits: Accounts: Fix pylint errors
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc3540ea by Philipp Hörist at 2019-11-17T16:18:38Z Accounts: Fix pylint errors - - - - - 7491bfe9 by Philipp Hörist at 2019-11-17T16:18:38Z AdvancedConfig: Fix pylint errors - - - - - 8bf20c04 by Philipp Hörist at 2019-11-17T16:18:38Z Dataforms: Fix pylint errors - - - - - dcbb77d8 by Philipp Hörist at 2019-11-17T16:18:38Z Features: Fix pylint errors - - - - - 0b794a04 by Philipp Hörist at 2019-11-17T16:18:38Z EventHelper: Fix pylint error GtkWidget implements connect() but pylint doesn't know that - - - - - fe122aab by Philipp Hörist at 2019-11-17T16:18:38Z Tooltips: Fix pylint errors - - - - - c0228af4 by Philipp Hörist at 2019-11-17T16:18:38Z HTTPUploadProgress: Fix pylint errors - - - - - 92abfa8b by Philipp Hörist at 2019-11-17T16:18:38Z PEPConfig: Rename class - - - - - 7156ecfb by Philipp Hörist at 2019-11-17T16:18:38Z PEPConfig: Fix pylint errors - - - - - 22626591 by Philipp Hörist at 2019-11-17T16:18:38Z HtmlTextView: Fix pylint errors - - - - - d642cca0 by Philipp Hörist at 2019-11-17T16:18:38Z Notification: Fix typo in var name - - - - - d9c11cd5 by Philipp Hörist at 2019-11-17T16:18:38Z Notification: Fix pylint errors - - - - - b7c10bc0 by Philipp Hörist at 2019-11-17T16:18:38Z ManageProxies: Fix pylint errors - - - - - 14 changed files: - gajim/app_actions.py - gajim/data/gui/remove_account_window.ui - gajim/gtk/accounts.py - gajim/gtk/advanced_config.py - gajim/gtk/const.py - gajim/gtk/dataform.py - gajim/gtk/features.py - gajim/gtk/htmltextview.py - gajim/gtk/http_upload_progress.py - gajim/gtk/notification.py - gajim/gtk/pep_config.py - gajim/gtk/proxies.py - gajim/gtk/tooltips.py - gajim/gtk/util.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -162,7 +162,7 @@ def on_import_contacts(_action, param): def on_pep_config(_action, param): account = param.get_string() - open_window('ManagePEPServicesWindow', account=account) + open_window('PEPConfig', account=account) def on_mam_preferences(_action, param): ===================================== gajim/data/gui/remove_account_window.ui ===================================== @@ -7,7 +7,7 @@ <property name="border_width">18</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_remove_account_window_destroy" swapped="no"/> + <signal name="destroy" handler="_on_destroy" swapped="no"/> <child> <placeholder/> </child> ===================================== gajim/gtk/accounts.py ===================================== @@ -627,7 +627,7 @@ class GenericSettingPage(Gtk.Box): return stack.connect('notify::visible-child', self._on_visible_child_changed) - def _on_visible_child_changed(self, stack, param): + def _on_visible_child_changed(self, stack, _param): if self == stack.get_visible_child(): self.listbox.update_states() @@ -917,7 +917,7 @@ class RemoveAccountWindow: then remove the account given """ - def on_remove_account_window_destroy(self, _widget): + def _on_destroy(self, _widget): if self.account in app.interface.instances: del app.interface.instances[self.account]['remove_account'] @@ -941,7 +941,8 @@ class RemoveAccountWindow: not self._ui.remove_and_unregister_radiobutton.get_active(): # change status to offline only if we will not # remove this JID from server - app.connections[self.account].change_status('offline', 'offline') + app.connections[self.account].change_status('offline', + 'offline') if self._ui.remove_and_unregister_radiobutton.get_active(): if not self.account in app.connections: ErrorDialog( ===================================== gajim/gtk/advanced_config.py ===================================== @@ -47,7 +47,7 @@ def rate_limit(rate): def decorator(func): timeout = [None] - def f(*args, **kwargs): + def func_wrapper(*args, **kwargs): if timeout[0] is not None: GLib.source_remove(timeout[0]) timeout[0] = None @@ -56,7 +56,7 @@ def rate_limit(rate): func(*args, **kwargs) timeout[0] = None timeout[0] = GLib.timeout_add(int(1000.0 / rate), timeout_func) - return f + return func_wrapper return decorator @@ -144,7 +144,7 @@ class AdvancedConfig(Gtk.ApplicationWindow): if event.keyval == Gdk.KEY_Escape and not editing: self.destroy() - def _value_column_data_callback(self, col, cell, model, iter_, data): + 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 cellrenderertext not editable, else - it's editable @@ -199,7 +199,7 @@ class AdvancedConfig(Gtk.ApplicationWindow): else: self.changed_opts[option] = (oldval, newval) - def _on_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] @@ -242,7 +242,7 @@ class AdvancedConfig(Gtk.ApplicationWindow): 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) @@ -266,7 +266,7 @@ class AdvancedConfig(Gtk.ApplicationWindow): modelrow[1] = text 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_: @@ -330,7 +330,7 @@ class AdvancedConfig(Gtk.ApplicationWindow): value = option self.model.append(parent, [name, value, type_]) - def _visible_func(self, model, treeiter, data): + 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] != '': ===================================== gajim/gtk/const.py ===================================== @@ -120,7 +120,7 @@ WINDOW_MODULES = { 'BlockingList': 'gajim.gtk.blocking', 'XMLConsoleWindow': 'gajim.gtk.xml_console', 'GroupchatJoin': 'gajim.gtk.groupchat_join', - 'ManagePEPServicesWindow': 'gajim.gtk.pep_config', + 'PEPConfig': 'gajim.gtk.pep_config', 'HistoryManager': 'gajim.history_manager', 'GroupchatConfig': 'gajim.gtk.groupchat_config', 'ProfileWindow': 'gajim.gtk.profile', ===================================== gajim/gtk/dataform.py ===================================== @@ -211,6 +211,7 @@ class Instructions: class Field: def __init__(self, field, form_grid, options): + self._widget = None self._field = field self._form_grid = form_grid self._validate_source_id = None @@ -563,7 +564,7 @@ class TextMultiField(Field): class ImageMediaField(): - def __init__(self, uri, form_grid, options): + def __init__(self, uri, form_grid, _options): self._uri = uri self._form_grid = form_grid ===================================== gajim/gtk/features.py ===================================== @@ -70,7 +70,7 @@ class FeaturesDialog(Gtk.Dialog): label.set_halign(Gtk.Align.START) row.set_header(label) - def on_response(self, dialog, response): + def on_response(self, _dialog, response): if response == Gtk.ResponseType.OK: self.destroy() @@ -82,7 +82,7 @@ class FeaturesDialog(Gtk.Dialog): def get_features(self): Feature = namedtuple('Feature', ['name', 'available', 'tooltip', - 'dependency_u', 'dependency_w', 'enabled']) + 'dependency_u', 'dependency_w', 'enabled']) spell_check_enabled = app.config.get('use_speller') @@ -137,7 +137,8 @@ class FeaturesDialog(Gtk.Dialog): None) ] - def some_keyring_available(self): + @staticmethod + def some_keyring_available(): if os.name == 'nt': return True try: @@ -147,7 +148,8 @@ class FeaturesDialog(Gtk.Dialog): return False return True - def idle_available(self): + @staticmethod + def idle_available(): from gajim.common import idle return idle.Monitor.is_available() ===================================== gajim/gtk/htmltextview.py ===================================== @@ -175,14 +175,15 @@ BLOCK_PHRASAL = set(('address', 'blockquote', 'pre',)) BLOCK_PRES = set(('hr', )) #not in xhtml-im BLOCK_STRUCT = set(('div', 'p', )) BLOCK_HACKS = set(('table', 'tr')) # at the very least, they will start line ;) -BLOCK = BLOCK_HEAD.union(BLOCK_PHRASAL).union(BLOCK_STRUCT).union(BLOCK_PRES).union(BLOCK_HACKS) +BLOCK = BLOCK_HEAD | BLOCK_PHRASAL | BLOCK_STRUCT | BLOCK_PRES | BLOCK_HACKS -INLINE_PHRASAL = set('abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var'.split(', ')) -INLINE_PRES = set('b, i, u, tt'.split(', ')) #not in xhtml-im -INLINE_STRUCT = set('br, span'.split(', ')) -INLINE = INLINE_PHRASAL.union(INLINE_PRES).union(INLINE_STRUCT) +INLINE_PHRASAL = set(['abbr', 'acronym', 'cite', 'code', 'dfn', 'em', + 'kbd', 'q', 'samp', 'strong', 'var']) +INLINE_PRES = set(['b', 'i', 'u', 'tt']) #not in xhtml-im +INLINE_STRUCT = set(['br', 'span']) +INLINE = INLINE_PHRASAL | INLINE_PRES | INLINE_STRUCT -LIST_ELEMS = set('dl, ol, ul'.split(', ')) +LIST_ELEMS = set(['dl', 'ol', 'ul']) for _name in BLOCK_HEAD: _num = int(_name[1]) @@ -200,8 +201,9 @@ def _parse_css_color(color): return rgba def style_iter(style): - return ([x.strip() for x in item.split(':', 1)] for item in style.split(';')\ - if len(item.strip())) + for item in style.split(';'): + if item.strip(): + yield [x.strip() for x in item.split(':', 1)] class HtmlHandler(xml.sax.handler.ContentHandler): @@ -499,7 +501,9 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag.href = href tag.type_ = type_ # to be used by the URL handler tag.connect('event', self.textview.hyperlink_handler, 'url') - tag.set_property('foreground', app.css_config.get_value('.gajim-url', StyleAttr.COLOR)) + tag.set_property('foreground', + app.css_config.get_value('.gajim-url', + StyleAttr.COLOR)) tag.set_property('underline', Pango.Underline.SINGLE) tag.is_anchor = True if title: @@ -541,7 +545,9 @@ class HtmlHandler(xml.sax.handler.ContentHandler): if alt: alt += '\n' alt += _('Loading') - pixbuf = load_icon('image-missing', self.textview, pixbuf=True) + pixbuf = load_icon('image-missing', + self.textview, + pixbuf=True) if mem: # Caveat: GdkPixbuf is known not to be safe to load # images from network... this program is now potentially @@ -624,7 +630,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def _begin_span(self, style, tag=None, id_=None): if style is None: self.styles.append(tag) - return None + return if tag is None: if id_: tag = self.textbuf.create_tag(id_) @@ -911,34 +917,37 @@ class HtmlTextView(Gtk.TextView): menu.connect('notify::visible', destroy) menu.popup_at_pointer() - def hyperlink_handler(self, texttag, _widget, event, iter_, kind): - if event.type == Gdk.EventType.BUTTON_PRESS: - begin_iter = iter_.copy() - # we get the beginning of the tag - while not begin_iter.starts_tag(texttag): - begin_iter.backward_char() - end_iter = iter_.copy() - # we get the end of the tag - while not end_iter.ends_tag(texttag): - end_iter.forward_char() - - # Detect XHTML-IM link - word = getattr(texttag, 'href', None) - if not word: - word = self.get_buffer().get_text(begin_iter, end_iter, True) - - uri = parse_uri(word) - if event.button.button == 3: # right click - self.show_context_menu(uri) - return True - - self.plugin_modified = False - app.plugin_manager.extension_point( - 'hyperlink_handler', uri, self, self.get_toplevel()) - if self.plugin_modified: - return + def hyperlink_handler(self, texttag, _widget, event, iter_, _kind): + if event.type != Gdk.EventType.BUTTON_PRESS: + return Gdk.EVENT_PROPAGATE + + begin_iter = iter_.copy() + # we get the beginning of the tag + while not begin_iter.starts_tag(texttag): + begin_iter.backward_char() + end_iter = iter_.copy() + # we get the end of the tag + while not end_iter.ends_tag(texttag): + end_iter.forward_char() + + # Detect XHTML-IM link + word = getattr(texttag, 'href', None) + if not word: + word = self.get_buffer().get_text(begin_iter, end_iter, True) + + uri = parse_uri(word) + if event.button.button == 3: # right click + self.show_context_menu(uri) + return Gdk.EVENT_STOP + + self.plugin_modified = False + app.plugin_manager.extension_point( + 'hyperlink_handler', uri, self, self.get_toplevel()) + if self.plugin_modified: + return Gdk.EVENT_STOP - open_uri(uri, account=self.account) + open_uri(uri, account=self.account) + return Gdk.EVENT_STOP def display_html(self, html, textview, conv_textview, iter_=None): buffer_ = self.get_buffer() ===================================== gajim/gtk/http_upload_progress.py ===================================== @@ -80,7 +80,7 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self._ui.progressbar.pulse() return True - def _on_cancel_upload_button_clicked(self, widget): + def _on_cancel_upload_button_clicked(self, _widget): self.destroy() def _on_destroy(self, *args): @@ -117,7 +117,8 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self._ui.eta_label.set_text(eta) self._ui.progressbar.set_fraction(float(seen) / total) - def _format_eta(self, time_): + @staticmethod + def _format_eta(time_): times = {'minutes': 0, 'seconds': 0} time_ = int(time_) times['seconds'] = time_ % 60 ===================================== gajim/gtk/notification.py ===================================== @@ -77,7 +77,7 @@ class Notification(EventHelper): def on_proxy_ready(_source, res, _data=None): try: proxy = Gio.DBusProxy.new_finish(res) - self.daemon_capabilities = proxy.GetCapabilities() + self._daemon_capabilities = proxy.GetCapabilities() except GLib.Error: log.exception('Notifications D-Bus connection failed') else: @@ -137,6 +137,7 @@ class Notification(EventHelper): if obj.transport_name is not None: return '%s-%s' % (obj.transport_name, obj.show) return get_icon_name(obj.show) + return None def popup(self, event_type, jid, account, type_='', icon_name=None, title=None, text=None, timeout=-1, room_jid=None): @@ -318,7 +319,8 @@ class PopupNotification(Gtk.Window): if timeout > 0: self._timeout_id = GLib.timeout_add_seconds(timeout, self.destroy) - def _get_window_pos(self): + @staticmethod + def _get_window_pos(): pos_x = app.config.get('notification_position_x') screen_w, screen_h = get_total_screen_geometry() if pos_x < 0: ===================================== gajim/gtk/pep_config.py ===================================== @@ -28,14 +28,14 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import EventHelper -class ManagePEPServicesWindow(Gtk.ApplicationWindow, EventHelper): +class PEPConfig(Gtk.ApplicationWindow, EventHelper): def __init__(self, account): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) - self.set_name('ManagePEPServicesWindow') + self.set_name('PEPConfig') self.set_default_size(300, 350) self.set_resizable(True) self.set_transient_for(app.interface.roster.window) @@ -59,11 +59,11 @@ class ManagePEPServicesWindow(Gtk.ApplicationWindow, EventHelper): self.connect('key-press-event', self._on_key_press_event) self._ui.connect_signals(self) - def _on_key_press_event(self, widget, event): + def _on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_services_selection_changed(self, sel): + def _on_services_selection_changed(self, _selection): self._ui.configure_button.set_sensitive(True) self._ui.delete_button.set_sensitive(True) @@ -114,7 +114,7 @@ class ManagePEPServicesWindow(Gtk.ApplicationWindow, EventHelper): _('PEP node %(node)s was not removed:\n%(message)s') % { 'node': node, 'message': msg}) - def _on_delete_button_clicked(self, widget): + def _on_delete_button_clicked(self, _widget): selection = self._ui.services_treeview.get_selection() if not selection: return @@ -126,7 +126,7 @@ class ManagePEPServicesWindow(Gtk.ApplicationWindow, EventHelper): on_ok=self._node_removed, on_fail=self._node_not_removed) - def _on_configure_button_clicked(self, widget): + def _on_configure_button_clicked(self, _widget): selection = self._ui.services_treeview.get_selection() if not selection: return ===================================== gajim/gtk/proxies.py ===================================== @@ -47,7 +47,8 @@ class ManageProxies(Gtk.ApplicationWindow): if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_destroy(self, *args): + @staticmethod + def _on_destroy(*args): # Window callbacks for updating proxy comboboxes window_pref = get_app_window('Preferences') window_accounts = get_app_window('AccountsWindow') ===================================== gajim/gtk/tooltips.py ===================================== @@ -311,11 +311,7 @@ class RosterTooltip(StatusTable): if account == 'all': # Tooltip for merged accounts row - accounts = helpers.get_notification_icon_tooltip_dict() - self.spacer_label = '' - self.fill_table_with_accounts(accounts) - self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) - self.table.show_all() + self._show_merged_account_tooltip() return if typ == 'account': @@ -345,14 +341,16 @@ class RosterTooltip(StatusTable): contacts) if self.prim_contact is None: log.error('No contact for Roster tooltip found') - log.error('contacts: %s, typ: %s, account: %s', contacts, typ, account) + log.error('contacts: %s, typ: %s, account: %s', + contacts, typ, account) return self.contact_jid = self.prim_contact.jid name = GLib.markup_escape_text(self.prim_contact.get_shown_name()) name_markup = '<b>{}</b>'.format(name) if app.config.get('mergeaccounts'): color = app.config.get('tooltip_account_name_color') - account_name = GLib.markup_escape_text(self.prim_contact.account.name) + account_name = GLib.markup_escape_text( + self.prim_contact.account.name) name_markup += " <span foreground='{}'>({})</span>".format( color, account_name) @@ -360,7 +358,8 @@ class RosterTooltip(StatusTable): name_markup += _(' [blocked]') try: - if self.prim_contact.jid in app.interface.minimized_controls[account]: + controls = app.interface.minimized_controls[account] + if self.prim_contact.jid in controls: name_markup += _(' [minimized]') except KeyError: pass @@ -460,10 +459,17 @@ class RosterTooltip(StatusTable): i += 1 self.last_widget.set_vexpand(True) + def _show_merged_account_tooltip(self): + accounts = helpers.get_notification_icon_tooltip_dict() + self.spacer_label = '' + self.fill_table_with_accounts(accounts) + self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) + self.table.show_all() + def _append_pep_info(self, contact): """ - Append Tune, Mood, Activity, Location information of the specified contact - to the given property list. + Append Tune, Mood, Activity, Location information of the + specified contact to the given property list. """ if PEPEventType.MOOD in contact.pep: mood = format_mood(*contact.pep[PEPEventType.MOOD]) ===================================== gajim/gtk/util.py ===================================== @@ -726,10 +726,7 @@ def open_window(name, **kwargs): class EventHelper(CommonEventHelper): def __init__(self): CommonEventHelper.__init__(self) - self.connect('destroy', self.__on_destroy) - - def connect(self, *args): - raise NotImplementedError + self.connect('destroy', self.__on_destroy) # pylint: disable=no-member def __on_destroy(self, *args): self.unregister_events() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c86fa3743ace6ba9242547a9b63da3a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c86fa3743ace6ba9242547a9b63da3a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Rework InputDialog
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 77a4f36c by Daniel Brötzmann at 2019-11-17T13:15:29Z Rework InputDialog - - - - - 4fd4bda0 by Daniel Brötzmann at 2019-11-17T13:15:34Z Add mnemonics to default button types - - - - - cba9931e by Daniel Brötzmann at 2019-11-17T13:15:34Z Remove usage of ResourceConflictDialog - - - - - 9c86fa37 by Daniel Brötzmann at 2019-11-17T13:15:34Z Remove obsolete ResourceConflictDialog - - - - - 6 changed files: - − gajim/data/gui/input_dialog.ui - − gajim/data/gui/input_text_dialog.ui - gajim/dialogs.py - gajim/gtk/dialogs.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/input_dialog.ui deleted ===================================== @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="input_dialog"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="type_hint">dialog</property> - <signal name="delete-event" handler="on_input_dialog_delete_event" swapped="no"/> - <signal name="destroy" handler="on_input_dialog_destroy" swapped="no"/> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancelbutton"> - <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="okbutton"> - <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </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="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkBox" id="hbox2960"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="image507"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_markup">True</property> - </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">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="input_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </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">1</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancelbutton</action-widget> - <action-widget response="-5">okbutton</action-widget> - </action-widgets> - </object> -</interface> ===================================== gajim/data/gui/input_text_dialog.ui deleted ===================================== @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="input_dialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="default_width">400</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_input_dialog_destroy" swapped="no"/> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancelbutton"> - <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="okbutton"> - <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </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="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="vbox76"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox" id="hbox2960"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkImage" id="image507"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_markup">True</property> - </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">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="input_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> - </object> - </child> - </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> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancelbutton</action-widget> - <action-widget response="-5">okbutton</action-widget> - </action-widgets> - </object> -</interface> ===================================== gajim/dialogs.py ===================================== @@ -670,13 +670,13 @@ class ChangeStatusMessageDialog(TimeoutDialog): status_message_to_save_as_preset = self.message_buffer.get_text( start_iter, finish_iter, True) - def on_ok(msg_name): + def _on_save_preset(msg_name): msg_text = status_message_to_save_as_preset msg_text_1l = helpers.to_one_line(msg_text) if not msg_name: # msg_name was '' msg_name = msg_text_1l - def _on_ok2(): + def _on_overwrite_preset(): self.preset_messages_dict[msg_name] = [ msg_text, self.pep_dict.get('activity'), self.pep_dict.get('subactivity'), @@ -694,6 +694,7 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.pep_dict.get('mood')) app.config.set_per('statusmsg', msg_name, 'mood_text', self.pep_dict.get('mood_text')) + if msg_name in self.preset_messages_dict: NewConfirmationDialog( _('Overwrite'), @@ -703,17 +704,26 @@ class ChangeStatusMessageDialog(TimeoutDialog): [DialogButton.make('Cancel'), DialogButton.make('Remove', text=_('_Overwrite'), - callback=_on_ok2)], + callback=_on_overwrite_preset)], transient_for=self.dialog).show() return + app.config.add_per('statusmsg', msg_name) - _on_ok2() + _on_overwrite_preset() iter_ = self.message_liststore.append((msg_name,)) - # select in combobox the one we just saved + # Select the one we just saved in combobox self.message_combobox.set_active_iter(iter_) - InputDialog(_('Save as Preset Status Message'), - _('Please type a name for this status message'), is_modal=False, - ok_handler=on_ok) + + InputDialog( + _('Status Preset'), + _('Save status as preset'), + _('Please assign a name to this status message preset'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Save'), + callback=_on_save_preset)], + input_str=_('New Status'), + transient_for=self.dialog).show() def on_activity_button_clicked(self, widget): self.countdown_enabled = False @@ -997,18 +1007,6 @@ class TransformChatToMUC: self.window.destroy() -class ResourceConflictDialog(TimeoutDialog, InputDialog): - def __init__(self, title, text, resource, ok_handler): - TimeoutDialog.__init__(self, 15) - InputDialog.__init__(self, title, text, input_str=resource, - is_modal=False, ok_handler=ok_handler) - self.title_text = title - self.run_timeout() - - def on_timeout(self): - self.on_okbutton_clicked(None) - - class VoIPCallReceivedDialog: instances = {} # type: Dict[Tuple[str, str], VoIPCallReceivedDialog] def __init__(self, account, contact_jid, sid, content_types): ===================================== gajim/gtk/dialogs.py ===================================== @@ -45,26 +45,26 @@ class DialogButton(namedtuple('DialogButton', ('response text callback args ' if type_ is not None: if type_ == 'OK': default_kwargs['response'] = Gtk.ResponseType.OK - default_kwargs['text'] = 'OK' + default_kwargs['text'] = _('_OK') elif type_ == 'Cancel': default_kwargs['response'] = Gtk.ResponseType.CANCEL - default_kwargs['text'] = _('Cancel') + default_kwargs['text'] = _('_Cancel') elif type_ == 'Accept': default_kwargs['response'] = Gtk.ResponseType.ACCEPT - default_kwargs['text'] = _('Accept') + default_kwargs['text'] = _('_Accept') default_kwargs['is_default'] = True default_kwargs['action'] = ButtonAction.SUGGESTED elif type_ == 'Delete': default_kwargs['response'] = Gtk.ResponseType.REJECT - default_kwargs['text'] = _('Delete') + default_kwargs['text'] = _('_Delete') default_kwargs['action'] = ButtonAction.DESTRUCTIVE elif type_ == 'Remove': default_kwargs['response'] = Gtk.ResponseType.REJECT - default_kwargs['text'] = _('Remove') + default_kwargs['text'] = _('_Remove') default_kwargs['action'] = ButtonAction.DESTRUCTIVE else: raise ValueError('Unknown button type: %s ' % type_) @@ -276,151 +276,6 @@ class ConfirmationDialogDoubleRadio(ConfirmationDialog): return [is_checked_1, is_checked_2] -class CommonInputDialog: - """ - Common Class for Input dialogs - """ - - def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler, - transient_for=None): - self.dialog = self.xml.get_object('input_dialog') - label = self.xml.get_object('label') - self.dialog.set_title(title) - label.set_markup(label_str) - self.cancel_handler = cancel_handler - self.vbox = self.xml.get_object('vbox') - if transient_for is None: - transient_for = app.app.get_active_window() - self.dialog.set_transient_for(transient_for) - - self.ok_handler = ok_handler - okbutton = self.xml.get_object('okbutton') - okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_object('cancelbutton') - cancelbutton.connect('clicked', self.on_cancelbutton_clicked) - self.xml.connect_signals(self) - self.dialog.show_all() - - def on_input_dialog_destroy(self, widget): - if self.cancel_handler: - self.cancel_handler() - - def on_okbutton_clicked(self, widget): - user_input = self.get_text() - if user_input: - user_input = user_input - self.cancel_handler = None - self.dialog.destroy() - if isinstance(self.ok_handler, tuple): - self.ok_handler[0](user_input, *self.ok_handler[1:]) - else: - self.ok_handler(user_input) - - def on_cancelbutton_clicked(self, widget): - self.dialog.destroy() - - def destroy(self): - self.dialog.destroy() - - -class InputDialog(CommonInputDialog): - """ - Class for Input dialog - """ - - def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None, transient_for=None): - self.xml = get_builder('input_dialog.ui') - CommonInputDialog.__init__(self, title, label_str, is_modal, - ok_handler, cancel_handler, - transient_for=transient_for) - self.input_entry = self.xml.get_object('input_entry') - if input_str: - self.set_entry(input_str) - - def on_input_dialog_delete_event(self, widget, event): - ''' - may be implemented by subclasses - ''' - - def set_entry(self, value): - self.input_entry.set_text(value) - self.input_entry.select_region(0, -1) # select all - - def get_text(self): - return self.input_entry.get_text() - - -class InputDialogCheck(InputDialog): - """ - Class for Input dialog - """ - - def __init__(self, title, label_str, checktext='', input_str=None, - is_modal=True, ok_handler=None, cancel_handler=None, - transient_for=None): - self.xml = get_builder('input_dialog.ui') - InputDialog.__init__(self, title, label_str, input_str=input_str, - is_modal=is_modal, ok_handler=ok_handler, - cancel_handler=cancel_handler, - transient_for=transient_for) - self.input_entry = self.xml.get_object('input_entry') - if input_str: - self.input_entry.set_text(input_str) - self.input_entry.select_region(0, -1) # select all - - if checktext: - self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) - self.vbox.pack_start(self.checkbutton, False, True, 0) - self.checkbutton.show() - - def on_okbutton_clicked(self, widget): - user_input = self.get_text() - if user_input: - user_input = user_input - self.cancel_handler = None - self.dialog.destroy() - if isinstance(self.ok_handler, tuple): - self.ok_handler[0](user_input, self.is_checked(), *self.ok_handler[1:]) - else: - self.ok_handler(user_input, self.is_checked()) - - def get_text(self): - return self.input_entry.get_text() - - def is_checked(self): - """ - Get active state of the checkbutton - """ - try: - return self.checkbutton.get_active() - except Exception: - # There is no checkbutton - return False - - -class InputTextDialog(CommonInputDialog): - """ - Class for multilines Input dialog (more place than InputDialog) - """ - - def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None, transient_for=None): - self.xml = get_builder('input_text_dialog.ui') - CommonInputDialog.__init__(self, title, label_str, is_modal, - ok_handler, cancel_handler, - transient_for=transient_for) - self.input_buffer = self.xml.get_object('input_textview').get_buffer() - if input_str: - self.input_buffer.set_text(input_str) - start_iter, end_iter = self.input_buffer.get_bounds() - self.input_buffer.select_range(start_iter, end_iter) # select all - - def get_text(self): - start_iter, end_iter = self.input_buffer.get_bounds() - return self.input_buffer.get_text(start_iter, end_iter, True) - - class CertificateDialog(Gtk.ApplicationWindow): def __init__(self, transient_for, account, cert): Gtk.ApplicationWindow.__init__(self) @@ -748,6 +603,35 @@ class NewConfirmationCheckDialog(NewConfirmationDialog): super()._on_response(_dialog, response) +class InputDialog(NewConfirmationDialog): + def __init__(self, title, text, sec_text, buttons, input_str=None, + transient_for=None, modal=True): + NewConfirmationDialog.__init__(self, + title, + text, + sec_text, + buttons, + transient_for=transient_for, + modal=modal) + + self._entry = Gtk.Entry() + self._entry.set_activates_default(True) + self._entry.set_margin_start(50) + self._entry.set_margin_end(50) + + if input_str: + self._entry.set_text(input_str) + self._entry.select_region(0, -1) # select all + + self.get_content_area().add(self._entry) + + def _on_response(self, _dialog, response): + button = self._buttons.get(response) + if button is not None: + button.args.insert(0, self._entry.get_text()) + super()._on_response(_dialog, response) + + class ShortcutsWindow: def __init__(self): transient = app.app.get_active_window() ===================================== gajim/gui_interface.py ===================================== @@ -91,12 +91,12 @@ from gajim.common import optparser from gajim.gtk.avatar import AvatarStorage from gajim.gtk.notification import Notification +from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import NewConfirmationCheckDialog -from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import InvitationReceivedDialog @@ -878,19 +878,27 @@ class Interface: app.contacts.define_metacontacts(obj.conn.name, obj.meta_list) def handle_event_zc_name_conflict(self, obj): - def on_ok(new_name): + def _on_ok(new_name): app.config.set_per('accounts', obj.conn.name, 'name', new_name) show = obj.conn.old_show status = obj.conn.status obj.conn.username = new_name obj.conn.change_status(show, status) - def on_cancel(): + + def _on_cancel(*args): obj.conn.change_status('offline', '') - InputDialog(_('Username Conflict'), - _('Please type a new username for your local account'), - input_str=obj.alt_name, is_modal=True, ok_handler=on_ok, - cancel_handler=on_cancel, transient_for=self.roster.window) + InputDialog( + _('Username Conflict'), + _('Username Conflict'), + _('Please enter a new username for your local account'), + [DialogButton.make('Cancel', + callback=_on_cancel), + DialogButton.make('Accept', + text=_('_OK'), + callback=_on_ok)], + input_str=obj.alt_name, + transient_for=self.roster.window).show() def handle_event_resource_conflict(self, obj): # ('RESOURCE_CONFLICT', account, ()) @@ -899,7 +907,7 @@ class Interface: conn = obj.conn self.roster.send_status(account, 'offline', conn.status) - def on_ok(new_resource): + def _set_resource(new_resource): app.config.set_per('accounts', account, 'resource', new_resource) self.roster.send_status(account, conn.old_show, conn.status) @@ -907,14 +915,21 @@ class Interface: if proposed_resource.startswith('gajim.'): # Dont notify the user about resource change if he didn't set # a custom resource - on_ok('gajim.$rand') + _set_resource('gajim.$rand') return proposed_resource += app.config.get('gc_proposed_nick_char') - dialogs.ResourceConflictDialog(_('Resource Conflict'), + + InputDialog( + _('Resource Conflict'), + _('Resource Conflict'), _('You are already connected to this account with the same ' - 'resource. Please type a new one'), resource=proposed_resource, - ok_handler=on_ok) + 'resource. Please enter a different one.'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Connect'), + callback=_set_resource)], + input_str=proposed_resource).show() def handle_event_jingleft_cancel(self, obj): ft = self.instances['file_transfers'] ===================================== gajim/roster_window.py ===================================== @@ -2893,31 +2893,30 @@ class RosterWindow: del app.interface.instances[acct]['privacy_list_block'] def on_rename(self, widget, row_type, jid, account): - # this function is called either by F2 or by Rename menuitem + # This function is called either by F2 or by Rename menuitem if 'rename' in app.interface.instances: app.interface.instances['rename'].dialog.present() return - # account is offline, don't allow to rename + # Account is offline, don't allow to rename if not app.account_is_connected(account): return if row_type in ('contact', 'agent'): - # it's jid + # It's jid title = _('Rename Contact') - message = _('Enter a new nickname for contact %s') % jid + text = _('Rename contact %s?') % jid + sec_text = _('Please enter a new nickname') old_text = app.contacts.get_contact_with_highest_priority(account, - jid).name + jid).name elif row_type == 'group': if jid in helpers.special_groups + (_('General'),): return old_text = jid title = _('Rename Group') - message = _('Enter a new name for group %s') % \ - GLib.markup_escape_text(jid) + text = _('Rename group %s?') % GLib.markup_escape_text(jid) + sec_text = _('Please enter a new name') - def on_renamed(new_text, account, row_type, jid, old_text): - if 'rename' in app.interface.instances: - del app.interface.instances['rename'] + def _on_renamed(new_text, account, row_type, jid, old_text): if row_type in ('contact', 'agent'): if old_text == new_text: return @@ -2936,16 +2935,23 @@ class RosterWindow: win.redraw_tab(ctrl) win.show_title() elif row_type == 'group': - # in Column.JID column, we hold the group name (which is not escaped) + # In Column.JID column, we hold the group name (which is not escaped) self.rename_group(old_text, new_text, account) - def on_canceled(): - if 'rename' in app.interface.instances: - del app.interface.instances['rename'] - - app.interface.instances['rename'] = InputDialog(title, - message, old_text, False, (on_renamed, account, row_type, jid, - old_text), on_canceled, transient_for=self.window) + InputDialog( + title, + text, + sec_text, + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Rename'), + callback=_on_renamed, + args=[account, + row_type, + jid, + old_text])], + input_str=old_text, + transient_for=self.window).show() def on_remove_group_item_activated(self, widget, group, account): def _on_ok(is_checked): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6329dfd072484dbb43d0684388a4837fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6329dfd072484dbb43d0684388a4837fe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Refactor opening windows
by Philipp Hörist 17 Nov '19

17 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 321e7b31 by Philipp Hörist at 2019-11-17T11:20:33Z Refactor opening windows Add open_window() which is more concise - - - - - 11852b4e by Philipp Hörist at 2019-11-17T11:20:33Z Actions: Fix pylint erros - - - - - 6329dfd0 by Philipp Hörist at 2019-11-17T11:20:33Z Application: Fix pylint errors - - - - - 21 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/app.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/add_contact.py - gajim/gtk/const.py - gajim/gtk/preferences.py - gajim/gtk/proxies.py - gajim/gtk/server_info.py - gajim/gtk/sounds.py - gajim/gtk/ssl_error_dialog.py - gajim/gtk/statusicon.py - gajim/gtk/themes.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/message_window.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -26,89 +26,60 @@ from gajim import dialogs import gajim.plugins.gui from gajim.gtk.dialogs import ShortcutsWindow -from gajim.gtk.history_sync import HistorySyncAssistant -from gajim.gtk.server_info import ServerInfo -from gajim.gtk.mam_preferences import MamPreferences -from gajim.gtk.preferences import Preferences -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 from gajim.gtk.about import AboutDialog from gajim.gtk.privacy_list import PrivacyListsWindow -from gajim.gtk.bookmarks import Bookmarks from gajim.gtk.features import FeaturesDialog from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.history import HistoryWindow -from gajim.gtk.accounts import AccountsWindow -from gajim.gtk.proxies import ManageProxies from gajim.gtk.discovery import ServiceDiscoveryWindow -from gajim.gtk.blocking import BlockingList -from gajim.gtk.xml_console import XMLConsoleWindow -from gajim.gtk.groupchat_join import GroupchatJoin -from gajim.gtk.pep_config import ManagePEPServicesWindow +from gajim.gtk.util import open_window +from gajim.gtk.util import get_app_window # General Actions -def on_add_contact_jid(action, param): - AddNewContactWindow(None, param.get_string()) +def on_add_contact_jid(_action, param): + contact_jid = param.get_string() + open_window('AddNewContactWindow', account=None, contact_jid=contact_jid) + # Application Menu Actions -def on_preferences(action, param): - window = app.get_app_window(Preferences) - if window is None: - Preferences() - else: - window.present() +def on_preferences(_action, _param): + open_window('Preferences') -def on_plugins(action, param): +def on_plugins(_action, _param): if 'plugins' in interface.instances: interface.instances['plugins'].window.present() else: interface.instances['plugins'] = gajim.plugins.gui.PluginsWindow() -def on_accounts(action, param): - window = app.get_app_window(AccountsWindow) - if window is None: - window = AccountsWindow() - else: - window.present() - +def on_accounts(_action, param): + window = open_window('AccountsWindow') account = param.get_string() if account: window.select_account(account) -def on_history_manager(action, param): - from gajim.history_manager import HistoryManager - HistoryManager() +def on_history_manager(_action, _param): + open_window('HistoryManager') -def on_bookmarks(action, param): +def on_bookmarks(_action, param): account = param.get_string() - window = app.get_app_window(Bookmarks, account=account) - if window is None: - window = Bookmarks(account) - else: - window.present() + open_window('Bookmarks', account=account) -def on_quit(action, param): +def on_quit(_action, _param): interface.roster.on_quit_request() def on_new_chat(_action, param): + window = open_window('StartChatDialog') search_text = param.get_string() - window = app.get_app_window(StartChatDialog) - if window is None: - window = StartChatDialog() - else: - window.present() - if search_text: window.set_search_text(search_text) @@ -116,18 +87,19 @@ def on_new_chat(_action, param): # Accounts Actions -def on_profile(action, param): - interface.edit_own_details(param.get_string()) +def on_profile(_action, param): + account = param.get_string() + open_window('ProfileWindow', account=account) -def on_send_server_message(action, param): +def on_send_server_message(_action, param): account = param.get_string() server = app.config.get_per('accounts', account, 'hostname') server += '/announce/online' SingleMessageWindow(account, server, 'send') -def on_service_disco(action, param): +def on_service_disco(_action, param): account = param.get_string() server_jid = app.config.get_per('accounts', account, 'hostname') if server_jid in interface.instances[account]['disco']: @@ -141,26 +113,20 @@ def on_service_disco(action, param): pass 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() + account = param.get_string() + open_window('CreateGroupchatWindow', account=account or None) def on_add_contact(_action, param): - account, jid = param.get_strv() - if not jid: - jid = None - window = app.get_app_window(AddNewContactWindow, account) - if window is None: - AddNewContactWindow(account, jid) - else: - window.present() + account, contact_jid = param.get_strv() + if not contact_jid: + contact_jid = None + open_window('AddNewContactWindow', account=account, contact_jid=contact_jid) -def on_single_message(action, param): - SingleMessageWindow(param.get_string(), action='send') +def on_single_message(_action, param): + account = param.get_string() + open_window('SingleMessageWindow', account=account, action='send') def on_merge_accounts(action, param): @@ -175,7 +141,7 @@ def on_merge_accounts(action, param): app.interface.roster.setup_and_draw_roster() -def on_add_account(action, param): +def on_add_account(_action, _param): if 'account_creation_wizard' in app.interface.instances: app.interface.instances['account_creation_wizard'].window.present() else: @@ -183,7 +149,7 @@ def on_add_account(action, param): AccountCreationWizard() -def on_import_contacts(action, param): +def on_import_contacts(_action, param): account = param.get_string() if 'import_contacts' in app.interface.instances: app.interface.instances['import_contacts'].dialog.present() @@ -194,43 +160,29 @@ def on_import_contacts(action, param): # Advanced Actions -def on_pep_config(action, param): +def on_pep_config(_action, param): account = param.get_string() - window = app.get_app_window(ManagePEPServicesWindow, account=account) - if window is None: - ManagePEPServicesWindow(account) - else: - window.present() + open_window('ManagePEPServicesWindow', account=account) -def on_mam_preferences(action, param): +def on_mam_preferences(_action, param): account = param.get_string() - window = app.get_app_window(MamPreferences, account) - if window is None: - MamPreferences(account) - else: - window.present() + open_window('MamPreferences', account=account) -def on_blocking_list(action, param): +def on_blocking_list(_action, param): account = param.get_string() - window = app.get_app_window(MamPreferences, account) - if window is None: - BlockingList(account) - else: - window.present() + open_window('BlockingList', account=account) -def on_history_sync(action, param): +def on_history_sync(_action, param): account = param.get_string() - window = app.get_app_window(HistorySyncAssistant, account) - if window is None: - HistorySyncAssistant(account, interface.roster.window) - else: - window.present() + open_window('HistorySyncAssistant', + account=account, + parent=interface.roster.window) -def on_privacy_lists(action, param): +def on_privacy_lists(_action, param): account = param.get_string() if 'privacy_lists' in interface.instances[account]: interface.instances[account]['privacy_lists'].window.present() @@ -239,74 +191,66 @@ def on_privacy_lists(action, param): PrivacyListsWindow(account) -def on_server_info(action, param): +def on_server_info(_action, param): account = param.get_string() - window = app.get_app_window(ServerInfo, account) - if window is None: - ServerInfo(account) - else: - window.present() + open_window('ServerInfo', account=account) -def on_xml_console(action, param): - XMLConsoleWindow() +def on_xml_console(_action, _param): + open_window('XMLConsoleWindow') +def on_manage_proxies(_action, _param): + open_window('ManageProxies') -def on_manage_proxies(action, param): - window = app.get_app_window(ManageProxies) - if window is None: - ManageProxies() - else: - window.present() # Admin Actions -def on_set_motd(action, param): +def on_set_motd(_action, param): account = param.get_string() server = app.config.get_per('accounts', account, 'hostname') server += '/announce/motd' SingleMessageWindow(account, server, 'send') -def on_update_motd(action, param): +def on_update_motd(_action, param): account = param.get_string() server = app.config.get_per('accounts', account, 'hostname') server += '/announce/motd/update' SingleMessageWindow(account, server, 'send') -def on_delete_motd(action, param): +def on_delete_motd(_action, param): account = param.get_string() app.connections[account].get_module('Announce').delete_motd() # Help Actions -def on_contents(action, param): +def on_contents(_action, _param): helpers.open_uri('https://dev.gajim.org/gajim/gajim/wikis') -def on_faq(action, param): +def on_faq(_action, _param): helpers.open_uri('https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') -def on_keyboard_shortcuts(action, param): +def on_keyboard_shortcuts(_action, _param): ShortcutsWindow() -def on_features(action, param): +def on_features(_action, _param): FeaturesDialog() -def on_about(action, param): +def on_about(_action, _param): AboutDialog() # View Actions -def on_file_transfers(action, param): +def on_file_transfers(_action, _param): if interface.instances['file_transfers']. \ window.get_property('visible'): interface.instances['file_transfers'].window.present() @@ -318,7 +262,7 @@ def on_history(action, param): on_browse_history(action, param) -def on_open_event(action, param): +def on_open_event(_action, param): dict_ = param.unpack() app.interface.handle_event( dict_['account'], dict_['jid'], dict_['type_']) @@ -326,7 +270,7 @@ def on_open_event(action, param): # Other Actions -def toggle_ipython(action, param): +def toggle_ipython(_action, _param): """ Show/hide the ipython window """ @@ -337,7 +281,7 @@ def toggle_ipython(action, param): app.interface.create_ipython_window() -def show_next_pending_event(action, param): +def show_next_pending_event(_action, _param): """ Show the window(s) with next pending event in tabbed/group chats """ @@ -378,7 +322,7 @@ def on_browse_history(_action, param): jid = dict_.get('jid') account = dict_.get('account') - window = app.get_app_window(HistoryWindow) + window = get_app_window(HistoryWindow) if window is None: HistoryWindow(jid, account) else: @@ -389,8 +333,4 @@ def on_browse_history(_action, param): def on_groupchat_join(_action, param): account, jid = param.get_strv() - window = app.get_app_window(GroupchatJoin, account=account, jid=jid) - if window is None: - GroupchatJoin(account, jid) - else: - window.present() + open_window('GroupchatJoin', account=account, jid=jid) ===================================== gajim/application.py ===================================== @@ -191,7 +191,7 @@ class GajimApplication(Gtk.Application): option.short_name = 0 return [option] - def _startup(self, application): + def _startup(self, _application): # Create and initialize Application Paths & Databases app.detect_dependencies() @@ -228,7 +228,7 @@ class GajimApplication(Gtk.Application): menubar.prepend_submenu('Gajim', appmenu) self.set_menubar(menubar) - def _activate(self, application): + def _activate(self, _application): if self.interface is not None: self.interface.roster.window.present() return @@ -309,7 +309,7 @@ class GajimApplication(Gtk.Application): # Commit any outstanding SQL transactions app.logger.commit() - def _handle_remote_options(self, application, command_line): + def _handle_remote_options(self, _application, command_line): # Parse all options that should be executed on a remote instance options = command_line.get_options_dict() @@ -343,7 +343,7 @@ class GajimApplication(Gtk.Application): return 0 def _handle_local_options(self, - application: Gtk.Application, + _application: Gtk.Application, options: GLib.VariantDict) -> int: # Parse all options that have to be executed before ::startup if options.contains('version'): @@ -385,12 +385,13 @@ class GajimApplication(Gtk.Application): return -1 - def show_warnings(self): + @staticmethod + def show_warnings(): import traceback import warnings def warn_with_traceback(message, category, filename, lineno, - file=None, line=None): + _file=None, line=None): traceback.print_stack(file=sys.stderr) sys.stderr.write(warnings.formatwarning(message, category, filename, lineno, line)) @@ -477,7 +478,8 @@ class GajimApplication(Gtk.Application): else: self.add_account_actions(accounts_list[0]) - def _get_account_actions(self, account): + @staticmethod + def _get_account_actions(account): from gajim import app_actions as a if account == 'Local': @@ -594,7 +596,7 @@ class GajimApplication(Gtk.Application): action = '%s-blocking' % event.account self.lookup_action(action).set_enabled(True) - def _screensaver_active(self, application, param): + def _screensaver_active(self, _application, _param): '''Signal handler for screensaver active change''' active = self.get_property('screensaver-active') ===================================== gajim/common/app.py ===================================== @@ -657,24 +657,6 @@ def prefers_app_menu(): return False return app.prefers_app_menu() -def get_app_window(cls, account=None, jid=None): - for win in app.get_windows(): - if isinstance(cls, str): - if type(win).__name__ != cls: - continue - elif not isinstance(win, cls): - continue - - if account is not None: - if account != win.account: - continue - - if jid is not None: - if jid != win.jid: - continue - return win - return None - def load_css_config(): global css_config from gajim.gtk.css_config import CSSConfig ===================================== gajim/dialogs.py ===================================== @@ -53,6 +53,7 @@ from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder from gajim.gtk.util import get_activity_icon_name +from gajim.gtk.util import get_app_window if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports @@ -744,7 +745,7 @@ class SynchroniseSelectAccountDialog: self.account = account self.xml = get_builder('synchronise_select_account_dialog.ui') self.dialog = self.xml.get_object('synchronise_select_account_dialog') - self.dialog.set_transient_for(app.get_app_window('AccountsWindow')) + self.dialog.set_transient_for(get_app_window('AccountsWindow')) self.accounts_treeview = self.xml.get_object('accounts_treeview') model = Gtk.ListStore(str, str, bool) self.accounts_treeview.set_model(model) ===================================== gajim/groupchat_control.py ===================================== @@ -75,6 +75,7 @@ from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.groupchat_roster import GroupchatRoster from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name +from gajim.gtk.util import get_app_window from gajim.gtk.const import ControlType @@ -534,7 +535,7 @@ class GroupchatControl(ChatControlBase): self._show_page('groupchat') def _on_configure_room(self, _action, _param): - win = app.get_app_window('GroupchatConfig', self.account, self.room_jid) + win = get_app_window('GroupchatConfig', self.account, self.room_jid) if win is not None: win.present() return ===================================== gajim/gtk/account_wizard.py ===================================== @@ -32,8 +32,8 @@ from gajim import dataforms_widget from gajim import gui_menu_builder from gajim.gtk.util import get_builder +from gajim.gtk.util import get_app_window from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.proxies import ManageProxies from gajim.gtk.dataform import FakeDataFormWidget @@ -333,11 +333,7 @@ class AccountCreationWizard(EventHelper): proxies_combobox.set_active(0) def on_manage_proxies_button_clicked(self, _widget): - window = app.get_app_window(ManageProxies) - if window is None: - ManageProxies() - else: - window.present() + app.app.activate_action('manage-proxies') def on_custom_host_port_checkbutton_toggled(self, widget): self.xml.get_object('custom_host_hbox').set_sensitive( @@ -475,13 +471,7 @@ class AccountCreationWizard(EventHelper): GLib.source_remove(self.update_progressbar_timeout_id) def on_advanced_button_clicked(self, widget): - from gajim.gtk.accounts import AccountsWindow - window = app.get_app_window(AccountsWindow) - if window is None: - window = AccountsWindow() - else: - window.present() - window.select_account(self.account) + app.app.activate_action('accounts', GLib.Variant('s', self.account)) self.window.destroy() def on_finish_button_clicked(self, widget): @@ -580,7 +570,7 @@ class AccountCreationWizard(EventHelper): # action must be added before account window is updated app.app.add_account_actions(self.account) # refresh accounts window - window = app.get_app_window('AccountsWindow') + window = get_app_window('AccountsWindow') if window is not None: window.add_account(self.account) # refresh roster ===================================== gajim/gtk/accounts.py ===================================== @@ -40,6 +40,7 @@ from gajim.gtk.const import SettingType from gajim.gtk.settings import SettingsDialog from gajim.gtk.settings import SettingsBox from gajim.gtk.util import get_builder +from gajim.gtk.util import get_app_window log = logging.getLogger('gajim.gtk.accounts') @@ -1035,7 +1036,7 @@ class RemoveAccountWindow: app.app.remove_account_actions(self.account) gui_menu_builder.build_accounts_menu() - window = app.get_app_window('AccountsWindow') + window = get_app_window('AccountsWindow') if window is not None: window.remove_account(self.account) self._ui.remove_account_window.destroy() ===================================== gajim/gtk/add_contact.py ===================================== @@ -32,7 +32,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow, EventHelper): 'gadu-gadu': _('GG Number'), 'icq': _('ICQ Number')} - def __init__(self, account=None, jid=None, user_nick=None, group=None): + def __init__(self, account=None, contact_jid=None, user_nick=None, group=None): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_application(app.app) @@ -46,8 +46,8 @@ class AddNewContactWindow(Gtk.ApplicationWindow, EventHelper): self.account = account self.adding_jid = False - if jid is not None: - jid = app.get_jid_without_resource(jid) + if contact_jid is not None: + contact_jid = app.get_jid_without_resource(contact_jid) # fill accounts with active accounts accounts = app.get_enabled_accounts_with_labels() @@ -127,16 +127,16 @@ class AddNewContactWindow(Gtk.ApplicationWindow, EventHelper): self.protocol_combobox.set_active(0) self.auto_authorize_checkbutton.show() - if jid: + if contact_jid: self.jid_escaped = True - type_ = app.get_transport_name_from_jid(jid) + type_ = app.get_transport_name_from_jid(contact_jid) if not type_: type_ = 'jabber' if type_ == 'jabber': - self.uid_entry.set_text(jid) + self.uid_entry.set_text(contact_jid) transport = None else: - uid, transport = app.get_name_and_server_from_jid(jid) + uid, transport = app.get_name_and_server_from_jid(contact_jid) self.uid_entry.set_text(uid.replace('%', '@', 1)) self.show_contact_info_button.set_sensitive(True) ===================================== gajim/gtk/const.py ===================================== @@ -99,3 +99,33 @@ SHOW_COLORS = { 'dnd': (230/255, 46/255, 0), 'xa': (106/255, 0, 242/255) } + + +WINDOW_MODULES = { + 'AccountsWindow': 'gajim.gtk.accounts', + 'HistorySyncAssistant': 'gajim.gtk.history_sync', + 'ServerInfo': 'gajim.gtk.server_info', + 'MamPreferences': 'gajim.gtk.mam_preferences', + 'Preferences': 'gajim.gtk.preferences', + 'CreateGroupchatWindow': 'gajim.gtk.groupchat_creation', + 'StartChatDialog': 'gajim.gtk.start_chat', + 'AddNewContactWindow': 'gajim.gtk.add_contact', + 'SingleMessageWindow': 'gajim.gtk.single_message', + 'PrivacyListsWindow': 'gajim.gtk.privacy_list', + 'Bookmarks': 'gajim.gtk.bookmarks', + 'AccountCreationWizard': 'gajim.gtk.account_wizard', + 'HistoryWindow': 'gajim.gtk.history', + 'ManageProxies': 'gajim.gtk.proxies', + 'ServiceDiscoveryWindow': 'gajim.gtk.discovery', + 'BlockingList': 'gajim.gtk.blocking', + 'XMLConsoleWindow': 'gajim.gtk.xml_console', + 'GroupchatJoin': 'gajim.gtk.groupchat_join', + 'ManagePEPServicesWindow': 'gajim.gtk.pep_config', + 'HistoryManager': 'gajim.history_manager', + 'GroupchatConfig': 'gajim.gtk.groupchat_config', + 'ProfileWindow': 'gajim.gtk.profile', + 'SSLErrorDialog': 'gajim.gtk.ssl_error_dialog', + 'Themes': 'gajim.gtk.themes', + 'AdvancedConfig': 'gajim.gtk.advanced_config', + 'CertificateDialog': 'gajim.gtk.dialogs', +} ===================================== gajim/gtk/preferences.py ===================================== @@ -33,10 +33,8 @@ from gajim.chat_control_base import ChatControlBase from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_available_iconsets +from gajim.gtk.util import open_window from gajim.gtk.dialogs import AspellDictError -from gajim.gtk.themes import Themes -from gajim.gtk.advanced_config import AdvancedConfig -from gajim.gtk.proxies import ManageProxies from gajim.gtk.sounds import ManageSounds from gajim.gtk.const import ControlType @@ -955,11 +953,7 @@ class Preferences(Gtk.ApplicationWindow): self._ui.theme_combobox.set_active_id(app.config.get('roster_theme')) def on_manage_theme_button_clicked(self, widget): - window = app.get_app_window(Themes) - if window is None: - Themes(self) - else: - window.present() + open_window('Themes', transient=self) def on_dark_theme_changed(self, widget): app.css_config.set_dark_theme(int(widget.get_active_id())) @@ -1051,11 +1045,7 @@ class Preferences(Gtk.ApplicationWindow): app.config.set('global_proxy', proxy) def on_manage_proxies_button_clicked(self, _widget): - window = app.get_app_window(ManageProxies) - if window is None: - ManageProxies() - else: - window.present() + app.app.activate_action('manage-proxies') def update_proxy_list(self): our_proxy = app.config.get('global_proxy') @@ -1083,10 +1073,5 @@ class Preferences(Gtk.ApplicationWindow): def _on_debug_folder_clicked(self, _widget): open_file(configpaths.get('DEBUG')) - # Advanced Config Editor (ACE) def on_open_advanced_editor_button_clicked(self, _widget): - window = app.get_app_window(AdvancedConfig) - if window is None: - AdvancedConfig() - else: - window.present() + open_window('AdvancedConfig') ===================================== gajim/gtk/proxies.py ===================================== @@ -19,6 +19,7 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.gtk.util import get_builder +from gajim.gtk.util import get_app_window class ManageProxies(Gtk.ApplicationWindow): @@ -48,8 +49,8 @@ class ManageProxies(Gtk.ApplicationWindow): 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') + window_pref = get_app_window('Preferences') + window_accounts = get_app_window('AccountsWindow') if window_pref is not None: window_pref.update_proxy_list() if window_accounts is not None: ===================================== gajim/gtk/server_info.py ===================================== @@ -25,10 +25,10 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ -from gajim.gtk.dialogs import CertificateDialog from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import get_builder from gajim.gtk.util import EventHelper +from gajim.gtk.util import open_window log = logging.getLogger('gajim.gtk.server_info') @@ -130,11 +130,10 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): self._ui.cert_button.set_sensitive(self.cert) def _on_cert_button_clicked(self, button_): - window = app.get_app_window(CertificateDialog, self.account) - if window is None: - CertificateDialog(self, self.account, self.cert) - else: - window.present() + open_window('CertificateDialog', + account=self.account, + transient_for=self, + cert=self.cert) def request_last_activity(self): if not app.account_is_connected(self.account): ===================================== gajim/gtk/sounds.py ===================================== @@ -22,6 +22,7 @@ from gajim.common import helpers from gajim.common.i18n import _ from gajim.gtk.util import get_builder +from gajim.gtk.util import get_app_window class ManageSounds: @@ -121,6 +122,6 @@ class ManageSounds: self.window.destroy() def _on_destroy(self, *args): - window = app.get_app_window('Preferences') + window = get_app_window('Preferences') if window is not None: window.sounds_preferences = None ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -24,8 +24,8 @@ from gajim.common.const import SSLError from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.i18n import _ -from gajim.gtk.dialogs import CertificateDialog from gajim.gtk.util import get_builder +from gajim.gtk.util import open_window class SSLErrorDialog(Gtk.ApplicationWindow): @@ -72,11 +72,10 @@ class SSLErrorDialog(Gtk.ApplicationWindow): self.destroy() def _on_view_cert_clicked(self, _button): - window = app.get_app_window(CertificateDialog, self.account) - if window is None: - CertificateDialog(self, self.account, self._cert) - else: - window.present() + open_window('CertificateDialog', + account=self.account, + transient_for=self, + cert=self._cert) def _on_connect_clicked(self, _button): # Ignore this error ===================================== gajim/gtk/statusicon.py ===================================== @@ -34,6 +34,7 @@ from gajim.common.helpers import save_roster_position from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import restore_roster_position +from gajim.gtk.util import open_window from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.tooltips import NotificationAreaTooltip @@ -304,12 +305,7 @@ class StatusIcon: win.hide() def on_preferences_menuitem_activate(self, widget): - from gajim.gtk.preferences import Preferences - window = app.get_app_window(Preferences) - if window is None: - Preferences() - else: - window.present() + open_window('Preferences') def on_quit_menuitem_activate(self, widget): app.interface.roster.on_quit_request() ===================================== gajim/gtk/themes.py ===================================== @@ -29,6 +29,7 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.util import get_builder +from gajim.gtk.util import get_app_window StyleOption = namedtuple('StyleOption', 'label selector attr') @@ -326,7 +327,7 @@ class Themes(Gtk.ApplicationWindow): @staticmethod def _on_destroy(*args): - window = app.get_app_window('Preferences') + window = get_app_window('Preferences') if window is not None: window.update_theme_list() ===================================== gajim/gtk/util.py ===================================== @@ -24,6 +24,7 @@ import os import sys import logging import textwrap +from importlib import import_module import xml.etree.ElementTree as ET from pathlib import Path from functools import wraps @@ -54,6 +55,7 @@ from gajim.common.const import StyleAttr from gajim.common.nec import EventHelper as CommonEventHelper from gajim.gtk.const import GajimIconSet +from gajim.gtk.const import WINDOW_MODULES _icon_theme = Gtk.IconTheme.get_default() if _icon_theme is not None: @@ -692,6 +694,35 @@ def make_href_markup(string): return URL_REGEX.sub(_to_href, string) +def get_app_window(name, account=None, jid=None): + for win in app.app.get_windows(): + if type(win).__name__ != name: + continue + + if account is not None: + if account != win.account: + continue + + if jid is not None: + if jid != win.jid: + continue + return win + return None + + +def open_window(name, **kwargs): + window = get_app_window(name, + kwargs.get('account'), + kwargs.get('jid')) + if window is None: + module = import_module(WINDOW_MODULES[name]) + window_cls = getattr(module, name) + window = window_cls(**kwargs) + else: + window.present() + return window + + class EventHelper(CommonEventHelper): def __init__(self): CommonEventHelper.__init__(self) ===================================== gajim/gui_interface.py ===================================== @@ -100,7 +100,6 @@ from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import InvitationReceivedDialog -from gajim.gtk.profile import ProfileWindow from gajim.gtk.filechoosers import FileChooserDialog from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data @@ -108,9 +107,9 @@ from gajim.gtk.filetransfer import FileTransfersWindow from gajim.gtk.http_upload_progress import HTTPUploadProgressWindow from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow -from gajim.gtk.ssl_error_dialog import SSLErrorDialog from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray +from gajim.gtk.util import open_window from gajim.gtk.const import ControlType @@ -232,16 +231,10 @@ class Interface: if account in self.show_vcard_when_connect and obj.show not in ( 'offline', 'error'): - self.edit_own_details(account) + action = '%s-profile' % account + app.app.activate_action(action, GLib.Variant('s', account)) self.show_vcard_when_connect.remove(account) - def edit_own_details(self, account): - window = app.get_app_window(ProfileWindow) - if window is None: - ProfileWindow(account) - else: - window.present() - @staticmethod def handle_gc_error(gc_control, pritext, sectext): if gc_control and gc_control.autorejoin is not None: @@ -1034,11 +1027,11 @@ class Interface: cert = obj.cert error_num = obj.error_num - window = app.get_app_window(SSLErrorDialog, account) - if window is None: - SSLErrorDialog(account, connection, cert, error_num) - else: - window.present() + open_window('SSLErrorDialog', + account=account, + connection=connection, + cert=cert, + error_num=error_num) def handle_event_plain_connection(self, obj): # ('PLAIN_CONNECTION', account, (connection)) ===================================== gajim/message_window.py ===================================== @@ -50,6 +50,7 @@ from gajim.gtk.util import move_window from gajim.gtk.util import get_app_icon_list from gajim.gtk.util import get_builder from gajim.gtk.util import set_urgency_hint +from gajim.gtk.util import get_app_window from gajim.gtk.const import ControlType @@ -307,7 +308,7 @@ class MessageWindow(EventHelper): # again. if destroy() is called from the StartChat Dialog, this # Window is not yet focused, because present() seems to be asynchron # at least on KDE, and takes time. - start_chat = app.get_app_window('StartChatDialog') + start_chat = get_app_window('StartChatDialog') if start_chat is not None and start_chat.ready_to_destroy: start_chat.destroy() ===================================== gajim/remote_control.py ===================================== @@ -788,13 +788,13 @@ class GajimRemote(Server): if account: if app.account_is_connected(account): # if given account is active, use it - AddNewContactWindow(account=account, jid=jid) + AddNewContactWindow(account=account, contact_jid=jid) else: # wrong account return False else: # if account is not given, show account combobox - AddNewContactWindow(account=None, jid=jid) + AddNewContactWindow(account=None, contact_jid=jid) return True def remove_contact(self, jid, account): ===================================== gajim/roster_window.py ===================================== @@ -73,7 +73,6 @@ from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import InvitationReceivedDialog -from gajim.gtk.server_info import ServerInfo from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.account_wizard import AccountCreationWizard @@ -3511,11 +3510,8 @@ class RosterWindow: AdHocCommand(account, jid) def on_view_server_info(self, _widget, account): - window = app.get_app_window(ServerInfo, account) - if window is None: - ServerInfo(account) - else: - window.present() + app.app.activate_action('%s-server-info' % account, + GLib.Variant('s', account)) def on_roster_window_focus_in_event(self, widget, event): # roster received focus, so if we had urgency REMOVE IT @@ -4353,7 +4349,7 @@ class RosterWindow: if (type_dest == 'account' or not self.regroup) and \ account_source != account_dest: # add to account in specified group - AddNewContactWindow(account=account_dest, jid=jid_source, + AddNewContactWindow(account=account_dest, contact_jid=jid_source, user_nick=c_source.name, group=grp_dest) return View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8cc30c368dcf88bd09d7e25303623eb0b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8cc30c368dcf88bd09d7e25303623eb0b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Dialogs: Make Accept button default
by Philipp Hörist 16 Nov '19

16 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e12fc663 by Daniel Brötzmann at 2019-11-16T13:04:19Z Dialogs: Make Accept button default - - - - - 8cc30c36 by Daniel Brötzmann at 2019-11-16T14:12:51Z Dialogs: Don't set unnecessary is_default - - - - - 6 changed files: - gajim/chat_control_base.py - gajim/groupchat_control.py - gajim/gtk/dialogs.py - gajim/gtk/filetransfer.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -794,7 +794,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Paste'), - is_default=True, callback=self._paste_event_confirmed, args=[image])]).show() ===================================== gajim/groupchat_control.py ===================================== @@ -1699,7 +1699,6 @@ class GroupchatControl(ChatControlBase): callback=on_cancel), DialogButton.make('Accept', text=_('_Leave'), - is_default=True, callback=on_ok)], transient_for=self.parent_win.window).show() return ===================================== gajim/gtk/dialogs.py ===================================== @@ -54,6 +54,7 @@ class DialogButton(namedtuple('DialogButton', ('response text callback args ' elif type_ == 'Accept': default_kwargs['response'] = Gtk.ResponseType.ACCEPT default_kwargs['text'] = _('Accept') + default_kwargs['is_default'] = True default_kwargs['action'] = ButtonAction.SUGGESTED elif type_ == 'Delete': ===================================== gajim/gtk/filetransfer.py ===================================== @@ -431,7 +431,6 @@ class FileTransfersWindow: callback=_on_resume), DialogButton.make('Accept', text=_('Replace _File'), - is_default=True, callback=_on_replace)]).show() # File does not exist yet ===================================== gajim/message_window.py ===================================== @@ -364,7 +364,6 @@ class MessageWindow(EventHelper): [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Close'), - is_default=True, callback=_on_yes1)], transient_for=self.window).show() return True ===================================== gajim/roster_window.py ===================================== @@ -4107,7 +4107,6 @@ class RosterWindow: [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Create'), - is_default=True, callback=merge_contacts)]).show() def on_drop_in_group(self, widget, account, c_source, grp_dest, @@ -4250,7 +4249,6 @@ class RosterWindow: [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Send'), - is_default=True, callback=_on_send_files, args=(account_dest, jid_dest, uri_splitted))], transient_for=self.window).show() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3b1459f78e4672907e07cf0f34bd6bc1b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3b1459f78e4672907e07cf0f34bd6bc1b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Avatar: Add get_avatar_from_pixbuf()
by Philipp Hörist 15 Nov '19

15 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b1459f7 by Philipp Hörist at 2019-11-15T21:50:54Z Avatar: Add get_avatar_from_pixbuf() - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -165,6 +165,23 @@ def clip_circle(surface): return context.get_target() +def get_avatar_from_pixbuf(pixbuf, scale, show=None): + size = max(pixbuf.get_width(), pixbuf.get_height()) + size *= scale + surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + if surface is None: + return None + surface = square(surface, size) + if surface is None: + return None + surface = clip_circle(surface) + if surface is None: + return None + if show is not None: + return add_status_to_avatar(surface, show) + return surface + + class AvatarStorage(metaclass=Singleton): def __init__(self): self._cache = defaultdict(dict) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b1459f78e4672907e07cf0f34bd6bc1bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3b1459f78e4672907e07cf0f34bd6bc1bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CI: Overwrite nbxmpp from site-packages
by Philipp Hörist 15 Nov '19

15 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e2087d4 by Philipp Hörist at 2019-11-15T17:17:56Z CI: Overwrite nbxmpp from site-packages - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -13,7 +13,7 @@ run-tests: - virtualenv --system-site-packages civenv - . ./civenv/bin/activate - pip3 install mypy - - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master + - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master --upgrade - pip3 install pylint==2.3.1 - /home/gitlab-runner/.local/bin/mypy gajim - scripts/dev/pylint-ci.sh --jobs=2 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e2087d4cab8d54fbb37bfff91feaf3089… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e2087d4cab8d54fbb37bfff91feaf3089… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove accel from application action
by Philipp Hörist 15 Nov '19

15 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 87d050ae by Philipp Hörist at 2019-11-15T14:46:19Z Remove accel from application action We define the same shortcut for win.browse-history - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -540,7 +540,6 @@ class GajimApplication(Gtk.Application): 'app.plugins': ['<Primary>E'], 'app.xml-console': ['<Primary><Shift>X'], 'app.file-transfer': ['<Primary>T'], - 'app.history': ['<Primary>H'], 'app.ipython': ['<Primary><Alt>I'], 'app.start-chat::': ['<Primary>N'], 'app.accounts::': ['<Alt>A'], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/87d050ae39e34af1387d249cd75e89abe0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/87d050ae39e34af1387d249cd75e89abe0… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2019