Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Remove obsolete atom_entry_window.ui
by Philipp Hörist 15 Nov '19

15 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 264c53f1 by Daniel Brötzmann at 2019-11-15T07:45:08Z Remove obsolete atom_entry_window.ui - - - - - 1 changed file: - − gajim/data/gui/atom_entry_window.ui Changes: ===================================== gajim/data/gui/atom_entry_window.ui deleted ===================================== @@ -1,220 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkWindow" id="atom_entry_window"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">New entry received</property> - <child> - <object class="GtkBox" id="vbox112"> - <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="GtkLabel" id="new_entry_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">You have received new entry:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="hseparator14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="grid1"> - <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="GtkEventBox" id="feed_title_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="button-press-event" handler="on_feed_title_eventbox_button_press_event" swapped="no"/> - <child> - <object class="GtkLabel" id="feed_title_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">Old stories</property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEventBox" id="entry_title_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <signal name="button-press-event" handler="on_entry_title_eventbox_button_press_event" swapped="no"/> - <child> - <object class="GtkLabel" id="entry_title_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">Soliloquy</property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Feed name:</property> - <property name="justify">right</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="feed_tagline_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">Romeo and Juliet</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Entry:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Last modified:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="last_modified_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">2003-12-13T18:30:02Z</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="hseparator15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkButton" id="next_button"> - <property name="label" translatable="yes">Next entry</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_next_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - </object> - </child> - </object> -</interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/264c53f1b807c1cacb5f50308992787aab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/264c53f1b807c1cacb5f50308992787aab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add dedicated method for setting shortcuts
by Philipp Hörist 15 Nov '19

15 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 173f5a06 by Philipp Hörist at 2019-11-15T05:20:50Z Add dedicated method for setting shortcuts - - - - - 3 changed files: - gajim/application.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/application.py ===================================== @@ -236,6 +236,7 @@ class GajimApplication(Gtk.Application): self.interface = Interface() self.interface.run(self) self.add_actions() + self._set_shortcuts() from gajim import gui_menu_builder gui_menu_builder.build_accounts_menu() @@ -427,57 +428,44 @@ class GajimApplication(Gtk.Application): act.connect('change-state', app_actions.on_merge_accounts) self.add_action(act) - # General Actions - - general_actions = [ - ('quit', app_actions.on_quit, ['<Primary>Q']), - ('add-account', app_actions.on_add_account, None), - ('manage-proxies', app_actions.on_manage_proxies, None), - ('history-manager', app_actions.on_history_manager, None), - ('preferences', app_actions.on_preferences, ['<Primary>P']), - ('plugins', app_actions.on_plugins, ['<Primary>E']), - ('xml-console', app_actions.on_xml_console, ['<Primary><Shift>X']), - ('file-transfer', app_actions.on_file_transfers, ['<Primary>T']), - ('history', app_actions.on_history, ['<Primary>H']), - ('shortcuts', app_actions.on_keyboard_shortcuts, None), - ('features', app_actions.on_features, None), - ('content', app_actions.on_contents, None), - ('about', app_actions.on_about, None), - ('faq', app_actions.on_faq, None), - ('ipython', app_actions.toggle_ipython, ['<Primary><Alt>I']), - ('show-next-pending-event', app_actions.show_next_pending_event, - None), + actions = [ + ('quit', app_actions.on_quit), + ('add-account', app_actions.on_add_account), + ('manage-proxies', app_actions.on_manage_proxies), + ('history-manager', app_actions.on_history_manager), + ('preferences', app_actions.on_preferences), + ('plugins', app_actions.on_plugins), + ('xml-console', app_actions.on_xml_console), + ('file-transfer', app_actions.on_file_transfers), + ('history', app_actions.on_history), + ('shortcuts', app_actions.on_keyboard_shortcuts), + ('features', app_actions.on_features), + ('content', app_actions.on_contents), + ('about', app_actions.on_about), + ('faq', app_actions.on_faq), + ('ipython', app_actions.toggle_ipython), + ('show-next-pending-event', app_actions.show_next_pending_event), + ('start-chat', 's', app_actions.on_new_chat), + ('accounts', 's', app_actions.on_accounts), + ('add-contact', 's', app_actions.on_add_contact_jid), + ('copy-text', 's', app_actions.copy_text), + ('open-link', 'as', app_actions.open_link), + ('open-mail', 's', app_actions.open_mail), + ('create-groupchat', 's', app_actions.on_create_gc), + ('browse-history', 'a{sv}', app_actions.on_browse_history), + ('groupchat-join', 'as', app_actions.on_groupchat_join), ] - additional_actions = [ - ('start-chat', 's', app_actions.on_new_chat, ['<Primary>N']), - ('accounts', 's', app_actions.on_accounts, ['<Alt>A']), - ('add-contact', 's', app_actions.on_add_contact_jid, None), - ('copy-text', 's', app_actions.copy_text, None), - ('open-link', 'as', app_actions.open_link, None), - ('open-mail', 's', app_actions.open_mail, None), - ('create-groupchat', 's', app_actions.on_create_gc, ['<Primary>G']), - ('browse-history', 'a{sv}', app_actions.on_browse_history, None), - ('groupchat-join', 'as', app_actions.on_groupchat_join, None), - ] - - for action in general_actions: - action_name, func, accel = action - act = Gio.SimpleAction.new(action_name, None) - act.connect('activate', func) - if accel: - full_action_name = 'app.%s' % action_name - self.set_accels_for_action(full_action_name, accel) - self.add_action(act) + for action in actions: + if len(action) == 2: + action_name, func = action + variant = None + else: + action_name, variant, func = action + variant = GLib.VariantType.new(variant) - for action in additional_actions: - action_name, variant, func, accel = action - act = Gio.SimpleAction.new( - action_name, GLib.VariantType.new(variant)) + act = Gio.SimpleAction.new(action_name, variant) act.connect('activate', func) - if accel: - full_action_name = 'app.%s::' % action_name - self.set_accels_for_action(full_action_name, accel) self.add_action(act) accounts_list = sorted(app.config.get_per('accounts')) @@ -545,6 +533,54 @@ class GajimApplication(Gtk.Application): # We go online self.lookup_action(account + action_name).set_enabled(True) + def _set_shortcuts(self): + shortcuts = { + 'app.quit': ['<Primary>Q'], + 'app.preferences': ['<Primary>P'], + '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'], + 'app.create-groupchat::': ['<Primary>G'], + 'win.show-roster': ['<Primary>R'], + 'win.show-offline': ['<Primary>O'], + 'win.show-active': ['<Primary>Y'], + 'win.change-nickname': ['<Control><Shift>n'], + 'win.change-subject': ['<Alt>t'], + 'win.escape': ['Escape'], + 'win.browse-history': ['<Control>h'], + 'win.send-file': ['<Control>f'], + 'win.show-contact-info': ['<Control>i'], + 'win.show-emoji-chooser': ['<Alt>m'], + 'win.clear-chat': ['<Control>l'], + 'win.delete-line': ['<Control>u'], + 'win.close-tab': ['<Control>w'], + 'win.move-tab-up': ['<Control><Shift>Page_Up'], + 'win.move-tab-down': ['<Control><Shift>Page_Down'], + 'win.switch-next-tab': ['<Alt>Right'], + 'win.switch-prev-tab': ['<Alt>Left'], + 'win.switch-next-unread-tab-right': ['<Control>Tab', + '<Control>Page_Down'], + 'win.switch-next-unread-tab-left': ['<Control>ISO_Left_Tab', + '<Control>Page_Up'], + 'win.switch-tab-1': ['<Alt>1', '<Alt>KP_1'], + 'win.switch-tab-2': ['<Alt>2', '<Alt>KP_2'], + 'win.switch-tab-3': ['<Alt>3', '<Alt>KP_3'], + 'win.switch-tab-4': ['<Alt>4', '<Alt>KP_4'], + 'win.switch-tab-5': ['<Alt>5', '<Alt>KP_5'], + 'win.switch-tab-6': ['<Alt>6', '<Alt>KP_6'], + 'win.switch-tab-7': ['<Alt>7', '<Alt>KP_7'], + 'win.switch-tab-8': ['<Alt>8', '<Alt>KP_8'], + 'win.switch-tab-9': ['<Alt>9', '<Alt>KP_9'], + 'win.copy-text': ['<Control><Shift>c'], + } + + for action, accels in shortcuts.items(): + self.set_accels_for_action(action, accels) + def _on_feature_discovered(self, event): if event.feature == nbxmpp.NS_VCARD: action = '%s-profile' % event.account ===================================== gajim/message_window.py ===================================== @@ -162,34 +162,32 @@ class MessageWindow(EventHelper): def _add_actions(self): actions = [ - ('change-nickname', ['<Control><Shift>n']), - ('change-subject', ['<Alt>t']), - ('escape', ['Escape']), - ('browse-history', ['<Control>h']), - ('send-file', ['<Control>f']), - ('show-contact-info', ['<Control>i']), - ('show-emoji-chooser', ['<Alt>m']), - ('clear-chat', ['<Control>l']), - ('delete-line', ['<Control>u']), - ('close-tab', ['<Control>w']), - ('move-tab-up', ['<Control><Shift>Page_Up']), - ('move-tab-down', ['<Control><Shift>Page_Down']), - ('switch-next-tab', ['<Alt>Right']), - ('switch-prev-tab', ['<Alt>Left']), - ('switch-next-unread-tab-right', ['<Control>Tab', - '<Control>Page_Down']), - ('switch-next-unread-tab-left', ['<Control>ISO_Left_Tab', - '<Control>Page_Up']), - ('switch-tab-1', ['<Alt>1', '<Alt>KP_1']), - ('switch-tab-2', ['<Alt>2', '<Alt>KP_2']), - ('switch-tab-3', ['<Alt>3', '<Alt>KP_3']), - ('switch-tab-4', ['<Alt>4', '<Alt>KP_4']), - ('switch-tab-5', ['<Alt>5', '<Alt>KP_5']), - ('switch-tab-6', ['<Alt>6', '<Alt>KP_6']), - ('switch-tab-7', ['<Alt>7', '<Alt>KP_7']), - ('switch-tab-8', ['<Alt>8', '<Alt>KP_8']), - ('switch-tab-9', ['<Alt>9', '<Alt>KP_9']), - ('copy-text', ['<Control><Shift>c']), + 'change-nickname', + 'change-subject', + 'escape', + 'browse-history', + 'send-file', + 'show-contact-info', + 'show-emoji-chooser', + 'clear-chat', + 'delete-line', + 'close-tab', + 'move-tab-up', + 'move-tab-down', + 'switch-next-tab', + 'switch-prev-tab', + 'switch-next-unread-tab-right' + 'switch-next-unread-tab-left', + 'switch-tab-1', + 'switch-tab-2', + 'switch-tab-3', + 'switch-tab-4', + 'switch-tab-5', + 'switch-tab-6', + 'switch-tab-7', + 'switch-tab-8', + 'switch-tab-9', + 'copy-text', ] disabled_for_emacs = ( @@ -201,13 +199,12 @@ class MessageWindow(EventHelper): key_theme = Gtk.Settings.get_default().get_property( 'gtk-key-theme-name') - for action, keys in actions: + for action in actions: if key_theme == 'Emacs' and action in disabled_for_emacs: continue act = Gio.SimpleAction.new(action, None) act.connect('activate', self._on_action) self.window.add_action(act) - app.app.set_accels_for_action('win.%s' % action, keys) def _on_action(self, action, _param): control = self.get_active_control() ===================================== gajim/roster_window.py ===================================== @@ -5370,33 +5370,26 @@ class RosterWindow: actions = [ ('show-roster', not self.xml.get_object('roster_vbox2').get_no_show_all(), - self.on_show_roster_action, - ['<Primary>R']), + self.on_show_roster_action), ('show-offline', app.config.get('showoffline'), - self.on_show_offline_contacts_action, - ['<Primary>O']), + self.on_show_offline_contacts_action), ('show-active', app.config.get('show_only_chat_and_online'), - self.on_show_active_contacts_action, - ['<Primary>Y']), + self.on_show_active_contacts_action), ('show-transports', app.config.get('show_transports_group'), - self.on_show_transports_action, - None), + self.on_show_transports_action), ] for action in actions: - action_name, variant, func, accel = action + action_name, variant, func = action act = Gio.SimpleAction.new_stateful( action_name, None, GLib.Variant.new_boolean(variant)) act.connect('change-state', func) - if accel: - full_action_name = 'win.%s' % action_name - app.app.set_accels_for_action(full_action_name, accel) self.window.add_action(act) ################################################################################ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/173f5a064afc803b204090ac04a1f8eccb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/173f5a064afc803b204090ac04a1f8eccb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move accelerators from Glade file into code
by Philipp Hörist 14 Nov '19

14 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 61828eb7 by Daniel Brötzmann at 2019-11-14T21:33:08Z Move accelerators from Glade file into code - Light refactoring for adding actions - - - - - 3 changed files: - gajim/application.py - gajim/data/gui/application_menu.ui - gajim/roster_window.py Changes: ===================================== gajim/application.py ===================================== @@ -430,67 +430,54 @@ class GajimApplication(Gtk.Application): # General Actions general_actions = [ - ('quit', app_actions.on_quit), - ('add-account', app_actions.on_add_account), - ('manage-proxies', app_actions.on_manage_proxies), - ('history-manager', app_actions.on_history_manager), - ('preferences', app_actions.on_preferences), - ('plugins', app_actions.on_plugins), - ('xml-console', app_actions.on_xml_console), - ('file-transfer', app_actions.on_file_transfers), - ('history', app_actions.on_history), - ('shortcuts', app_actions.on_keyboard_shortcuts), - ('features', app_actions.on_features), - ('content', app_actions.on_contents), - ('about', app_actions.on_about), - ('faq', app_actions.on_faq), - ('ipython', app_actions.toggle_ipython), - ('show-next-pending-event', app_actions.show_next_pending_event), + ('quit', app_actions.on_quit, ['<Primary>Q']), + ('add-account', app_actions.on_add_account, None), + ('manage-proxies', app_actions.on_manage_proxies, None), + ('history-manager', app_actions.on_history_manager, None), + ('preferences', app_actions.on_preferences, ['<Primary>P']), + ('plugins', app_actions.on_plugins, ['<Primary>E']), + ('xml-console', app_actions.on_xml_console, ['<Primary><Shift>X']), + ('file-transfer', app_actions.on_file_transfers, ['<Primary>T']), + ('history', app_actions.on_history, ['<Primary>H']), + ('shortcuts', app_actions.on_keyboard_shortcuts, None), + ('features', app_actions.on_features, None), + ('content', app_actions.on_contents, None), + ('about', app_actions.on_about, None), + ('faq', app_actions.on_faq, None), + ('ipython', app_actions.toggle_ipython, ['<Primary><Alt>I']), + ('show-next-pending-event', app_actions.show_next_pending_event, + None), ] - act = Gio.SimpleAction.new('start-chat', GLib.VariantType.new('s')) - act.connect("activate", app_actions.on_new_chat) - self.add_action(act) - - act = Gio.SimpleAction.new('accounts', GLib.VariantType.new('s')) - act.connect("activate", app_actions.on_accounts) - self.add_action(act) - self.set_accels_for_action('app.accounts::', ['<Alt>A']) - - act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) - act.connect("activate", app_actions.on_add_contact_jid) - self.add_action(act) - - act = Gio.SimpleAction.new('copy-text', GLib.VariantType.new('s')) - act.connect("activate", app_actions.copy_text) - self.add_action(act) - - act = Gio.SimpleAction.new('open-link', GLib.VariantType.new('as')) - act.connect("activate", app_actions.open_link) - self.add_action(act) - - act = Gio.SimpleAction.new('open-mail', GLib.VariantType.new('s')) - act.connect("activate", app_actions.open_mail) - self.add_action(act) - - act = Gio.SimpleAction.new('create-groupchat', GLib.VariantType.new('s')) - act.connect("activate", app_actions.on_create_gc) - self.add_action(act) - - act = Gio.SimpleAction.new('browse-history', - GLib.VariantType.new('a{sv}')) - act.connect("activate", app_actions.on_browse_history) - self.add_action(act) - - act = Gio.SimpleAction.new('groupchat-join', - GLib.VariantType.new('as')) - act.connect("activate", app_actions.on_groupchat_join) - self.add_action(act) + additional_actions = [ + ('start-chat', 's', app_actions.on_new_chat, ['<Primary>N']), + ('accounts', 's', app_actions.on_accounts, ['<Alt>A']), + ('add-contact', 's', app_actions.on_add_contact_jid, None), + ('copy-text', 's', app_actions.copy_text, None), + ('open-link', 'as', app_actions.open_link, None), + ('open-mail', 's', app_actions.open_mail, None), + ('create-groupchat', 's', app_actions.on_create_gc, ['<Primary>G']), + ('browse-history', 'a{sv}', app_actions.on_browse_history, None), + ('groupchat-join', 'as', app_actions.on_groupchat_join, None), + ] for action in general_actions: - action_name, func = action + action_name, func, accel = action act = Gio.SimpleAction.new(action_name, None) - act.connect("activate", func) + act.connect('activate', func) + if accel: + full_action_name = 'app.%s' % action_name + self.set_accels_for_action(full_action_name, accel) + self.add_action(act) + + for action in additional_actions: + action_name, variant, func, accel = action + act = Gio.SimpleAction.new( + action_name, GLib.VariantType.new(variant)) + act.connect('activate', func) + if accel: + full_action_name = 'app.%s::' % action_name + self.set_accels_for_action(full_action_name, accel) self.add_action(act) accounts_list = sorted(app.config.get_per('accounts')) ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -10,17 +10,14 @@ <item> <attribute name="label" translatable="yes">Show Contact List</attribute> <attribute name="action">win.show-roster</attribute> - <attribute name="accel"><Primary>R</attribute> </item> <item> <attribute name="label" translatable="yes">Show Offline Contacts</attribute> <attribute name="action">win.show-offline</attribute> - <attribute name="accel"><Primary>O</attribute> </item> <item> <attribute name="label" translatable="yes">Show Active Contacts</attribute> <attribute name="action">win.show-active</attribute> - <attribute name="accel"><Primary>Y</attribute> </item> <item> <attribute name="label" translatable="yes">Show Transports</attribute> @@ -31,12 +28,10 @@ <item> <attribute name="label" translatable="yes">XML Console</attribute> <attribute name="action">app.xml-console</attribute> - <attribute name="accel"><Primary><Shift>X</attribute> </item> <item> <attribute name="label" translatable="yes">File Transfer</attribute> <attribute name="action">app.file-transfer</attribute> - <attribute name="accel"><Primary>T</attribute> </item> <item> <attribute name="label" translatable="yes">History</attribute> @@ -75,13 +70,11 @@ <item> <attribute name="label" translatable="yes">Start Chat</attribute> <attribute name="action">app.start-chat</attribute> - <attribute name="accel"><Primary>N</attribute> <attribute name="target"></attribute> </item> <item> <attribute name="label" translatable="yes">Create Group Chat</attribute> <attribute name="action">app.create-groupchat</attribute> - <attribute name="accel"><Primary>G</attribute> <attribute name="target"></attribute> </item> <item> @@ -95,12 +88,10 @@ <item> <attribute name="label" translatable="yes">Preferences</attribute> <attribute name="action">app.preferences</attribute> - <attribute name="accel"><Primary>P</attribute> </item> <item> <attribute name="label" translatable="yes">Quit</attribute> <attribute name="action">app.quit</attribute> - <attribute name="accel"><Primary>Q</attribute> </item> </section> </menu> ===================================== gajim/roster_window.py ===================================== @@ -5366,34 +5366,38 @@ class RosterWindow: return value def add_actions(self): - action = Gio.SimpleAction.new_stateful( - "show-roster", None, - GLib.Variant.new_boolean( - not self.xml.get_object('roster_vbox2').get_no_show_all())) - action.connect("change-state", - self.on_show_roster_action) - self.window.add_action(action) - - action = Gio.SimpleAction.new_stateful( - "show-offline", None, - GLib.Variant.new_boolean(app.config.get('showoffline'))) - action.connect("change-state", - self.on_show_offline_contacts_action) - self.window.add_action(action) - - action = Gio.SimpleAction.new_stateful( - "show-active", None, - GLib.Variant.new_boolean( - app.config.get('show_only_chat_and_online'))) - action.connect("change-state", - self.on_show_active_contacts_action) - self.window.add_action(action) - - action = Gio.SimpleAction.new_stateful( - "show-transports", None, - GLib.Variant.new_boolean(app.config.get('show_transports_group'))) - action.connect("change-state", self.on_show_transports_action) - self.window.add_action(action) + + actions = [ + ('show-roster', + not self.xml.get_object('roster_vbox2').get_no_show_all(), + self.on_show_roster_action, + ['<Primary>R']), + + ('show-offline', + app.config.get('showoffline'), + self.on_show_offline_contacts_action, + ['<Primary>O']), + + ('show-active', + app.config.get('show_only_chat_and_online'), + self.on_show_active_contacts_action, + ['<Primary>Y']), + + ('show-transports', + app.config.get('show_transports_group'), + self.on_show_transports_action, + None), + ] + + for action in actions: + action_name, variant, func, accel = action + act = Gio.SimpleAction.new_stateful( + action_name, None, GLib.Variant.new_boolean(variant)) + act.connect('change-state', func) + if accel: + full_action_name = 'win.%s' % action_name + app.app.set_accels_for_action(full_action_name, accel) + self.window.add_action(act) ################################################################################ ### View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/61828eb7ff6f229da9fab1b924f3f8c071… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/61828eb7ff6f229da9fab1b924f3f8c071… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Blocking: Set different labels for confirmation dialog if it is a group
by Philipp Hörist 14 Nov '19

14 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 39141569 by Daniel Brötzmann at 2019-11-14T18:10:51Z Blocking: Set different labels for confirmation dialog if it is a group - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -2831,19 +2831,35 @@ class RosterWindow: app.config.set('confirm_block', 'yes') self.get_status_message('offline', on_continue, show_pep=False) + # Check if confirmation is needed for blocking confirm_block = app.config.get('confirm_block') if confirm_block == 'no': _block_it() return + + # Set dialog's labels depending on if it is a group or a single contact + if group is None: + title = _('Block Contact') + pritext = _('Really block this contact?') + sectext = _('This contact will see you offline and you will not ' + 'receive any messages sent to you by this contact.') + button_text = _('_Block Contact') + else: + title = _('Block Group') + pritext = _('Really block this group?') + sectext = _('All contacts of this group will see you as offline ' + 'and you will not receive any messages sent to you ' + 'by any one of these contacts.') + button_text = _('_Block Group') + NewConfirmationCheckDialog( - _('Block Contact'), - _('Really block this contact?'), - _('This contact will see you offline and you will not receive ' - 'any messages sent to you by this contact.'), + title, + pritext, + sectext, _('_Do not ask me again'), [DialogButton.make('Cancel'), DialogButton.make('Remove', - text=_('_Block Contact'), + text=button_text, callback=_block_it)], modal=False).show() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/391415693dca842d416725617f351ac61d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/391415693dca842d416725617f351ac61d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Roster: Fix file drag and drop
by Philipp Hörist 14 Nov '19

14 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d770b794 by Daniel Brötzmann at 2019-11-14T17:55:42Z Roster: Fix file drag and drop - - - - - edc7971b by Daniel Brötzmann at 2019-11-14T17:55:42Z Remove usage of NonModalConfirmationDialog - - - - - fde22a8a by Daniel Brötzmann at 2019-11-14T17:55:42Z Dialogs: Remove unused NonModalConfirmationDialog - - - - - 2 changed files: - gajim/gtk/dialogs.py - gajim/roster_window.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -169,40 +169,6 @@ class ConfirmationDialog(HigDialog): self.destroy() -class NonModalConfirmationDialog(HigDialog): - """ - HIG compliant non modal confirmation dialog - """ - - def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): - self.user_response_ok = on_response_ok - self.user_response_cancel = on_response_cancel - transient_for = app.app.get_active_window() - HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, - Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, - self.on_response_cancel) - self.set_modal(False) - - def on_response_ok(self, widget): - if self.user_response_ok: - if isinstance(self.user_response_ok, tuple): - self.user_response_ok[0](*self.user_response_ok[1:]) - else: - self.user_response_ok() - self.call_cancel_on_destroy = False - self.destroy() - - def on_response_cancel(self, widget): - if self.user_response_cancel: - if isinstance(self.user_response_cancel, tuple): - self.user_response_cancel[0](*self.user_response_cancel[1:]) - else: - self.user_response_cancel() - self.call_cancel_on_destroy = False - self.destroy() - - class WarningDialog(HigDialog): """ HIG compliant warning dialog ===================================== gajim/roster_window.py ===================================== @@ -72,7 +72,6 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog -from gajim.gtk.dialogs import NonModalConfirmationDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.server_info import ServerInfo from gajim.gtk.single_message import SingleMessageWindow @@ -4220,17 +4219,25 @@ class RosterWindow: app.interface.instances['file_transfers'].send_file( account, c, path) # Popup dialog to confirm sending - prim_text = _('Send file?') - sec_text = i18n.ngettext('Do you want to send this file to %s:', - 'Do you want to send these files to %s:', nb_uri) %\ - c_dest.get_shown_name() + text = i18n.ngettext( + 'Send this file to %s:\n', + 'Send these files to %s:\n', + nb_uri) % c_dest.get_shown_name() + for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) - sec_text += '\n' + os.path.basename(path) - dialog = NonModalConfirmationDialog(prim_text, sec_text, - on_response_ok=(_on_send_files, account_dest, jid_dest, - uri_splitted)) - dialog.popup() + text += '\n' + os.path.basename(path) + NewConfirmationDialog( + _('File Transfer'), + _('File Transfer'), + text, + [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() return # Check if something is selected @@ -5541,17 +5548,28 @@ class RosterWindow: col.set_visible(False) self.tree.set_expander_column(col) - # signals - self.TARGET_TYPE_URI_LIST = 80 - self.tree.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, - [], Gdk.DragAction.DEFAULT | Gdk.DragAction.MOVE | \ + # Signals + # Drag + self.tree.enable_model_drag_source( + Gdk.ModifierType.BUTTON1_MASK, + [], + Gdk.DragAction.DEFAULT | + Gdk.DragAction.MOVE | Gdk.DragAction.COPY) self.tree.drag_source_add_text_targets() + + # Drop self.tree.enable_model_drag_dest([], Gdk.DragAction.DEFAULT) - dst_targets = Gtk.TargetList.new([]) + self.TARGET_TYPE_URI_LIST = 80 + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', + Gtk.TargetFlags.OTHER_APP, + self.TARGET_TYPE_URI_LIST) + dst_targets = Gtk.TargetList.new([uri_entry]) dst_targets.add_text_targets(0) - dst_targets.add_uri_targets(self.TARGET_TYPE_URI_LIST) self.tree.drag_dest_set_target_list(dst_targets) + + # Connect self.tree.connect('drag-begin', self.drag_begin) self.tree.connect('drag-end', self.drag_end) self.tree.connect('drag-drop', self.drag_drop) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4fb0c787d28cc639a71d4ab709efb4da6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4fb0c787d28cc639a71d4ab709efb4da6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Improve event filter
by Philipp Hörist 14 Nov '19

14 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fbcce35b by Philipp Hörist at 2019-11-13T20:42:33Z Improve event filter Allow comparing attributes with different names Example: ``` @event_filter(['account', 'jid=own_jid']) def _on_event(self): pass ``` _on_event() is only executed if the event attribute `jid` matches the `own_jid` attribute on self - - - - - 4726272d by Philipp Hörist at 2019-11-13T20:46:33Z Replace ensure_proper_control with event_filter - - - - - 40106f2b by Philipp Hörist at 2019-11-13T21:14:46Z ChatControl: Refactor event handlers - Group all event handlers - Use event as var name instead of obj - Use event_filter() - Unify handler method names - - - - - 4b312c2d by Philipp Hörist at 2019-11-13T21:19:47Z PrivateChatControl: Refactor event handlers - Group all event handlers - Use event as var name instead of obj - Use event_filter() - Unify handler method names - - - - - 4fb0c787 by Philipp Hörist at 2019-11-13T21:44:18Z GroupChatControl: Refactor event handlers - Use event as var name instead of obj - Use event_filter() - Unify handler method names - - - - - 7 changed files: - gajim/chat_control.py - gajim/common/connection.py - gajim/common/helpers.py - gajim/common/modules/caps.py - gajim/groupchat_control.py - gajim/gtk/util.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -67,7 +67,6 @@ from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_cursor -from gajim.gtk.util import ensure_proper_control from gajim.gtk.util import format_mood from gajim.gtk.util import format_activity from gajim.gtk.util import format_tune @@ -217,11 +216,11 @@ class ChatControl(ChatControlBase): ('tune-received', ged.GUI1, self._on_tune_received), ('location-received', ged.GUI1, self._on_location_received), ('update-client-info', ged.GUI1, self._on_update_client_info), - ('chatstate-received', ged.GUI1, self._nec_chatstate_received), - ('caps-update', ged.GUI1, self._nec_caps_received), - ('message-sent', ged.OUT_POSTCORE, self._message_sent), - ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), - ('decrypted-message-received', ged.GUI1, self._nec_decrypted_message_received), + ('chatstate-received', ged.GUI1, self._on_chatstate_received), + ('caps-update', ged.GUI1, self._on_caps_update), + ('message-sent', ged.OUT_POSTCORE, self._on_message_sent), + ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), + ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), @@ -229,7 +228,7 @@ class ChatControl(ChatControlBase): if self._type.is_chat: # Dont connect this when PrivateChatControl is used - self.register_event('update-roster-avatar', ged.GUI1, self._nec_update_avatar) + self.register_event('update-roster-avatar', ged.GUI1, self._on_update_roster_avatar) # pylint: enable=line-too-long # PluginSystem: adding GUI extension point for this ChatControl @@ -468,29 +467,29 @@ class ChatControl(ChatControlBase): return self.xml.location_image return None - @ensure_proper_control + @event_filter(['account', 'jid']) def _on_mood_received(self, _event): self._update_pep(PEPEventType.MOOD) - @ensure_proper_control + @event_filter(['account', 'jid']) def _on_activity_received(self, _event): self._update_pep(PEPEventType.ACTIVITY) - @ensure_proper_control + @event_filter(['account', 'jid']) def _on_tune_received(self, _event): self._update_pep(PEPEventType.TUNE) - @ensure_proper_control + @event_filter(['account', 'jid']) def _on_location_received(self, _event): self._update_pep(PEPEventType.LOCATION) - @ensure_proper_control + @event_filter(['account', 'jid']) def _on_nickname_received(self, _event): self.update_ui() self.parent_win.redraw_tab(self) self.parent_win.show_title() - @ensure_proper_control + @event_filter(['account', 'jid']) def _on_update_client_info(self, event): contact = app.contacts.get_contact( self.account, event.jid, event.resource) @@ -498,6 +497,136 @@ class ChatControl(ChatControlBase): return self.xml.phone_image.set_visible(contact.uses_phone) + @event_filter(['account']) + def _on_chatstate_received(self, event): + if self._type.is_privatechat: + if event.contact != self.gc_contact: + return + else: + if event.contact.jid != self.contact.jid: + return + + self.draw_banner_text() + + # update chatstate in tab for this chat + if event.contact.is_gc_contact: + chatstate = event.contact.chatstate + else: + chatstate = app.contacts.get_combined_chatstate( + self.account, self.contact.jid) + self.parent_win.redraw_tab(self, chatstate) + + @event_filter(['account']) + def _on_caps_update(self, event): + if self._type.is_chat and event.jid != self.contact.jid: + return + if self._type.is_privatechat and event.fjid != self.contact.jid: + return + self.update_ui() + + @event_filter(['account']) + def _on_mam_decrypted_message_received(self, event): + if event.properties.type.is_groupchat: + return + + if event.properties.is_muc_pm: + if not event.properties.jid == self.contact.get_full_jid(): + return + else: + if not event.properties.jid.bareMatch(self.contact.jid): + return + + kind = '' # incoming + if event.kind == KindConstant.CHAT_MSG_SENT: + kind = 'outgoing' + + self.add_message(event.msgtxt, + kind, + tim=event.properties.mam.timestamp, + correct_id=event.correct_id, + message_id=event.properties.id, + additional_data=event.additional_data) + + @event_filter(['account']) + def _on_decrypted_message_received(self, event): + if not event.msgtxt: + return True + + if event.session.control != self: + return + + typ = '' + if event.properties.is_sent_carbon: + typ = 'out' + + self.add_message(event.msgtxt, + typ, + tim=event.properties.timestamp, + subject=event.properties.subject, + displaymarking=event.displaymarking, + msg_log_id=event.msg_log_id, + message_id=event.properties.id, + correct_id=event.correct_id, + additional_data=event.additional_data) + if event.msg_log_id: + pw = self.parent_win + end = self.conv_textview.autoscroll + if not pw or (pw.get_active_control() and self \ + == pw.get_active_control() and pw.is_active() and end): + app.logger.set_read_messages([event.msg_log_id]) + + @event_filter(['account', 'jid']) + def _on_message_error(self, event): + self.conv_textview.show_error(event.message_id, event.error) + + @event_filter(['account', 'jid']) + def _on_message_sent(self, event): + if not event.message: + return + + self.last_sent_msg = event.stanza_id + message_id = event.msg_iq.getID() + + if event.label: + displaymarking = event.label.getTag('displaymarking') + else: + displaymarking = None + if self.correcting: + self.correcting = False + gtkgui_helpers.remove_css_class( + self.msg_textview, 'gajim-msg-correcting') + + self.add_message(event.message, + self.contact.jid, + tim=event.timestamp, + displaymarking=displaymarking, + message_id=message_id, + correct_id=event.correct_id, + additional_data=event.additional_data) + + @event_filter(['account', 'jid']) + def _receipt_received(self, event): + self.conv_textview.show_receipt(event.receipt_id) + + @event_filter(['account', 'jid']) + def _on_zeroconf_error(self, event): + self.add_status_message(event.message) + + @event_filter(['account', 'jid']) + def _on_update_roster_avatar(self, obj): + self.show_avatar() + + def _nec_ping(self, event): + if self.contact != event.contact: + return + if event.name == 'ping-sent': + self.add_info_message(_('Ping?')) + elif event.name == 'ping-reply': + self.add_info_message( + _('Pong! (%s seconds)') % event.seconds) + elif event.name == 'ping-error': + self.add_info_message(_('Error.')) + def _update_jingle(self, jingle_type): if jingle_type not in ('audio', 'video'): return @@ -787,90 +916,6 @@ class ChatControl(ChatControlBase): fixed.set_no_show_all(True) self.close_jingle_content(jingle_type) - @event_filter(['account']) - def _nec_mam_decrypted_message_received(self, obj): - if obj.properties.type.is_groupchat: - return - - if obj.properties.is_muc_pm: - if not obj.properties.jid == self.contact.get_full_jid(): - return - else: - if not obj.properties.jid.bareMatch(self.contact.jid): - return - - kind = '' # incoming - if obj.kind == KindConstant.CHAT_MSG_SENT: - kind = 'outgoing' - - self.add_message(obj.msgtxt, - kind, - tim=obj.properties.mam.timestamp, - correct_id=obj.correct_id, - message_id=obj.properties.id, - additional_data=obj.additional_data) - - def _nec_decrypted_message_received(self, obj): - if not obj.msgtxt: - return True - if obj.conn.name != self.account: - return - - if obj.session.control != self: - return - - typ = '' - if obj.properties.is_sent_carbon: - typ = 'out' - - self.add_message(obj.msgtxt, - typ, - tim=obj.properties.timestamp, - subject=obj.properties.subject, - displaymarking=obj.displaymarking, - msg_log_id=obj.msg_log_id, - message_id=obj.properties.id, - correct_id=obj.correct_id, - additional_data=obj.additional_data) - if obj.msg_log_id: - pw = self.parent_win - end = self.conv_textview.autoscroll - if not pw or (pw.get_active_control() and self \ - == pw.get_active_control() and pw.is_active() and end): - app.logger.set_read_messages([obj.msg_log_id]) - - @event_filter(['account', 'jid']) - def _on_message_error(self, event): - self.conv_textview.show_error(event.message_id, event.error) - - def _message_sent(self, obj): - if obj.conn.name != self.account: - return - if obj.jid != self.contact.jid: - return - if not obj.message: - return - - self.last_sent_msg = obj.stanza_id - message_id = obj.msg_iq.getID() - - if obj.label: - displaymarking = obj.label.getTag('displaymarking') - else: - displaymarking = None - if self.correcting: - self.correcting = False - gtkgui_helpers.remove_css_class( - self.msg_textview, 'gajim-msg-correcting') - - self.add_message(obj.message, - self.contact.jid, - tim=obj.timestamp, - displaymarking=displaymarking, - message_id=message_id, - correct_id=obj.correct_id, - additional_data=obj.additional_data) - def send_message(self, message, xhtml=None, process_commands=True, attention=False): """ @@ -958,10 +1003,6 @@ class ChatControl(ChatControlBase): else: self.old_msg_kind = kind - @event_filter(['account', 'jid']) - def _receipt_received(self, event): - self.conv_textview.show_receipt(event.receipt_id) - def get_tab_label(self): unread = '' if self.resource: @@ -1112,47 +1153,6 @@ class ChatControl(ChatControlBase): return on_yes(self) - def _nec_chatstate_received(self, event): - if event.account != self.account: - return - - if self._type.is_privatechat: - if event.contact != self.gc_contact: - return - else: - if event.contact.jid != self.contact.jid: - return - - self.draw_banner_text() - - # update chatstate in tab for this chat - if event.contact.is_gc_contact: - chatstate = event.contact.chatstate - else: - chatstate = app.contacts.get_combined_chatstate( - self.account, self.contact.jid) - self.parent_win.redraw_tab(self, chatstate) - - def _nec_caps_received(self, obj): - if obj.conn.name != self.account: - return - if self._type.is_chat and obj.jid != self.contact.jid: - return - if self._type.is_privatechat and obj.fjid != self.contact.jid: - return - self.update_ui() - - def _nec_ping(self, obj): - if self.contact != obj.contact: - return - if obj.name == 'ping-sent': - self.add_info_message(_('Ping?')) - elif obj.name == 'ping-reply': - self.add_info_message( - _('Pong! (%s seconds)') % obj.seconds) - elif obj.name == 'ping-error': - self.add_info_message(_('Error.')) - def show_avatar(self): if not app.config.get('show_avatar_in_chat'): return @@ -1166,13 +1166,6 @@ class ChatControl(ChatControlBase): self.xml.avatar_image.set_from_surface(surface) - def _nec_update_avatar(self, obj): - if obj.account != self.account: - return - if obj.jid != self.contact.jid: - return - self.show_avatar() - def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): if not selection.get_data(): @@ -1364,10 +1357,6 @@ class ChatControl(ChatControlBase): 'name': name, 'show': uf_show, 'status': status or ''} self.add_status_message(status_line) - @event_filter(['account', 'jid']) - def _on_zeroconf_error(self, event): - self.add_status_message(event.message) - def _info_bar_show_message(self): if self.info_bar.get_visible(): # A message is already shown ===================================== gajim/common/connection.py ===================================== @@ -1666,9 +1666,14 @@ class Connection(CommonConnection, ConnectionHandlers): def send_gc_message(self, obj): obj.stanza_id = self.connection.send(obj.msg_iq) app.nec.push_incoming_event(MessageSentEvent( - None, conn=self, jid=obj.jid, message=obj.message, + None, + conn=self, + account=self.name, + jid=obj.jid, + message=obj.message, automatic_message=obj.automatic_message, - stanza_id=obj.stanza_id, additional_data=obj.additional_data)) + stanza_id=obj.stanza_id, + additional_data=obj.additional_data)) def unregister_account(self, on_remove_success): self._unregister_account = True ===================================== gajim/common/helpers.py ===================================== @@ -1453,12 +1453,17 @@ def event_filter(filter_): @wraps(func) def func_wrapper(self, event, *args, **kwargs): for attr in filter_: + if '=' in attr: + attr1, attr2 = attr.split('=') + else: + attr1, attr2 = attr, attr try: - if getattr(event, attr) != getattr(self, attr): - return + if getattr(event, attr1) != getattr(self, attr2): + return None except AttributeError: - if getattr(event, attr) != getattr(self, '_%s' % attr): - return + if getattr(event, attr1) != getattr(self, '_%s' % attr2): + return None + return func(self, event, *args, **kwargs) return func_wrapper return event_filter_decorator ===================================== gajim/common/modules/caps.py ===================================== @@ -75,7 +75,7 @@ class Caps(BaseModule): app.nec.push_incoming_event( NetworkEvent('caps-update', - conn=self._con, + account=self._account, fjid=jid, jid=properties.jid.getBare())) @@ -134,7 +134,7 @@ class Caps(BaseModule): app.nec.push_incoming_event( NetworkEvent('caps-update', - conn=self._con, + account=self._account, fjid=str(info.jid), jid=bare_jid)) ===================================== gajim/groupchat_control.py ===================================== @@ -204,12 +204,12 @@ class GroupchatControl(ChatControlBase): ('muc-disco-update', ged.GUI1, self._on_disco_update), ('muc-configuration-finished', ged.GUI1, self._on_configuration_finished), ('muc-configuration-failed', ged.GUI1, self._on_configuration_failed), - ('gc-message-received', ged.GUI1, self._nec_gc_message_received), - ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), - ('update-room-avatar', ged.GUI1, self._nec_update_room_avatar), - ('signed-in', ged.GUI1, self._nec_signed_in), - ('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received), - ('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._message_sent), + ('gc-message-received', ged.GUI1, self._on_gc_message_received), + ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), + ('update-room-avatar', ged.GUI1, self._on_update_room_avatar), + ('signed-in', ged.GUI1, self._on_signed_in), + ('decrypted-message-received', ged.GUI2, self._on_decrypted_message_received), + ('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._on_message_sent), ('bookmarks-received', ged.GUI2, self._on_bookmarks_received), ]) # pylint: enable=line-too-long @@ -785,9 +785,8 @@ class GroupchatControl(ChatControlBase): """ self.xml.banner_name_label.set_text(self.room_name) - def _nec_update_room_avatar(self, obj): - if obj.jid != self.room_jid: - return + @event_filter(['jid=room_jid']) + def _on_update_room_avatar(self, event): self._update_banner_state_image() @event_filter(['account']) @@ -815,37 +814,37 @@ class GroupchatControl(ChatControlBase): modal=False).show() @event_filter(['account']) - def _nec_mam_decrypted_message_received(self, obj): - if not obj.properties.type.is_groupchat: + def _on_mam_decrypted_message_received(self, event): + if not event.properties.type.is_groupchat: return - if obj.archive_jid != self.room_jid: + if event.archive_jid != self.room_jid: return - self.add_message(obj.msgtxt, - contact=obj.properties.muc_nickname, - tim=obj.properties.mam.timestamp, - correct_id=obj.correct_id, - message_id=obj.properties.id, - additional_data=obj.additional_data) + self.add_message(event.msgtxt, + contact=event.properties.muc_nickname, + tim=event.properties.mam.timestamp, + correct_id=event.correct_id, + message_id=event.properties.id, + additional_data=event.additional_data) @event_filter(['account', 'room_jid']) - def _nec_gc_message_received(self, obj): - if obj.properties.muc_nickname is None: + def _on_gc_message_received(self, event): + if event.properties.muc_nickname is None: # message from server - self.add_message(obj.msgtxt, - tim=obj.properties.timestamp, - displaymarking=obj.displaymarking, - additional_data=obj.additional_data) + self.add_message(event.msgtxt, + tim=event.properties.timestamp, + displaymarking=event.displaymarking, + additional_data=event.additional_data) else: - if obj.properties.muc_nickname == self.nick: - self.last_sent_txt = obj.msgtxt - self.add_message(obj.msgtxt, - contact=obj.properties.muc_nickname, - tim=obj.properties.timestamp, - displaymarking=obj.displaymarking, - correct_id=obj.correct_id, - message_id=obj.properties.id, - additional_data=obj.additional_data) - obj.needs_highlight = self.needs_visual_notification(obj.msgtxt) + if event.properties.muc_nickname == self.nick: + self.last_sent_txt = event.msgtxt + self.add_message(event.msgtxt, + contact=event.properties.muc_nickname, + tim=event.properties.timestamp, + displaymarking=event.displaymarking, + correct_id=event.correct_id, + message_id=event.properties.id, + additional_data=event.additional_data) + event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, msg_log_id=None, displaymarking=None): @@ -1083,43 +1082,41 @@ class GroupchatControl(ChatControlBase): for change in changes: self.add_info_message(change) - def _nec_signed_in(self, obj): - if obj.conn.name != self.account: - return - obj.conn.get_module('MUC').join(self._muc_data) - - def _nec_decrypted_message_received(self, obj): - if obj.conn.name != self.account: + def _on_signed_in(self, event): + if event.conn.name != self.account: return + event.conn.get_module('MUC').join(self._muc_data) - if not obj.properties.jid.bareMatch(self.room_jid): + @event_filter(['account']) + def _on_decrypted_message_received(self, event): + if not event.properties.jid.bareMatch(self.room_jid): return - if obj.properties.is_muc_pm and not obj.session.control: + if event.properties.is_muc_pm and not event.session.control: # We got a pm from this room - nick = obj.resource + nick = event.resource # otherwise pass it off to the control to be queued self.on_private_message(nick, - obj.properties.is_sent_carbon, - obj.msgtxt, - obj.properties.timestamp, + event.properties.is_sent_carbon, + event.msgtxt, + event.properties.timestamp, self.session, - obj.additional_data, - msg_log_id=obj.msg_log_id, - displaymarking=obj.displaymarking) + event.additional_data, + msg_log_id=event.msg_log_id, + displaymarking=event.displaymarking) - def _nec_ping(self, obj): - if self.contact.jid != obj.contact.room_jid: + def _nec_ping(self, event): + if self.contact.jid != event.contact.room_jid: return - nick = obj.contact.get_shown_name() - if obj.name == 'ping-sent': + nick = event.contact.get_shown_name() + if event.name == 'ping-sent': self.add_info_message(_('Ping? (%s)') % nick) - elif obj.name == 'ping-reply': + elif event.name == 'ping-reply': self.add_info_message( _('Pong! (%(nick)s %(delay)s s.)') % {'nick': nick, - 'delay': obj.seconds}) - elif obj.name == 'ping-error': + 'delay': event.seconds}) + elif event.name == 'ping-error': self.add_info_message(_('Error.')) @property @@ -1519,15 +1516,13 @@ class GroupchatControl(ChatControlBase): if self._wait_for_destruction: self._close_control() - @event_filter(['account']) - def _message_sent(self, obj): - if not obj.message: - return - if obj.jid != self.room_jid: + @event_filter(['account', 'jid=room_jid']) + def _on_message_sent(self, event): + if not event.message: return # we'll save sent message text when we'll receive it in # _nec_gc_message_received - self.last_sent_msg = obj.stanza_id + self.last_sent_msg = event.stanza_id if self.correcting: self.correcting = False gtkgui_helpers.remove_css_class( ===================================== gajim/gtk/util.py ===================================== @@ -519,17 +519,6 @@ def ensure_not_destroyed(func): return func_wrapper -def ensure_proper_control(func): - @wraps(func) - def func_wrapper(self, event): - if event.account != self.account: - return - if event.jid != self.contact.jid: - return - return func(self, event) - return func_wrapper - - def format_mood(mood, text): if mood is None: return '' ===================================== gajim/privatechat_control.py ===================================== @@ -29,6 +29,7 @@ from gajim.common import helpers from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import AvatarSize +from gajim.common.helpers import event_filter from gajim.chat_control import ChatControl from gajim.command_system.implementation.hosts import PrivateChatCommands @@ -58,15 +59,15 @@ class PrivateChatControl(ChatControl): # pylint: disable=line-too-long self.register_events([ - ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), - ('caps-update', ged.GUI1, self._nec_caps_received_pm), + ('update-gc-avatar', ged.GUI1, self._on_update_gc_avatar), + ('caps-update', ged.GUI1, self._on_caps_update), ('muc-user-joined', ged.GUI1, self._on_user_joined), ('muc-user-left', ged.GUI1, self._on_user_left), ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), ('muc-self-presence', ged.GUI1, self._on_self_presence), - ('muc-self-kicked', ged.GUI1, self._on_diconnected), + ('muc-self-kicked', ged.GUI1, self._on_disconnected), ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), - ('muc-destroyed', ged.GUI1, self._on_diconnected), + ('muc-destroyed', ged.GUI1, self._on_disconnected), ]) # pylint: enable=line-too-long @@ -88,15 +89,14 @@ class PrivateChatControl(ChatControl): def get_our_nick(self): return self.room_ctrl.nick - def _nec_caps_received_pm(self, obj): - if obj.conn.name != self.account or \ - obj.fjid != self.gc_contact.get_full_jid(): + @event_filter(['account']) + def _on_caps_update(self, event): + if event.fjid != self.gc_contact.get_full_jid(): return self.update_contact() + @event_filter(['account']) def _on_nickname_changed(self, event): - if event.account != self.account: - return if event.properties.new_jid != self.gc_contact.get_full_jid(): return @@ -118,9 +118,8 @@ class PrivateChatControl(ChatControl): self.parent_win.redraw_tab(self) self.update_ui() + @event_filter(['account']) def _on_status_show_changed(self, event): - if event.account != self.account: - return if event.properties.jid != self.gc_contact.get_full_jid(): return @@ -146,25 +145,22 @@ class PrivateChatControl(ChatControl): self.parent_win.redraw_tab(self) self.update_ui() - def _on_diconnected(self, event): - if event.account != self.account: - return + @event_filter(['account']) + def _on_disconnected(self, event): if event.properties.jid != self.gc_contact.get_full_jid(): return self.got_disconnected() + @event_filter(['account']) def _on_user_left(self, event): - if event.account != self.account: - return if event.properties.jid != self.gc_contact.get_full_jid(): return self.got_disconnected() + @event_filter(['account']) def _on_user_joined(self, event): - if event.account != self.account: - return if event.properties.jid != self.gc_contact.get_full_jid(): return @@ -173,15 +169,19 @@ class PrivateChatControl(ChatControl): self.parent_win.redraw_tab(self) self.got_connected() + @event_filter(['account']) def _on_self_presence(self, event): - if event.account != self.account: - return if event.properties.jid != self.gc_contact.get_full_jid(): return self.parent_win.redraw_tab(self) self.got_connected() + def _on_update_gc_avatar(self, event): + if event.contact != self.gc_contact: + return + self.show_avatar() + def send_message(self, message, xhtml=None, process_commands=True, attention=False): """ @@ -214,11 +214,6 @@ class PrivateChatControl(ChatControl): else: self.got_connected() - def _nec_update_avatar(self, obj): - if obj.contact != self.gc_contact: - return - self.show_avatar() - def show_avatar(self): if not app.config.get('show_avatar_in_chat'): return View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/36ecf673212775ac3578bec48e2d4b800… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/36ecf673212775ac3578bec48e2d4b800… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused method
by Philipp Hörist 13 Nov '19

13 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36ecf673 by Philipp Hörist at 2019-11-13T19:37:37Z Remove unused method - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1388,12 +1388,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): return _on_ok(gc_contact) - def on_notify_menuitem_toggled(self, widget): - app.config.set_per('rooms', - self.contact.jid, - 'notify_on_all_messages', - widget.get_active()) - def set_control_active(self, state): con = app.connections[self.account] if state: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/36ecf673212775ac3578bec48e2d4b8000… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/36ecf673212775ac3578bec48e2d4b8000… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Remove remains of SI FT code
by Philipp Hörist 13 Nov '19

13 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 78c5c284 by Philipp Hörist at 2019-11-13T05:37:07Z Remove remains of SI FT code - - - - - 010cde76 by Philipp Hörist at 2019-11-13T09:51:31Z Use Enum for Control type attribute - - - - - c5f405ec by Philipp Hörist at 2019-11-13T13:36:37Z Add EventHelper class This class provides easier access to registering events and more importantly it deals with automatically unregistering all events with a simple call of unregister_events() This helps with objects getting correctly garbage collected - - - - - 0e893197 by Philipp Hörist at 2019-11-13T13:36:42Z Add EventHelper for GTK Widgets This is a variation that unregisters all events on `destroy` - - - - - f35c67eb by Philipp Hörist at 2019-11-13T14:55:35Z Increase usage of EventHelper - - - - - f6a1810d by Philipp Hörist at 2019-11-13T15:28:19Z Remove unused methods - - - - - 7f1ec993 by Philipp Hörist at 2019-11-13T15:42:51Z Integrate MessageControl into ChatControlBase There is no need to split functionality out into MessageControl because all Controls use ChatControlBase. This simplifys the code. - - - - - 30 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/connection_handlers_events.py - gajim/common/modules/base.py - gajim/common/modules/httpupload.py - gajim/common/modules/muc.py - gajim/common/nec.py - gajim/groupchat_control.py - gajim/gtk/account_wizard.py - gajim/gtk/add_contact.py - gajim/gtk/const.py - gajim/gtk/groupchat_roster.py - gajim/gtk/history_sync.py - gajim/gtk/http_upload_progress.py - gajim/gtk/mam_preferences.py - gajim/gtk/notification.py - gajim/gtk/pep_config.py - gajim/gtk/preferences.py - gajim/gtk/privacy_list.py - gajim/gtk/profile.py - gajim/gtk/search.py - gajim/gtk/server_info.py - gajim/gtk/util.py - gajim/gtk/xml_console.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - − gajim/message_control.py - gajim/message_window.py - gajim/privatechat_control.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1f8ecb5855e707d93b579dd622ad34abc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1f8ecb5855e707d93b579dd622ad34abc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: ChatControls: Refactor register/unregister handlers
by Philipp Hörist 12 Nov '19

12 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 429f108e by Philipp Hörist at 2019-11-12T18:48:35Z ChatControls: Refactor register/unregister handlers - - - - - b9f0ea9a by Philipp Hörist at 2019-11-12T19:12:50Z ChatControl: Fix pylint errors - - - - - d3ab2efe by Philipp Hörist at 2019-11-12T19:30:29Z ChatControlBase: Move methods so __init__() is the first - - - - - 6ea3e539 by Philipp Hörist at 2019-11-12T19:41:12Z ChatControlBase: Fix pylint errors - - - - - 1f8ecb58 by Philipp Hörist at 2019-11-12T19:42:48Z ChatControls: Remove unused attributes - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -34,9 +34,14 @@ from gi.repository import Gio from gi.repository import Pango from gi.repository import GLib from gi.repository import Gdk -from nbxmpp.protocol import NS_XHTML_IM, NS_FILE, NS_MUC -from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO -from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 + +from nbxmpp.protocol import NS_XHTML_IM +from nbxmpp.protocol import NS_FILE +from nbxmpp.protocol import NS_MUC +from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO +from nbxmpp.protocol import NS_JINGLE_RTP_VIDEO +from nbxmpp.protocol import NS_JINGLE_ICE_UDP +from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 from gajim.common import app from gajim.common import helpers @@ -82,11 +87,11 @@ class ChatControl(ChatControlBase): A control for standard 1-1 chat """ ( - JINGLE_STATE_NULL, - JINGLE_STATE_CONNECTING, - JINGLE_STATE_CONNECTION_RECEIVED, - JINGLE_STATE_CONNECTED, - JINGLE_STATE_ERROR + JINGLE_STATE_NULL, + JINGLE_STATE_CONNECTING, + JINGLE_STATE_CONNECTION_RECEIVED, + JINGLE_STATE_CONNECTED, + JINGLE_STATE_ERROR ) = range(5) TYPE_ID = message_control.TYPE_CHAT @@ -97,8 +102,13 @@ class ChatControl(ChatControlBase): COMMAND_HOST = ChatCommands # type: ClassVar[Type[CommandHost]] def __init__(self, parent_win, contact, acct, session, resource=None): - ChatControlBase.__init__(self, self.TYPE_ID, parent_win, - 'chat_control', contact, acct, resource) + ChatControlBase.__init__(self, + self.TYPE_ID, + parent_win, + 'chat_control', + contact, + acct, + resource) self.last_recv_message_id = None self.last_recv_message_marks = None @@ -133,13 +143,13 @@ class ChatControl(ChatControlBase): # Hook up signals widget = self.xml.location_eventbox id_ = widget.connect('button-release-event', - self.on_location_eventbox_button_release_event) + self.on_location_eventbox_button_release_event) self.handlers[id_] = widget id_ = widget.connect('enter-notify-event', - self.on_location_eventbox_enter_notify_event) + self.on_location_eventbox_enter_notify_event) self.handlers[id_] = widget id_ = widget.connect('leave-notify-event', - self.on_location_eventbox_leave_notify_event) + self.on_location_eventbox_leave_notify_event) self.handlers[id_] = widget for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'): @@ -154,7 +164,8 @@ class ChatControl(ChatControlBase): self.handlers[id_] = widget widget = self.xml.sound_hscale - id_ = widget.connect('value_changed', self.on_sound_hscale_value_changed) + id_ = widget.connect('value_changed', + self.on_sound_hscale_value_changed) self.handlers[id_] = widget self.info_bar = Gtk.InfoBar() @@ -188,8 +199,6 @@ class ChatControl(ChatControlBase): session.control = self self.session = session - # Enable encryption if needed - self.no_autonegotiation = False self.add_actions() self.update_ui() self.set_lock_image() @@ -202,41 +211,31 @@ class ChatControl(ChatControlBase): self.restore_conversation() self.msg_textview.grab_focus() - app.ged.register_event_handler('nickname-received', ged.GUI1, - self._on_nickname_received) - app.ged.register_event_handler('mood-received', ged.GUI1, - self._on_mood_received) - app.ged.register_event_handler('activity-received', ged.GUI1, - self._on_activity_received) - app.ged.register_event_handler('tune-received', ged.GUI1, - self._on_tune_received) - app.ged.register_event_handler('location-received', ged.GUI1, - self._on_location_received) - app.ged.register_event_handler('update-client-info', ged.GUI1, - self._on_update_client_info) + # pylint: disable=line-too-long + self._event_handlers = [ + ('nickname-received', ged.GUI1, self._on_nickname_received), + ('mood-received', ged.GUI1, self._on_mood_received), + ('activity-received', ged.GUI1, self._on_activity_received), + ('tune-received', ged.GUI1, self._on_tune_received), + ('location-received', ged.GUI1, self._on_location_received), + ('update-client-info', ged.GUI1, self._on_update_client_info), + ('chatstate-received', ged.GUI1, self._nec_chatstate_received), + ('caps-update', ged.GUI1, self._nec_caps_received), + ('message-sent', ged.OUT_POSTCORE, self._message_sent), + ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), + ('decrypted-message-received', ged.GUI1, self._nec_decrypted_message_received), + ('receipt-received', ged.GUI1, self._receipt_received), + ('message-error', ged.GUI1, self._on_message_error), + ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), + ] + if self.TYPE_ID == message_control.TYPE_CHAT: # Dont connect this when PrivateChatControl is used - app.ged.register_event_handler('update-roster-avatar', ged.GUI1, - self._nec_update_avatar) - app.ged.register_event_handler('chatstate-received', ged.GUI1, - self._nec_chatstate_received) - app.ged.register_event_handler('caps-update', ged.GUI1, - self._nec_caps_received) - app.ged.register_event_handler('message-sent', ged.OUT_POSTCORE, - self._message_sent) - app.ged.register_event_handler( - 'mam-decrypted-message-received', - ged.GUI1, self._nec_mam_decrypted_message_received) - app.ged.register_event_handler( - 'decrypted-message-received', - ged.GUI1, self._nec_decrypted_message_received) - app.ged.register_event_handler( - 'receipt-received', - ged.GUI1, self._receipt_received) - app.ged.register_event_handler('message-error', - ged.GUI1, self._on_message_error) - app.ged.register_event_handler('zeroconf-error', ged.GUI1, - self._on_zeroconf_error) + self._event_handlers.append(('update-roster-avatar', ged.GUI1, self._nec_update_avatar)) + # pylint: enable=line-too-long + + for handler in self._event_handlers: + app.ged.register_event_handler(*handler) # PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -317,14 +316,14 @@ class ChatControl(ChatControlBase): jingle_conditions = ( (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER_5)) and - self.contact.show != 'offline') + self.contact.show != 'offline') jingle = win.lookup_action('send-file-jingle-' + self.control_id) jingle.set_enabled(online and jingle_conditions) # Send file win.lookup_action( 'send-file-' + self.control_id).set_enabled( - jingle.get_enabled() or httpupload.get_enabled()) + jingle.get_enabled() or httpupload.get_enabled()) # Set File Transfer Button tooltip if online and (httpupload.get_enabled() or jingle.get_enabled()): @@ -371,13 +370,13 @@ class ChatControl(ChatControlBase): return Gdk.EVENT_PROPAGATE - def _on_add_to_roster(self, action, param): + def _on_add_to_roster(self, _action, _param): AddNewContactWindow(self.account, self.contact.jid) - def _on_information(self, action, param): + def _on_information(self, _action, _param): app.interface.roster.on_info(None, self.contact, self.account) - def _on_invite_contacts(self, action, param): + def _on_invite_contacts(self, _action, _param): """ User wants to invite some friends to chat """ @@ -474,6 +473,7 @@ class ChatControl(ChatControlBase): return self.xml.tune_image if type_ == PEPEventType.LOCATION: return self.xml.location_image + return None @ensure_proper_control def _on_mood_received(self, _event): @@ -515,17 +515,17 @@ class ChatControl(ChatControlBase): else: banner_image.show() if state == self.JINGLE_STATE_CONNECTING: - banner_image.set_from_icon_name( - 'network-transmit-symbolic', Gtk.IconSize.MENU) + banner_image.set_from_icon_name('network-transmit-symbolic', + Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_CONNECTION_RECEIVED: - banner_image.set_from_icon_name( - 'network-receive-symbolic', Gtk.IconSize.MENU) + banner_image.set_from_icon_name('network-receive-symbolic', + Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_CONNECTED: - banner_image.set_from_icon_name( - 'network-transmit-receive-symbolic', Gtk.IconSize.MENU) + banner_image.set_from_icon_name('network-transmit-receive-symbolic', + Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_ERROR: - banner_image.set_from_icon_name( - 'network-error-symbolic', Gtk.IconSize.MENU) + banner_image.set_from_icon_name('network-error-symbolic', + Gtk.IconSize.MENU) self.update_toolbar() def update_audio(self): @@ -562,7 +562,7 @@ class ChatControl(ChatControlBase): # update MessageWindow._controls self.parent_win.change_jid(self.account, old_full_jid, new_full_jid) - def stop_jingle(self, sid=None, reason=None): + def stop_jingle(self, sid=None, _reason=None): if self.audio_sid and sid in (self.audio_sid, None): self.close_jingle_content('audio') if self.video_sid and sid in (self.video_sid, None): @@ -573,20 +573,24 @@ class ChatControl(ChatControlBase): return if state in ('connecting', 'connected', 'stop', 'error') and reason: info = _('%(type)s state : %(state)s, reason: %(reason)s') % { - 'type': jingle_type.capitalize(), 'state': state, 'reason': reason} + 'type': jingle_type.capitalize(), + 'state': state, + 'reason': reason} self.add_info_message(info) states = {'connecting': self.JINGLE_STATE_CONNECTING, - 'connection_received': self.JINGLE_STATE_CONNECTION_RECEIVED, - 'connected': self.JINGLE_STATE_CONNECTED, - 'stop': self.JINGLE_STATE_NULL, - 'error': self.JINGLE_STATE_ERROR} + 'connection_received': self.JINGLE_STATE_CONNECTION_RECEIVED, + 'connected': self.JINGLE_STATE_CONNECTED, + 'stop': self.JINGLE_STATE_NULL, + 'error': self.JINGLE_STATE_ERROR} jingle_state = states[state] - if getattr(self, jingle_type + '_state') == jingle_state or state == 'error': + if (getattr(self, jingle_type + '_state') == jingle_state or + state == 'error'): return - if state == 'stop' and getattr(self, jingle_type + '_sid') not in (None, sid): + if (state == 'stop' and + getattr(self, jingle_type + '_sid') not in (None, sid)): return setattr(self, jingle_type + '_state', jingle_state) @@ -596,8 +600,8 @@ class ChatControl(ChatControlBase): if state in ('connection_received', 'connecting'): setattr(self, jingle_type + '_sid', sid) - v = GLib.Variant.new_boolean(jingle_state != self.JINGLE_STATE_NULL) - getattr(self, jingle_type + '_action').change_state(v) + var = GLib.Variant.new_boolean(jingle_state != self.JINGLE_STATE_NULL) + getattr(self, jingle_type + '_action').change_state(var) getattr(self, 'update_' + jingle_type)() @@ -608,27 +612,28 @@ class ChatControl(ChatControlBase): self._set_jingle_state('video', state, sid=sid, reason=reason) def _get_audio_content(self): - session = app.connections[self.account].get_module('Jingle').get_jingle_session( - self.contact.get_full_jid(), self.audio_sid) + con = app.connections[self.account] + session = con.get_module('Jingle').get_jingle_session( + self.contact.get_full_jid(), self.audio_sid) return session.get_content('audio') - def on_num_button_pressed(self, widget, num): + def on_num_button_pressed(self, _widget, num): self._get_audio_content()._start_dtmf(num) - def on_num_button_released(self, released): + def on_num_button_released(self, _released): self._get_audio_content()._stop_dtmf() - def on_mic_hscale_value_changed(self, widget, value): + def on_mic_hscale_value_changed(self, _widget, value): self._get_audio_content().set_mic_volume(value / 100) # Save volume to config app.config.set('audio_input_volume', value) - def on_sound_hscale_value_changed(self, widget, value): + def on_sound_hscale_value_changed(self, _widget, value): self._get_audio_content().set_out_volume(value / 100) # Save volume to config app.config.set('audio_output_volume', value) - def on_location_eventbox_button_release_event(self, widget, event): + def on_location_eventbox_button_release_event(self, _widget, _event): if 'geoloc' in self.contact.pep: location = self.contact.pep['geoloc'].data if 'lat' in location and 'lon' in location: @@ -636,14 +641,14 @@ class ChatControl(ChatControlBase): location['lon']) open_uri(uri) - def on_location_eventbox_leave_notify_event(self, widget, event): + def on_location_eventbox_leave_notify_event(self, _widget, _event): """ Just moved the mouse so show the cursor """ cursor = get_cursor('default') self.parent_win.window.get_window().set_cursor(cursor) - def on_location_eventbox_enter_notify_event(self, widget, event): + def on_location_eventbox_enter_notify_event(self, _widget, _event): cursor = get_cursor('pointer') self.parent_win.window.get_window().set_cursor(cursor) @@ -672,7 +677,8 @@ class ChatControl(ChatControlBase): # We know our contacts nick, but if another contact has the same nick # in another account we need to also display the account. - # except if we are talking to two different resources of the same contact + # except if we are talking to two different resources of the + # same contact acct_info = '' for account in app.contacts.get_accounts(): if account == self.account: @@ -739,14 +745,15 @@ class ChatControl(ChatControlBase): return setattr(self, jingle_type + '_sid', None) setattr(self, jingle_type + '_state', self.JINGLE_STATE_NULL) - session = app.connections[self.account].get_module('Jingle').get_jingle_session( + con = app.connections[self.account] + session = con.get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), sid) if session: content = session.get_content(jingle_type) if content: session.remove_content(content.creator, content.name) - v = GLib.Variant.new_boolean(False) - getattr(self, jingle_type + '_action').change_state(v) + var = GLib.Variant.new_boolean(False) + getattr(self, jingle_type + '_action').change_state(var) getattr(self, 'update_' + jingle_type)() def on_jingle_button_toggled(self, state, jingle_type): @@ -772,7 +779,8 @@ class ChatControl(ChatControlBase): in_da = self.xml.incoming_drawingarea in_da.realize() in_xid = in_da.get_window().get_xid() - sid = app.connections[self.account].get_module('Jingle').start_video( + con = app.connections[self.account] + sid = con.get_module('Jingle').start_video( self.contact.get_full_jid(), in_xid, out_xid) else: sid = getattr(app.connections[self.account], @@ -878,14 +886,14 @@ class ChatControl(ChatControlBase): if self.encryption: self.sendmessage = True - app.plugin_manager.extension_point( - 'send_message' + self.encryption, self) + app.plugin_manager.extension_point('send_message' + self.encryption, + self) if not self.sendmessage: return message = helpers.remove_invalid_xml_chars(message) if message in ('', None, '\n'): - return None + return ChatControlBase.send_message(self, message, @@ -913,8 +921,8 @@ class ChatControl(ChatControlBase): If frm is set to status: it's a status message. if frm is set to error: it's an error message. The difference between - status and error is mainly that with error, msg count as a new message - (in systray and in control). + status and error is mainly that with error, msg count as a new + message (in systray and in control). If frm is set to info: it's a information message. If frm is set to print_queue: it is incoming from queue. If frm is set to another value: it's an outgoing message. @@ -932,19 +940,26 @@ class ChatControl(ChatControlBase): if not frm: kind = 'incoming' name = contact.get_shown_name() - elif frm == 'print_queue': # incoming message, but do not update time + elif frm == 'print_queue': kind = 'incoming_queue' name = contact.get_shown_name() else: kind = 'outgoing' name = self.get_our_nick() - ChatControlBase.add_message(self, text, kind, name, tim, - subject=subject, old_kind=self.old_msg_kind, - displaymarking=displaymarking, - msg_log_id=msg_log_id, message_id=message_id, - correct_id=correct_id, additional_data=additional_data, - error=error) + ChatControlBase.add_message(self, + text, + kind, + name, + tim, + subject=subject, + old_kind=self.old_msg_kind, + displaymarking=displaymarking, + msg_log_id=msg_log_id, + message_id=message_id, + correct_id=correct_id, + additional_data=additional_data, + error=error) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: @@ -960,8 +975,8 @@ class ChatControl(ChatControlBase): jid = self.contact.get_full_jid() else: jid = self.contact.jid - num_unread = len(app.events.get_events(self.account, jid, - ['printed_' + self.type_id, self.type_id])) + num_unread = len(app.events.get_events( + self.account, jid, ['printed_' + self.type_id, self.type_id])) if num_unread == 1 and not app.config.get('show_unread_tab_icon'): unread = '*' elif num_unread > 1: @@ -989,8 +1004,8 @@ class ChatControl(ChatControlBase): return surface if count_unread: - num_unread = len(app.events.get_events(self.account, jid, - ['printed_' + self.type_id, self.type_id])) + num_unread = len(app.events.get_events( + self.account, jid, ['printed_' + self.type_id, self.type_id])) else: num_unread = 0 @@ -1002,7 +1017,7 @@ class ChatControl(ChatControlBase): icon_name = get_icon_name('event', transport=transport) else: contact = app.contacts.get_contact_with_highest_priority( - self.account, self.contact.jid) + self.account, self.contact.jid) if not contact or self.resource: # For transient contacts contact = self.contact @@ -1018,11 +1033,15 @@ class ChatControl(ChatControlBase): """ if app.jid_is_transport(self.contact.jid): menu = gui_menu_builder.get_transport_menu(self.contact, - self.account) + self.account) else: - menu = gui_menu_builder.get_contact_menu(self.contact, self.account, - use_multiple_contacts=False, show_start_chat=False, - show_encryption=True, control=self, + menu = gui_menu_builder.get_contact_menu( + self.contact, + self.account, + use_multiple_contacts=False, + show_start_chat=False, + show_encryption=True, + control=self, show_buttonbar_items=not hide_buttonbar_items) return menu @@ -1030,36 +1049,10 @@ class ChatControl(ChatControlBase): # PluginSystem: removing GUI extension points connected with ChatControl # instance object app.plugin_manager.remove_gui_extension_point('chat_control', self) - app.ged.remove_event_handler('nickname-received', ged.GUI1, - self._on_nickname_received) - app.ged.remove_event_handler('mood-received', ged.GUI1, - self._on_mood_received) - app.ged.remove_event_handler('activity-received', ged.GUI1, - self._on_activity_received) - app.ged.remove_event_handler('tune-received', ged.GUI1, - self._on_tune_received) - app.ged.remove_event_handler('location-received', ged.GUI1, - self._on_location_received) - app.ged.remove_event_handler('update-client-info', ged.GUI1, - self._on_update_client_info) - if self.TYPE_ID == message_control.TYPE_CHAT: - app.ged.remove_event_handler('update-roster-avatar', ged.GUI1, - self._nec_update_avatar) - app.ged.remove_event_handler('chatstate-received', ged.GUI1, - self._nec_chatstate_received) - app.ged.remove_event_handler('caps-update', ged.GUI1, - self._nec_caps_received) - app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE, - self._message_sent) - app.ged.remove_event_handler( - 'mam-decrypted-message-received', - ged.GUI1, self._nec_mam_decrypted_message_received) - app.ged.remove_event_handler( - 'decrypted-message-received', - ged.GUI1, self._nec_decrypted_message_received) - app.ged.remove_event_handler( - 'receipt-received', - ged.GUI1, self._receipt_received) + + # Unregister handlers + for handler in self._event_handlers: + app.ged.remove_event_handler(*handler) self.unsubscribe_events() @@ -1075,18 +1068,22 @@ class ChatControl(ChatControlBase): self.session.control = None # Clean events - app.events.remove_events(self.account, self.get_full_jid(), - types=['printed_' + self.type_id, self.type_id]) + app.events.remove_events( + self.account, + self.get_full_jid(), + types=['printed_' + self.type_id, self.type_id]) # Remove contact instance if contact has been removed key = (self.contact.jid, self.account) roster = app.interface.roster - if key in roster.contacts_to_be_removed.keys() and \ - not roster.contact_has_pending_roster_events(self.contact, - self.account): + has_pending = roster.contact_has_pending_roster_events(self.contact, + self.account) + if key in roster.contacts_to_be_removed.keys() and not has_pending: backend = roster.contacts_to_be_removed[key]['backend'] del roster.contacts_to_be_removed[key] - roster.remove_contact(self.contact.jid, self.account, force=True, - backend=backend) + roster.remove_contact(self.contact.jid, + self.account, + force=True, + backend=backend) # remove all register handlers on widgets, created by self.xml # to prevent circular references among objects for i in list(self.handlers.keys()): @@ -1192,13 +1189,13 @@ class ChatControl(ChatControlBase): # get contact info (check for PM = private chat) if self.TYPE_ID == message_control.TYPE_PM: - c = self.gc_contact.as_contact() + contact = self.gc_contact.as_contact() else: - c = self.contact + contact = self.contact if target_type == self.TARGET_TYPE_URI_LIST: # File drag and drop (handled in chat_control_base) - self.drag_data_file_transfer(c, selection, self) + self.drag_data_file_transfer(contact, selection, self) else: # Convert single chat to MUC treeview = app.interface.roster.tree @@ -1212,11 +1209,13 @@ class ChatControl(ChatControlBase): dropped_jid = data dropped_transport = app.get_transport_name_from_jid(dropped_jid) - c_transport = app.get_transport_name_from_jid(c.jid) + c_transport = app.get_transport_name_from_jid(contact.jid) if dropped_transport or c_transport: return # transport contacts cannot be invited - dialogs.TransformChatToMUC(self.account, [c.jid], [dropped_jid]) + dialogs.TransformChatToMUC(self.account, + [contact.jid], + [dropped_jid]) def restore_conversation(self): jid = self.contact.jid @@ -1226,11 +1225,11 @@ class ChatControl(ChatControlBase): # number of messages that are in queue and are already logged, we want # to avoid duplication - pending = len(app.events.get_events(self.account, jid, - ['chat', 'pm'])) + pending = len(app.events.get_events(self.account, jid, ['chat', 'pm'])) if self.resource: pending += len(app.events.get_events(self.account, - self.contact.get_full_jid(), ['chat', 'pm'])) + self.contact.get_full_jid(), + ['chat', 'pm'])) rows = app.logger.get_last_conversation_lines( self.account, jid, pending) @@ -1247,7 +1246,7 @@ class ChatControl(ChatControlBase): kind = 'outgoing' name = self.get_our_nick() elif row.kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV): + KindConstant.CHAT_MSG_RECV): kind = 'incoming' name = self.contact.get_shown_name() elif row.kind == KindConstant.ERROR: @@ -1270,7 +1269,8 @@ class ChatControl(ChatControlBase): message_id=row.message_id, marker=row.marker, error=row.error) - if row.message.startswith('/me ') or row.message.startswith('/me\n'): + if (row.message.startswith('/me ') or + row.message.startswith('/me\n')): local_old_kind = None else: local_old_kind = kind @@ -1310,8 +1310,9 @@ class ChatControl(ChatControlBase): self.set_session(event.session) if message_ids: app.logger.set_read_messages(message_ids) - app.events.remove_events(self.account, jid_with_resource, - types=[self.type_id]) + app.events.remove_events(self.account, + jid_with_resource, + types=[self.type_id]) typ = 'chat' # Is it a normal chat or a pm ? @@ -1319,7 +1320,7 @@ class ChatControl(ChatControlBase): # Is it a pm ? room_jid, nick = app.get_room_and_nick_from_fjid(jid) control = app.interface.msg_win_mgr.get_gc_control(room_jid, - self.account) + self.account) if control and control.type_id == message_control.TYPE_GC: control.update_ui() control.parent_win.show_title() @@ -1333,11 +1334,11 @@ class ChatControl(ChatControlBase): (not show_offline and typ == 'chat' and \ len(app.contacts.get_contacts(self.account, jid)) < 2): app.interface.roster.remove_to_be_removed(self.contact.jid, - self.account) + self.account) elif typ == 'pm': control.remove_contact(nick) - def _on_convert_to_gc_menuitem_activate(self, widget): + def _on_convert_to_gc_menuitem_activate(self, _widget): """ User wants to invite some friends to chat """ @@ -1347,7 +1348,7 @@ class ChatControl(ChatControlBase): ChatControlBase.got_connected(self) # Refreshing contact contact = app.contacts.get_contact_with_highest_priority( - self.account, self.contact.jid) + self.account, self.contact.jid) if isinstance(contact, GC_Contact): contact = contact.as_contact() if contact: @@ -1387,8 +1388,8 @@ class ChatControl(ChatControlBase): # Remove old buttons area = self.info_bar.get_action_area() - for b in area.get_children(): - area.remove(b) + for button in area.get_children(): + area.remove(button) # Add new buttons for button in buttons: @@ -1410,15 +1411,16 @@ class ChatControl(ChatControlBase): return ev return None - def _on_accept_file_request(self, widget, file_props): + def _on_accept_file_request(self, _widget, file_props): app.interface.instances['file_transfers'].on_file_request_accepted( self.account, self.contact, file_props) ev = self._get_file_props_event(file_props, 'file-request') if ev: app.events.remove_events(self.account, self.contact.jid, event=ev) - def _on_cancel_file_request(self, widget, file_props): - app.connections[self.account].get_module('Bytestream').send_file_rejection(file_props) + def _on_cancel_file_request(self, _widget, file_props): + con = app.connections[self.account] + con.get_module('Bytestream').send_file_rejection(file_props) ev = self._get_file_props_event(file_props, 'file-request') if ev: app.events.remove_events(self.account, self.contact.jid, event=ev) @@ -1448,7 +1450,7 @@ class ChatControl(ChatControlBase): file_props, Gtk.MessageType.QUESTION) - def _on_open_ft_folder(self, widget, file_props): + def _on_open_ft_folder(self, _widget, file_props): path = os.path.split(file_props.file_name)[0] if os.path.exists(path) and os.path.isdir(path): open_file(path) @@ -1456,14 +1458,14 @@ class ChatControl(ChatControlBase): if ev: app.events.remove_events(self.account, self.contact.jid, event=ev) - def _on_ok(self, widget, file_props, type_): + def _on_ok(self, _widget, file_props, type_): ev = self._get_file_props_event(file_props, type_) if ev: app.events.remove_events(self.account, self.contact.jid, event=ev) def _got_file_completed(self, file_props): markup = '%s\n%s' % (_('File Transfer Completed'), - file_props.name) + file_props.name) if file_props.desc: markup += '\n(%s)' % file_props.desc b1 = Gtk.Button.new_with_mnemonic(_('Open _Folder')) @@ -1477,21 +1479,21 @@ class ChatControl(ChatControlBase): def _got_file_error(self, file_props, type_, pri_txt, sec_txt): markup = '%s\n%s' % (pri_txt, sec_txt) - b = Gtk.Button.new_with_mnemonic(_('_Close')) - b.connect('clicked', self._on_ok, file_props, type_) + button = Gtk.Button.new_with_mnemonic(_('_Close')) + button.connect('clicked', self._on_ok, file_props, type_) self._add_info_bar_message( markup, - [b], + [button], file_props, Gtk.MessageType.ERROR) - def _on_accept_gc_invitation(self, widget, event): + def _on_accept_gc_invitation(self, _widget, event): app.interface.show_or_join_groupchat(self.account, str(event.muc), password=event.password) app.events.remove_events(self.account, self.contact.jid, event=event) - def _on_cancel_gc_invitation(self, widget, event): + def _on_cancel_gc_invitation(self, _widget, event): app.events.remove_events(self.account, self.contact.jid, event=event) def _get_gc_invitation(self, event): @@ -1524,9 +1526,11 @@ class ChatControl(ChatControlBase): elif event.file_props.error == -6: msg_err = _('Error opening file') self._got_file_error(event.file_props, event.type_, - _('File transfer stopped'), msg_err) + _('File transfer stopped'), msg_err) elif event.type_ in ('file-request-error', 'file-send-error'): - self._got_file_error(event.file_props, event.type_, + self._got_file_error( + event.file_props, + event.type_, _('File transfer cancelled'), _('Connection with peer cannot be established.')) elif event.type_ == 'gc-invitation': @@ -1541,9 +1545,13 @@ class ChatControl(ChatControlBase): continue if ev.jid != self.contact.jid: continue - if ev.type_ not in ('file-request', 'file-completed', 'file-error', - 'file-stopped', 'file-request-error', 'file-send-error', - 'gc-invitation'): + if ev.type_ not in ('file-request', + 'file-completed', + 'file-error', + 'file-stopped', + 'file-request-error', + 'file-send-error', + 'gc-invitation'): continue i = 0 removed = False ===================================== gajim/chat_control_base.py ===================================== @@ -91,116 +91,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # Multiple hardware keycodes can trigger a keyval like Gdk.KEY_c. keycodes_c = get_hardware_key_codes(Gdk.KEY_c) - def get_nb_unread(self): - jid = self.contact.jid - if self.resource: - jid += '/' + self.resource - type_ = self.type_id - return len(app.events.get_events(self.account, jid, ['printed_' + type_, - type_])) - - def draw_banner(self): - """ - Draw the fat line at the top of the window that houses the icon, jid, etc - - Derived types MAY implement this. - """ - self.draw_banner_text() - self._update_banner_state_image() - app.plugin_manager.gui_extension_point('chat_control_base_draw_banner', - self) - - def update_toolbar(self): - """ - update state of buttons in toolbar - """ - self._update_toolbar() - app.plugin_manager.gui_extension_point( - 'chat_control_base_update_toolbar', self) - - def draw_banner_text(self): - """ - Derived types SHOULD implement this - """ - - def update_ui(self): - """ - Derived types SHOULD implement this - """ - self.draw_banner() - - def repaint_themed_widgets(self): - """ - Derived types MAY implement this - """ - self.draw_banner() - - def _update_banner_state_image(self): - """ - Derived types MAY implement this - """ - - def _update_toolbar(self): - """ - Derived types MAY implement this - """ - - def _nec_our_status(self, obj): - if self.account != obj.conn.name: - return - if obj.show == 'offline' or (obj.show == 'invisible' and \ - obj.conn.is_zeroconf): - self.got_disconnected() - else: - # Other code rejoins all GCs, so we don't do it here - if not self.type_id == message_control.TYPE_GC: - self.got_connected() - if self.parent_win: - self.parent_win.redraw_tab(self) - - def setup_seclabel(self): - self.xml.label_selector.hide() - self.xml.label_selector.set_no_show_all(True) - lb = Gtk.ListStore(str) - self.xml.label_selector.set_model(lb) - cell = Gtk.CellRendererText() - cell.set_property('xpad', 5) # padding for status text - self.xml.label_selector.pack_start(cell, True) - # text to show is in in first column of liststore - self.xml.label_selector.add_attribute(cell, 'text', 0) - con = app.connections[self.account] - jid = self.contact.jid - if self.TYPE_ID == 'pm': - jid = self.gc_contact.room_jid - if con.get_module('SecLabels').supported: - con.get_module('SecLabels').request_catalog(jid) - - def _sec_labels_received(self, event): - if event.account != self.account: - return - - jid = self.contact.jid - if self.TYPE_ID == 'pm': - jid = self.gc_contact.room_jid - - if event.jid != jid: - return - model = self.xml.label_selector.get_model() - model.clear() - - sel = 0 - _label, labellist, default = event.catalog - for index, label in enumerate(labellist): - model.append([label]) - if label == default: - sel = index - - self.xml.label_selector.set_active(sel) - self.xml.label_selector.set_no_show_all(False) - self.xml.label_selector.show_all() - def __init__(self, type_id, parent_win, widget_name, contact, acct, - resource=None): + resource=None): # Undo needs this variable to know if space has been pressed. # Initialize it to True so empty textview is saved in undo list self.space_pressed = True @@ -208,13 +100,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if resource is None: # We very likely got a contact with a random resource. # This is bad, we need the highest for caps etc. - c = app.contacts.get_contact_with_highest_priority(acct, - contact.jid) - if c and not isinstance(c, GC_Contact): - contact = c + _contact = app.contacts.get_contact_with_highest_priority( + acct, contact.jid) + if _contact and not isinstance(_contact, GC_Contact): + contact = _contact MessageControl.__init__(self, type_id, parent_win, widget_name, - contact, acct, resource=resource) + contact, acct, resource=resource) if self.TYPE_ID != message_control.TYPE_GC: # Create banner and connect signals @@ -279,7 +171,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.conv_scrolledwindow.add(self.conv_textview.tv) widget = self.conv_scrolledwindow.get_vadjustment() id_ = widget.connect('changed', - self.on_conversation_vadjustment_changed) + self.on_conversation_vadjustment_changed) self.handlers[id_] = widget vscrollbar = self.conv_scrolledwindow.get_vscrollbar() @@ -298,13 +190,14 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) id_ = self.msg_textview.connect('paste-clipboard', - self._on_message_textview_paste_event) + self._on_message_textview_paste_event) self.handlers[id_] = self.msg_textview - id_ = self.msg_textview.connect('key_press_event', + id_ = self.msg_textview.connect( + 'key_press_event', self._on_message_textview_key_press_event) self.handlers[id_] = self.msg_textview id_ = self.msg_textview.connect('populate_popup', - self.on_msg_textview_populate_popup) + self.on_msg_textview_populate_popup) self.handlers[id_] = self.msg_textview # Setup DND @@ -335,15 +228,17 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.command_hits = [] self.last_key_tabs = False + self.sendmessage = True + con = app.connections[self.account] con.get_module('Chatstate').set_active(self.contact) id_ = self.msg_textview.connect('text-changed', - self._on_message_tv_buffer_changed) + self._on_message_tv_buffer_changed) self.handlers[id_] = self.msg_textview if parent_win is not None: id_ = parent_win.window.connect('motion-notify-event', - self._on_window_motion_notify) + self._on_window_motion_notify) self.handlers[id_] = parent_win.window self.encryption = self.get_encryption_state() @@ -353,23 +248,137 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # instance object (also subclasses, eg. ChatControl or GroupchatControl) app.plugin_manager.gui_extension_point('chat_control_base', self) - app.ged.register_event_handler('our-show', ged.GUI1, - self._nec_our_status) - app.ged.register_event_handler('ping-sent', ged.GUI1, - self._nec_ping) - app.ged.register_event_handler('ping-reply', ged.GUI1, - self._nec_ping) - app.ged.register_event_handler('ping-error', ged.GUI1, - self._nec_ping) - app.ged.register_event_handler('sec-catalog-received', ged.GUI1, - self._sec_labels_received) - app.ged.register_event_handler('style-changed', ged.GUI1, - self._style_changed) + # pylint: disable=line-too-long + self._base_event_handlers = [ + ('our-show', ged.GUI1, self._nec_our_status), + ('ping-sent', ged.GUI1, self._nec_ping), + ('ping-reply', ged.GUI1, self._nec_ping), + ('ping-error', ged.GUI1, self._nec_ping), + ('sec-catalog-received', ged.GUI1, self._sec_labels_received), + ('style-changed', ged.GUI1, self._style_changed), + ] + # pylint: enable=line-too-long + + for handler in self._base_event_handlers: + app.ged.register_event_handler(*handler) # This is basically a very nasty hack to surpass the inability # to properly use the super, because of the old code. CommandTools.__init__(self) + def get_nb_unread(self): + jid = self.contact.jid + if self.resource: + jid += '/' + self.resource + type_ = self.type_id + return len(app.events.get_events(self.account, + jid, + ['printed_' + type_, type_])) + + def draw_banner(self): + """ + Draw the fat line at the top of the window + that houses the icon, jid, etc + + Derived types MAY implement this. + """ + self.draw_banner_text() + self._update_banner_state_image() + app.plugin_manager.gui_extension_point('chat_control_base_draw_banner', + self) + + def update_toolbar(self): + """ + update state of buttons in toolbar + """ + self._update_toolbar() + app.plugin_manager.gui_extension_point( + 'chat_control_base_update_toolbar', self) + + def draw_banner_text(self): + """ + Derived types SHOULD implement this + """ + + def update_ui(self): + """ + Derived types SHOULD implement this + """ + self.draw_banner() + + def repaint_themed_widgets(self): + """ + Derived types MAY implement this + """ + self.draw_banner() + + def _update_banner_state_image(self): + """ + Derived types MAY implement this + """ + + def _update_toolbar(self): + """ + Derived types MAY implement this + """ + + def _nec_our_status(self, obj): + if self.account != obj.conn.name: + return + if obj.show == 'offline' or (obj.show == 'invisible' and \ + obj.conn.is_zeroconf): + self.got_disconnected() + else: + # Other code rejoins all GCs, so we don't do it here + if not self.type_id == message_control.TYPE_GC: + self.got_connected() + if self.parent_win: + self.parent_win.redraw_tab(self) + + def _nec_ping(self, obj): + raise NotImplementedError + + def setup_seclabel(self): + self.xml.label_selector.hide() + self.xml.label_selector.set_no_show_all(True) + lb = Gtk.ListStore(str) + self.xml.label_selector.set_model(lb) + cell = Gtk.CellRendererText() + cell.set_property('xpad', 5) # padding for status text + self.xml.label_selector.pack_start(cell, True) + # text to show is in in first column of liststore + self.xml.label_selector.add_attribute(cell, 'text', 0) + con = app.connections[self.account] + jid = self.contact.jid + if self.TYPE_ID == 'pm': + jid = self.gc_contact.room_jid + if con.get_module('SecLabels').supported: + con.get_module('SecLabels').request_catalog(jid) + + def _sec_labels_received(self, event): + if event.account != self.account: + return + + jid = self.contact.jid + if self.TYPE_ID == 'pm': + jid = self.gc_contact.room_jid + + if event.jid != jid: + return + model = self.xml.label_selector.get_model() + model.clear() + + sel = 0 + _label, labellist, default = event.catalog + for index, label in enumerate(labellist): + model.append([label]) + if label == default: + sel = index + + self.xml.label_selector.set_active(sel) + self.xml.label_selector.set_no_show_all(False) + self.xml.label_selector.show_all() + def delegate_action(self, action): if action == 'browse-history': dict_ = {'jid': GLib.Variant('s', self.contact.jid), @@ -536,7 +545,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gspell_lang = Gspell.language_get_default() return gspell_lang - def on_language_changed(self, checker, param): + def on_language_changed(self, checker, _param): gspell_lang = checker.get_language() per_type = 'contacts' if self.type_id == message_control.TYPE_GC: @@ -553,7 +562,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_textview.grab_focus() return Gdk.EVENT_STOP - def on_banner_label_populate_popup(self, label, menu): + def on_banner_label_populate_popup(self, _label, menu): """ Override the default context menu and add our own menuitems """ @@ -571,22 +580,19 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def shutdown(self): super(ChatControlBase, self).shutdown() - # PluginSystem: removing GUI extension points connected with ChatControlBase - # instance object + # PluginSystem: removing GUI extension points + # connected with ChatControlBase instance object app.plugin_manager.remove_gui_extension_point('chat_control_base', self) app.plugin_manager.remove_gui_extension_point( 'chat_control_base_draw_banner', self) app.plugin_manager.remove_gui_extension_point( 'chat_control_base_update_toolbar', self) - app.ged.remove_event_handler('our-show', ged.GUI1, - self._nec_our_status) - app.ged.remove_event_handler('sec-catalog-received', ged.GUI1, - self._sec_labels_received) - app.ged.remove_event_handler('style-changed', ged.GUI1, - self._style_changed) + # Unregister handlers + for handler in self._base_event_handlers: + app.ged.remove_event_handler(*handler) - def on_msg_textview_populate_popup(self, textview, menu): + def on_msg_textview_populate_popup(self, _textview, menu): """ Override the default context menu and we prepend an option to switch languages @@ -622,18 +628,18 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): text = clipboard.wait_for_text() self.insert_as_quote(text) - def on_quote(self, widget, text): + def on_quote(self, _widget, text): self.insert_as_quote(text) # moved from ChatControl - def _on_banner_eventbox_button_press_event(self, widget, event): + def _on_banner_eventbox_button_press_event(self, _widget, event): """ If right-clicked, show popup """ if event.button == 3: # right click self.parent_win.popup_menu(event) - def _on_message_textview_paste_event(self, texview): + def _on_message_textview_paste_event(self, _texview): clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) image = clipboard.wait_for_image() if image is not None: @@ -706,7 +712,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # pressing Control again (as in ctrl+z) _buffer = widget.get_buffer() start_iter, end_iter = _buffer.get_bounds() - self.msg_textview.save_undo(_buffer.get_text(start_iter, end_iter, True)) + self.msg_textview.save_undo(_buffer.get_text(start_iter, + end_iter, + True)) self.space_pressed = False # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here @@ -738,8 +746,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): end = message_buffer.get_iter_at_mark(position) text = message_buffer.get_text(start, end, False) splitted = text.split() - if (text.startswith(self.COMMAND_PREFIX) and not - text.startswith(self.COMMAND_PREFIX * 2) and len(splitted) == 1): + if (text.startswith(self.COMMAND_PREFIX) and + not text.startswith(self.COMMAND_PREFIX * 2) and + len(splitted) == 1): text = splitted[0] bare = text.lstrip(self.COMMAND_PREFIX) if len(text) == 1: @@ -816,7 +825,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return False def _on_drag_data_received(self, widget, context, x, y, selection, - target_type, timestamp): + target_type, timestamp): """ Derived types SHOULD implement this """ @@ -829,11 +838,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def _on_drag_motion(self, *args): # FIXME: DND on non editable TextView, find a better way if not self.drag_entered: - # We drag new data over the TextView, make it editable to catch dnd - self.drag_entered_conv = True self.conv_textview.tv.set_editable(True) - def drag_data_file_transfer(self, contact, selection, widget): + def drag_data_file_transfer(self, contact, selection, _widget): # get file transfer preference ft_pref = app.config.get_per('accounts', self.account, 'filetransfer_preference') @@ -874,7 +881,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def get_seclabel(self): idx = self.xml.label_selector.get_active() if idx == -1: - return + return None con = app.connections[self.account] jid = self.contact.jid @@ -886,8 +893,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): label = labels[lname] return label - def send_message(self, message, type_='chat', - resource=None, xhtml=None, process_commands=True, attention=False): + def send_message(self, + message, + type_='chat', + resource=None, + xhtml=None, + process_commands=True, + attention=False): """ Send the given message to the active tab. Doesn't return None if error """ @@ -996,13 +1008,24 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.conv_textview.print_conversation_line( text, 'status', '', None) - def add_message(self, text, kind, name, tim, - other_tags_for_name=None, other_tags_for_time=None, - other_tags_for_text=None, restored=False, subject=None, + def add_message(self, + text, + kind, + name, + tim, + other_tags_for_name=None, + other_tags_for_time=None, + other_tags_for_text=None, + restored=False, + subject=None, old_kind=None, - displaymarking=None, msg_log_id=None, - message_id=None, correct_id=None, additional_data=None, - marker=None, error=None): + displaymarking=None, + msg_log_id=None, + message_id=None, + correct_id=None, + additional_data=None, + marker=None, + error=None): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -1023,12 +1046,21 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if additional_data is None: additional_data = AdditionalDataDict() - textview.print_conversation_line(text, kind, name, tim, - other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, - displaymarking=displaymarking, message_id=message_id, - correct_id=correct_id, additional_data=additional_data, - marker=marker, error=error) + textview.print_conversation_line(text, + kind, + name, + tim, + other_tags_for_name, + other_tags_for_time, + other_tags_for_text, + subject, + old_kind, + displaymarking=displaymarking, + message_id=message_id, + correct_id=correct_id, + additional_data=additional_data, + marker=marker, + error=error) if restored: return @@ -1075,14 +1107,16 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): show_in_systray = get_show_in_systray( event_type.type_, self.contact.jid) - event = event_type(text, subject, self, msg_log_id, - show_in_roster=show_in_roster, - show_in_systray=show_in_systray) + event = event_type(text, + subject, + self, msg_log_id, + show_in_roster=show_in_roster, + show_in_systray=show_in_systray) app.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster if show_in_roster: app.interface.roster.draw_contact(self.contact.jid, - self.account) + self.account) if not self.parent_win: return @@ -1118,13 +1152,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): emoji_chooser.text_widget = self.msg_textview self.xml.emoticons_button.set_popover(emoji_chooser) - def on_color_menuitem_activate(self, widget): + def on_color_menuitem_activate(self, _widget): color_dialog = Gtk.ColorChooserDialog(None, self.parent_win.window) color_dialog.set_use_alpha(False) color_dialog.connect('response', self.msg_textview.color_set) color_dialog.show_all() - def on_font_menuitem_activate(self, widget): + def on_font_menuitem_activate(self, _widget): font_dialog = Gtk.FontChooserDialog(None, self.parent_win.window) start, finish = self.msg_textview.get_active_iters() font_dialog.connect('response', self.msg_textview.font_set, start, finish) @@ -1134,7 +1168,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): tag = widget.get_name() self.msg_textview.set_tag(tag) - def on_clear_formatting_menuitem_activate(self, widget): + def on_clear_formatting_menuitem_activate(self, _widget): self.msg_textview.clear_tags() def _style_changed(self, *args): @@ -1143,12 +1177,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def update_tags(self): self.conv_textview.update_tags() - def clear(self, tv): + @staticmethod + def clear(tv): buffer_ = tv.get_buffer() start, end = buffer_.get_bounds() buffer_.delete(start, end) - def _on_send_file(self, action, param): + def _on_send_file(self, _action, _param): # get file transfer preference ft_pref = app.config.get_per('accounts', self.account, 'filetransfer_preference') @@ -1168,19 +1203,20 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): elif jingle.get_enabled(): jingle.activate() - def _on_send_httpupload(self, action, param): + def _on_send_httpupload(self, _action, _param): app.interface.send_httpupload(self) - def _on_send_jingle(self, action, param): + def _on_send_jingle(self, _action, _param): self._on_send_file_jingle() def _on_send_file_jingle(self, gc_contact=None): """ gc_contact can be set when we are in a groupchat control """ - def _on_ok(c): + def _on_ok(_contact): app.interface.instances['file_transfers'].show_file_send_request( - self.account, c) + self.account, _contact) + if self.type_id == message_control.TYPE_PM: gc_contact = self.gc_contact @@ -1214,8 +1250,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): _on_ok(gc_contact) def on_notify_menuitem_toggled(self, widget): - app.config.set_per('rooms', self.contact.jid, 'notify_on_all_messages', - widget.get_active()) + app.config.set_per('rooms', + self.contact.jid, + 'notify_on_all_messages', + widget.get_active()) def set_control_active(self, state): con = app.connections[self.account] @@ -1227,8 +1265,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): type_ = ['printed_' + self.type_id] if self.type_id == message_control.TYPE_GC: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] - if not app.events.remove_events(self.account, self.get_full_jid(), - types=type_): + if not app.events.remove_events(self.account, + self.get_full_jid(), + types=type_): # There were events to remove self.redraw_after_event_removed(jid) # send chatstate inactive to the one we're leaving @@ -1246,7 +1285,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def scroll_to_end(self, force=False): self.conv_textview.scroll_to_end(force) - def _on_edge_reached(self, scrolledwindow, pos): + def _on_edge_reached(self, _scrolledwindow, pos): if pos != Gtk.PositionType.BOTTOM: return # Remove all events and set autoscroll True @@ -1331,7 +1370,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): app.log('autoscroll').info('Autoscroll disabled') self.conv_textview.autoscroll = False - def on_conversation_vadjustment_changed(self, adjustment): + def on_conversation_vadjustment_changed(self, _adjustment): self.scroll_to_end() def redraw_after_event_removed(self, jid): @@ -1345,7 +1384,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if self.type_id == message_control.TYPE_PM: room_jid, nick = app.get_room_and_nick_from_fjid(jid) groupchat_control = app.interface.msg_win_mgr.get_gc_control( - room_jid, self.account) + room_jid, self.account) if room_jid in app.interface.minimized_controls[self.account]: groupchat_control = \ app.interface.minimized_controls[self.account][room_jid] @@ -1418,7 +1457,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_textview.set_editable(False) self.conv_textview.tv.grab_focus() - self.no_autonegotiation = False self.update_toolbar() ===================================== gajim/privatechat_control.py ===================================== @@ -57,6 +57,7 @@ class PrivateChatControl(ChatControl): ChatControl.__init__(self, parent_win, contact, account, session) self.TYPE_ID = 'pm' + # pylint: disable=line-too-long self.__event_handlers = [ ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), ('caps-update', ged.GUI1, self._nec_caps_received_pm), @@ -68,6 +69,7 @@ class PrivateChatControl(ChatControl): ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), ('muc-destroyed', ged.GUI1, self._on_diconnected), ] + # pylint: enable=line-too-long for handler in self.__event_handlers: app.ged.register_event_handler(*handler) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fdf0bdae12305fae5e45873f63723cf18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fdf0bdae12305fae5e45873f63723cf18… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CertificateDialog: Use locale's appropriate time and date representation
by Philipp Hörist 12 Nov '19

12 Nov '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fdf0bdae by Daniel Brötzmann at 2019-11-12T07:26:56Z CertificateDialog: Use locale's appropriate time and date representation - - - - - 1 changed file: - gajim/gtk/dialogs.py Changes: ===================================== gajim/gtk/dialogs.py ===================================== @@ -485,10 +485,10 @@ class CertificateDialog(Gtk.ApplicationWindow): self._ib_org_unit = issuer.organizationalUnitName or '' issued = datetime.strptime(cert.get_notBefore().decode('ascii'), '%Y%m%d%H%M%SZ') - self._issued = issued.strftime('%B %d, %Y, %H:%M:%S %z') + self._issued = issued.strftime('%c %Z') expires = datetime.strptime(cert.get_notAfter().decode('ascii'), '%Y%m%d%H%M%SZ') - self._expires = expires.strftime('%B %d, %Y, %H:%M:%S %z') + self._expires = expires.strftime('%c %Z') self._sha1 = cert.digest('sha1').decode('utf-8') self._sha256 = cert.digest('sha256').decode('utf-8') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fdf0bdae12305fae5e45873f63723cf18d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fdf0bdae12305fae5e45873f63723cf18d… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits