Commits February 2017

commits@gajim.org

1 participants
28 discussions

[Git][gajim/gajim][master] 2 commits: Port application menu to GMenu
by Philipp Hörist 12 Feb '17

12 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f845266 by Philipp Hörist at 2017-02-12T18:17:27+01:00 Port application menu to GMenu - - - - - 4a7e5434 by Philipp Hörist at 2017-02-13T00:52:53+01:00 Merge branch 'appmenu' into 'master' Port application menu to GMenu See merge request !52 - - - - - 14 changed files: - − data/gui/advanced_menuitem_menu.ui - + data/gui/application_menu.ui - data/gui/roster_window.ui - + src/app_actions.py - src/common/connection.py - src/common/gajim.py - src/config.py - src/disco.py - src/gajim.py - src/gtkgui_helpers.py - src/gui_interface.py - src/gui_menu_builder.py - src/message_window.py - src/roster_window.py Changes: ===================================== data/gui/advanced_menuitem_menu.ui deleted ===================================== --- a/data/gui/advanced_menuitem_menu.ui +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkMenu" id="advanced_menuitem_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="xml_console_menuitem"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show _XML Console</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="archiving_preferences_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Edit Archi_ving Preferences</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="privacy_lists_menuitem"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Edit _Privacy Lists...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator8"> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="administrator_menuitem"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Administrator</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="administrator_menuitem_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="send_server_message_menuitem"> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Sends a message to users currently connected to this server</property> - <property name="label" translatable="yes">_Send Server Message...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="set_motd_menuitem"> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Sets Message of the Day</property> - <property name="label" translatable="yes">Set MOTD...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="update_motd_menuitem"> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Updates Message of the Day</property> - <property name="label" translatable="yes">Update MOTD...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="delete_motd_menuitem"> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Deletes Message of the Day</property> - <property name="label" translatable="yes">Delete MOTD</property> - </object> - </child> - </object> - </child> - </object> - </child> - </object> -</interface> ===================================== data/gui/application_menu.ui ===================================== --- /dev/null +++ b/data/gui/application_menu.ui @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <menu id="menubar"> + <submenu> + <attribute name="label" translatable="yes">Accounts</attribute> + </submenu> + <submenu> + <attribute name="label" translatable="yes">View</attribute> + <section> + <item> + <attribute name="label" translatable="yes">Show Roster</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> + <attribute name="action">win.show-transports</attribute> + </item> + </section> + <section> + <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> + <attribute name="action">app.history</attribute> + </item> + </section> + </submenu> + <submenu> + <attribute name="label" translatable="yes">Help</attribute> + <section> + <item> + <attribute name="label" translatable="yes">Contents</attribute> + <attribute name="action">app.content</attribute> + </item> + <item> + <attribute name="label" translatable="yes">FAQ</attribute> + <attribute name="action">app.faq</attribute> + </item> + <item> + <attribute name="label" translatable="yes">Keyboard Shortcuts</attribute> + <attribute name="action">app.shortcuts</attribute> + </item> + <item> + <attribute name="label" translatable="yes">Features</attribute> + <attribute name="action">app.features</attribute> + </item> + <item> + <attribute name="label" translatable="yes">About</attribute> + <attribute name="action">app.about</attribute> + </item> + </section> + </submenu> + </menu> + <menu id="appmenu"> + <section> + <item> + <attribute name="label" translatable="yes">Accounts</attribute> + <attribute name="action">app.accounts</attribute> + <attribute name="accel"><Primary><Shift>A</attribute> + </item> + <item> + <attribute name="label" translatable="yes">Bookmarks</attribute> + <attribute name="action">app.bookmarks</attribute> + <attribute name="accel"><Primary>B</attribute> + </item> + <item> + <attribute name="label" translatable="yes">History Manager</attribute> + <attribute name="action">app.history-manager</attribute> + </item> + <item> + <attribute name="label" translatable="yes">Plugins</attribute> + <attribute name="action">app.plugins</attribute> + </item> + <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> +</interface> \ No newline at end of file ===================================== data/gui/roster_window.ui ===================================== --- a/data/gui/roster_window.ui +++ b/data/gui/roster_window.ui @@ -25,304 +25,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkMenuBar" id="menubar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="actions_menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Actions</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_actions_menuitem_activate" swapped="no"/> - <child type="submenu"> - <object class="GtkMenu" id="actions_menu_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="new_chat_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Start Chat...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="send_single_message_menuitem"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Send Single _Message...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="join_gc_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Join _Group Chat</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="add_new_contact_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Add _Contact...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="service_disco_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Discover Services</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="advanced_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Advanced</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="quit_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">_Quit</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_quit_request" swapped="no"/> - <accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="edit_menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_edit_menuitem_activate" swapped="no"/> - <child type="submenu"> - <object class="GtkMenu" id="edit_menu_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="accounts_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Accounts</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_accounts_menuitem_activate" swapped="no"/> - <accelerator key="A" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="profile_avatar_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Profile, A_vatar</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="preferences_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">_Preferences</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_preferences_menuitem_activate" swapped="no"/> - <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="plugins_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">P_lugins</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_plugins_menuitem_activate" swapped="no"/> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="view_menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_View</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_view_menu_activate" swapped="no"/> - <child type="submenu"> - <object class="GtkMenu" id="view_menu_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckMenuItem" id="show_offline_contacts_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show _Offline Contacts</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_show_offline_contacts_menuitem_activate" swapped="no"/> - <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="show_only_active_contacts_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show Only _Active Contacts</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_show_only_active_contacts_menuitem_activate" swapped="no"/> - <accelerator key="Y" signal="activate" modifiers="GDK_CONTROL_MASK"/> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="show_transports_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show T_ransports</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_show_transports_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="show_roster_menuitem"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Show _Roster</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <signal name="toggled" handler="on_show_roster_menuitem_toggled" swapped="no"/> - <accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="file_transfers_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">File _Transfers</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_file_transfers_menuitem_activate" swapped="no"/> - <accelerator key="T" signal="activate" modifiers="GDK_CONTROL_MASK"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="history_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_history_menuitem_activate" swapped="no"/> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="help_menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Help</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="help_menu_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="contents_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Help online</property> - <property name="label" translatable="yes">_Contents</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_contents_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="faq_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Frequently Asked Questions (online)</property> - <property name="label" translatable="yes">_FAQ</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_faq_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="keyboard_shortcuts_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Keyboard Shortcuts</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_keyboard_shortcuts_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="menuitem1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="features_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Fea_tures</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_features_menuitem_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="about_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">_About</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_about_menuitem_activate" swapped="no"/> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> <child> <object class="GtkPaned" id="roster_hpaned"> ===================================== src/app_actions.py ===================================== --- /dev/null +++ b/src/app_actions.py @@ -0,0 +1,223 @@ +# -*- coding: utf-8 -*- +## src/app_actions.py +## +## Copyright (C) 2017 Philipp Hörist <philipp AT hoerist.com> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +from common import helpers +from common import gajim +from common.exceptions import GajimGeneralException +from gi.repository import Gtk +import sys +import os +import config +import dialogs +import features_window +import shortcuts_window +import plugins.gui +import history_window +import disco + + +class AppActions(): + ''' Action Callbacks ''' + def __init__(self, app: Gtk.Application): + self.application = app + + # Application Menu Actions + + def on_preferences(self, action, param): + if 'preferences' in gajim.interface.instances: + gajim.interface.instances['preferences'].window.present() + else: + gajim.interface.instances['preferences'] = \ + config.PreferencesWindow() + + def on_plugins(self, action, param): + if 'plugins' in gajim.interface.instances: + gajim.interface.instances['plugins'].window.present() + else: + gajim.interface.instances['plugins'] = plugins.gui.PluginsWindow() + + def on_accounts(self, action, param): + if 'accounts' in gajim.interface.instances: + gajim.interface.instances['accounts'].window.present() + else: + gajim.interface.instances['accounts'] = config.AccountsWindow() + + def on_history_manager(self, action, param): + if os.name == 'nt': + if os.path.exists('history_manager.exe'): + # user is running frozen application + helpers.exec_command('history_manager.exe') + else: + # user is running from source + helpers.exec_command('%s history_manager.py' % sys.executable) + else: + # Unix user + helpers.exec_command('%s history_manager.py' % sys.executable) + + def on_manage_bookmarks(self, action, param): + config.ManageBookmarksWindow() + + def on_quit(self, action, param): + gajim.interface.roster.on_quit_request() + + # Accounts Actions + + def on_profile(self, action, param): + gajim.interface.edit_own_details(param.get_string()) + + def on_activate_bookmark(self, action, param): + dict_ = param.unpack() + account, jid, nick, password = \ + dict_['account'], dict_['jid'], None, None + if 'nick' in dict_: + nick = dict_['nick'] + if 'password' in dict_: + password = dict_['password'] + gajim.interface.join_gc_room(account, jid, nick, password) + + def on_send_server_message(self, action, param): + account = param.get_string() + server = gajim.config.get_per('accounts', account, 'hostname') + server += '/announce/online' + dialogs.SingleMessageWindow(account, server, 'send') + + def on_service_disco(self, action, param): + account = param.get_string() + server_jid = gajim.config.get_per('accounts', account, 'hostname') + if server_jid in gajim.interface.instances[account]['disco']: + gajim.interface.instances[account]['disco'][server_jid].\ + window.present() + else: + try: + # Object will add itself to the window dict + disco.ServiceDiscoveryWindow(account, address_entry=True) + except GajimGeneralException: + pass + + def on_join_gc(self, action, param): + account = param.get_string() + invisible_show = gajim.SHOW_LIST.index('invisible') + if gajim.connections[account].connected == invisible_show: + dialogs.ErrorDialog(_( + 'You cannot join a group chat while you are invisible')) + return + if 'join_gc' in gajim.interface.instances[account]: + gajim.interface.instances[account]['join_gc'].window.present() + else: + try: + gajim.interface.instances[account]['join_gc'] = \ + dialogs.JoinGroupchatWindow(account) + except GajimGeneralException: + pass + + def on_add_contact(self, action, param): + dialogs.AddNewContactWindow(param.get_string()) + + def on_new_chat(self, action, param): + dialogs.NewChatDialog(param.get_string()) + + def on_single_message(self, action, param): + dialogs.SingleMessageWindow(param.get_string(), action='send') + + # Advanced Actions + + def on_archiving_preferences(self, action, param): + account = param.get_string() + if 'archiving_preferences' in gajim.interface.instances[account]: + gajim.interface.instances[account]['archiving_preferences'].window.\ + present() + else: + if gajim.connections[account].archiving_313_supported: + gajim.interface.instances[account]['archiving_preferences'] = \ + dialogs.Archiving313PreferencesWindow(account) + else: + gajim.interface.instances[account]['archiving_preferences'] = \ + dialogs.ArchivingPreferencesWindow(account) + + def on_privacy_lists(self, action, param): + account = param.get_string() + if 'privacy_lists' in gajim.interface.instances[account]: + gajim.interface.instances[account]['privacy_lists'].window.present() + else: + gajim.interface.instances[account]['privacy_lists'] = \ + dialogs.PrivacyListsWindow(account) + + def on_xml_console(self, action, param): + account = param.get_string() + if 'xml_console' in gajim.interface.instances[account]: + gajim.interface.instances[account]['xml_console'].window.present() + else: + gajim.interface.instances[account]['xml_console'] = \ + dialogs.XMLConsoleWindow(account) + + # Admin Actions + + def on_set_motd(self, action, param): + account = param.get_string() + server = gajim.config.get_per('accounts', account, 'hostname') + server += '/announce/motd' + dialogs.SingleMessageWindow(account, server, 'send') + + def on_update_motd(self, action, param): + account = param.get_string() + server = gajim.config.get_per('accounts', account, 'hostname') + server += '/announce/motd/update' + dialogs.SingleMessageWindow(account, server, 'send') + + def on_delete_motd(self, action, param): + account = param.get_string() + server = gajim.config.get_per('accounts', account, 'hostname') + server += '/announce/motd/delete' + gajim.connections[account].send_motd(server) + + # Help Actions + + def on_contents(self, action, param): + helpers.launch_browser_mailer( + 'url', 'https://dev.gajim.org/gajim/gajim/wikis') + + def on_faq(self, action, param): + helpers.launch_browser_mailer( + 'url', 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq') + + def on_keyboard_shortcuts(self, action, param): + shortcuts_window.show(self.application.get_active_window()) + + def on_features(self, action, param): + features_window.FeaturesWindow() + + def on_about(self, action, param): + dialogs.AboutDialog() + + # View Actions + + def on_file_transfers(self, action, param): + if gajim.interface.instances['file_transfers']. \ + window.get_property('visible'): + gajim.interface.instances['file_transfers'].window.present() + else: + gajim.interface.instances['file_transfers'].window.show_all() + + def on_history(self, action, param): + if 'logs' in gajim.interface.instances: + gajim.interface.instances['logs'].window.present() + else: + gajim.interface.instances['logs'] = history_window.\ + HistoryWindow() ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -62,6 +62,8 @@ from common import exceptions from common import check_X509 from common.connection_handlers import * +from gtkgui_helpers import get_action + if gajim.HAVE_PYOPENSSL: import OpenSSL.crypto @@ -2033,6 +2035,7 @@ class Connection(CommonConnection, ConnectionHandlers): break if nbxmpp.NS_VCARD in obj.features: self.vcard_supported = True + get_action(self.name + '-profile').set_enabled(True) if nbxmpp.NS_PUBSUB in obj.features: self.pubsub_supported = True if nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS in obj.features: @@ -2044,6 +2047,7 @@ class Connection(CommonConnection, ConnectionHandlers): if nbxmpp.NS_MAM in obj.features: self.archiving_supported = True self.archiving_313_supported = True + get_action(self.name + '-archive').set_enabled(True) if nbxmpp.NS_ARCHIVE in obj.features: self.archiving_supported = True self.archiving_136_supported = True @@ -2069,6 +2073,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.connection.send(iq) if nbxmpp.NS_PRIVACY in obj.features: self.privacy_rules_supported = True + get_action(self.name + '-privacylists').set_enabled(True) if nbxmpp.NS_BYTESTREAM in obj.features and \ gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -43,6 +43,7 @@ config = config.Config() version = config.get('version') connections = {} # 'account name': 'account (connection.Connection) instance' ipython_window = None +app = None # Gtk.Application ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher nec = None # Network Events Controller ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -48,6 +48,7 @@ import message_control from chat_control_base import ChatControlBase import dataforms_widget import profile_window +import gui_menu_builder try: import gtkspell @@ -2566,7 +2567,8 @@ class AccountsWindow: else: gajim.interface.roster.regroup = False gajim.interface.roster.setup_and_draw_roster() - gajim.interface.roster.set_actions_menu_needs_rebuild() + gajim.app.remove_account_actions(account) + gui_menu_builder.build_accounts_menu() def _enable_account(self, account): if account == gajim.ZEROCONF_ACC_NAME: @@ -2612,7 +2614,8 @@ class AccountsWindow: else: gajim.interface.roster.regroup = False gajim.interface.roster.setup_and_draw_roster() - gajim.interface.roster.set_actions_menu_needs_rebuild() + gajim.app.add_account_actions(account) + gui_menu_builder.build_accounts_menu() def on_enable_zeroconf_checkbutton2_toggled(self, widget): # don't do anything if there is an account with the local name but is a @@ -3154,7 +3157,8 @@ class RemoveAccountWindow: else: gajim.interface.roster.regroup = False gajim.interface.roster.setup_and_draw_roster() - gajim.interface.roster.set_actions_menu_needs_rebuild() + gajim.app.remove_account_actions(self.account) + gui_menu_builder.build_accounts_menu() if 'accounts' in gajim.interface.instances: gajim.interface.instances['accounts'].init_accounts() gajim.interface.instances['accounts'].init_account() @@ -3358,7 +3362,7 @@ class ManageBookmarksWindow: gajim.connections[acct].bookmarks.append(bmdict) gajim.connections[acct].store_bookmarks() - gajim.interface.roster.set_actions_menu_needs_rebuild() + gui_menu_builder.build_bookmark_menu(acct) self.window.destroy() def on_cancel_button_clicked(self, widget): @@ -4093,7 +4097,8 @@ class AccountCreationWizardWindow: else: gajim.interface.roster.regroup = False gajim.interface.roster.setup_and_draw_roster() - gajim.interface.roster.set_actions_menu_needs_rebuild() + gajim.app.add_account_actions(self.account) + gui_menu_builder.build_accounts_menu() class ManagePEPServicesWindow: def __init__(self, account): ===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -57,6 +57,7 @@ import gtkgui_helpers import groups import adhoc_commands import search_window +import gui_menu_builder from common import gajim import nbxmpp @@ -1852,7 +1853,7 @@ class MucBrowser(AgentBrowser): gajim.connections[self.account].bookmarks.append(bm) gajim.connections[self.account].store_bookmarks() - gajim.interface.roster.set_actions_menu_needs_rebuild() + gui_menu_builder.build_bookmark_menu(self.account) dialogs.InformationDialog( _('Bookmark has been added successfully'), ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -233,11 +233,23 @@ class GajimApplication(Gtk.Application): print("Encodings: d:{}, fs:{}, p:{}".format(sys.getdefaultencoding(), sys.getfilesystemencoding(), locale.getpreferredencoding())) + # Set Application Menu + gajim.app = self + path = os.path.join(configpaths.get('GUI'), 'application_menu.ui') + builder = Gtk.Builder() + builder.set_translation_domain(i18n.APP) + builder.add_from_file(path) + self.set_menubar(builder.get_object("menubar")) + self.set_app_menu(builder.get_object("appmenu")) + def do_activate(self): Gtk.Application.do_activate(self) from gui_interface import Interface self.interface = Interface() self.interface.run(self) + self.add_actions() + import gui_menu_builder + gui_menu_builder.build_accounts_menu() def do_shutdown(self, *args): Gtk.Application.do_shutdown(self) @@ -315,6 +327,91 @@ class GajimApplication(Gtk.Application): sys.stderr = outerr warnings.filterwarnings(action='ignore') + def add_actions(self): + ''' Build Application Actions ''' + from app_actions import AppActions + action = AppActions(self) + + self.account_actions = [ + ('-start-single-chat', action.on_single_message, 'online', 's'), + ('-start-chat', action.on_new_chat, 'online', 's'), + ('-join-groupchat', action.on_join_gc, 'online', 's'), + ('-add-contact', action.on_add_contact, 'online', 's'), + ('-services', action.on_service_disco, 'online', 's'), + ('-profile', action.on_profile, 'feature', 's'), + ('-xml-console', action.on_xml_console, 'always', 's'), + ('-archive', action.on_archiving_preferences, 'feature', 's'), + ('-privacylists', action.on_privacy_lists, 'feature', 's'), + ('-send-server-message', + action.on_send_server_message, 'online', 's'), + ('-set-motd', action.on_set_motd, 'online', 's'), + ('-update-motd', action.on_update_motd, 'online', 's'), + ('-delete-motd', action.on_delete_motd, 'online', 's'), + ('-activate-bookmark', + action.on_activate_bookmark, 'online', 'a{sv}') + ] + + self.general_actions = [ + ('quit', action.on_quit), + ('accounts', action.on_accounts), + ('bookmarks', action.on_manage_bookmarks), + ('history-manager', action.on_history_manager), + ('preferences', action.on_preferences), + ('plugins', action.on_plugins), + ('file-transfer', action.on_file_transfers), + ('history', action.on_history), + ('shortcuts', action.on_keyboard_shortcuts), + ('features', action.on_features), + ('content', action.on_contents), + ('about', action.on_about), + ('faq', action.on_faq) + ] + + for action in self.general_actions: + action_name, func = action + act = Gio.SimpleAction.new(action_name, None) + act.connect("activate", func) + self.add_action(act) + + from common import gajim + accounts_list = sorted(gajim.contacts.get_accounts()) + if not accounts_list: + return + if len(accounts_list) > 1: + for acc in accounts_list: + self.add_account_actions(acc) + else: + self.add_account_actions(accounts_list[0]) + + def add_account_actions(self, account): + for action in self.account_actions: + action_name, func, state, type_ = action + action_name = account + action_name + if self.lookup_action(action_name): + # We already added this action + continue + act = Gio.SimpleAction.new( + action_name, GLib.VariantType.new(type_)) + act.connect("activate", func) + if state != 'always': + act.set_enabled(False) + self.add_action(act) + + def remove_account_actions(self, account): + for action in self.account_actions: + action_name = account + action[0] + self.remove_action(action_name) + + def set_account_actions_state(self, account, new_state=False): + for action in self.account_actions: + action_name, _, state, _ = action + if not new_state and state in ('online', 'feature'): + # We go offline + self.lookup_action(account + action_name).set_enabled(False) + elif new_state and state == 'online': + # We go online + self.lookup_action(account + action_name).set_enabled(True) + app = GajimApplication() app.run(sys.argv) ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -1085,3 +1085,6 @@ def __label_size_allocate(widget, allocation): if lh_old != lh: widget.set_size_request (-1, lh / Pango.SCALE) + +def get_action(action): + return gajim.app.lookup_action(action) ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -56,7 +56,7 @@ if dbus_support.supported: import dbus import gtkgui_helpers - +import gui_menu_builder import dialogs import notify import message_control @@ -843,7 +843,7 @@ class Interface: # We received a bookmark item from the server (JEP48) # Auto join GC windows if neccessary - self.roster.set_actions_menu_needs_rebuild() + gui_menu_builder.build_bookmark_menu(obj.conn.name) invisible_show = gajim.SHOW_LIST.index('invisible') # do not autojoin if we are invisible if obj.conn.connected == invisible_show: @@ -2661,7 +2661,7 @@ class Interface: else: gajim.connections[account].bookmarks.append(bm) gajim.connections[account].store_bookmarks() - self.roster.set_actions_menu_needs_rebuild() + gui_menu_builder.build_bookmark_menu(account) dialogs.InformationDialog( _('Bookmark has been added successfully'), _('You can manage your bookmarks via Actions menu in your roster.')) ===================================== src/gui_menu_builder.py ===================================== --- a/src/gui_menu_builder.py +++ b/src/gui_menu_builder.py @@ -18,15 +18,17 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from gi.repository import Gtk +from gi.repository import Gtk, Gio, GLib import os import gtkgui_helpers import message_control from common import gajim from common import helpers +from common import i18n from nbxmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER, NS_CONFERENCE +from gtkgui_helpers import get_action def build_resources_submenu(contacts, account, action, room_jid=None, room_account=None, cap=None): @@ -636,3 +638,146 @@ def get_transport_menu(contact, account): menu.show_all() return menu +''' +Build dynamic Application Menus +''' + + +def get_bookmarks_menu(account, rebuild=False): + if not gajim.connections[account].bookmarks: + return None + menu = Gio.Menu() + + # Build Join Groupchat + action = 'app.{}-join-groupchat'.format(account) + menuitem = Gio.MenuItem.new(_('Join Group Chat'), action) + variant = GLib.Variant('s', account) + menuitem.set_action_and_target_value(action, variant) + menu.append_item(menuitem) + + # Build Bookmarks + section = Gio.Menu() + for bookmark in gajim.connections[account].bookmarks: + name = bookmark['name'] + if not name: + # No name was given for this bookmark. + # Use the first part of JID instead... + name = bookmark['jid'].split("@")[0] + + # Shorten long names + name = (name[:42] + '..') if len(name) > 42 else name + + action = 'app.{}-activate-bookmark'.format(account) + menuitem = Gio.MenuItem.new(name, action) + + # Create Variant Dict + dict_ = {'account': GLib.Variant('s', account), + 'jid': GLib.Variant('s', bookmark['jid'])} + if bookmark['nick']: + dict_['nick'] = GLib.Variant('s', bookmark['nick']) + if bookmark['password']: + dict_['password'] = GLib.Variant('s', bookmark['password']) + variant_dict = GLib.Variant('a{sv}', dict_) + + menuitem.set_action_and_target_value(action, variant_dict) + section.append_item(menuitem) + menu.append_section(None, section) + if not rebuild: + get_action(account + '-activate-bookmark').set_enabled(True) + + return menu + + +def get_account_menu(account): + ''' + [(action, label/sub_menu)] + action: string + label: string + sub menu: list + ''' + account_menu = [ + ('-add-contact', _('Add Contact...')), + ('-join-groupchat', _('Join Group Chat')), + ('-profile', _('Profile')), + ('-services', _('Discover Services')), + ('-start-chat', _('Start Chat...')), + ('-start-single-chat', _('Send Single Message...')), + ('Advanced', [ + ('-archive', _('Archiving Preferences')), + ('-privacylists', _('Privacy Lists')), + ('-xml-console', _('XML Console')) + ]), + ('Admin', [ + ('-send-server-message', _('Send Server Message...')), + ('-set-motd', _('Set MOTD...')), + ('-update-motd', _('Update MOTD...')), + ('-delete-motd', _('Delete MOTD...')) + ]), + ] + + def build_menu(preset): + menu = Gio.Menu() + for item in preset: + if isinstance(item[1], str): + action, label = item + if action == '-join-groupchat': + bookmark_menu = get_bookmarks_menu(account, True) + if bookmark_menu: + menu.append_submenu(label, bookmark_menu) + continue + action = 'app.{}{}'.format(account, action) + menuitem = Gio.MenuItem.new(label, action) + variant = GLib.Variant('s', account) + menuitem.set_action_and_target_value(action, variant) + menu.append_item(menuitem) + else: + label, sub_menu = item + # This is a submenu + submenu = build_menu(sub_menu) + menu.append_submenu(label, submenu) + return menu + + return build_menu(account_menu) + + +def build_accounts_menu(): + menubar = gajim.app.get_menubar() + # Accounts Submenu + acc_menu = menubar.get_item_link(0, 'submenu') + acc_menu.remove_all() + accounts_list = sorted(gajim.contacts.get_accounts()) + if not accounts_list: + no_accounts = _('No Accounts available') + acc_menu.append_item(Gio.MenuItem.new(no_accounts, None)) + return + if len(accounts_list) > 1: + for acc in accounts_list: + acc_menu.append_submenu( + acc, get_account_menu(acc)) + else: + acc_menu = get_account_menu(accounts_list[0]) + menubar.remove(0) + menubar.insert_submenu(0, 'Accounts', acc_menu) + + +def build_bookmark_menu(account): + menubar = gajim.app.get_menubar() + bookmark_menu = get_bookmarks_menu(account) + if not bookmark_menu: + return + + # Accounts Submenu + acc_menu = menubar.get_item_link(0, 'submenu') + + # We have more than one Account active + if acc_menu.get_item_link(0, 'submenu'): + for i in range(acc_menu.get_n_items()): + label = acc_menu.get_item_attribute_value(i, 'label') + if label.get_string() == account: + menu = acc_menu.get_item_link(i, 'submenu') + else: + # We have only one Account active + menu = acc_menu + label = menu.get_item_attribute_value(1, 'label').get_string() + menu.remove(1) + menu.insert_submenu(1, label, bookmark_menu) ===================================== src/message_window.py ===================================== --- a/src/message_window.py +++ b/src/message_window.py @@ -41,6 +41,7 @@ import dialogs from chat_control_base import ChatControlBase from common import gajim +from gtkgui_helpers import get_action #################### @@ -97,8 +98,7 @@ class MessageWindow(object): else: self.parent_paned.add(self.notebook) self.parent_paned.pack2(self.notebook, resize=True, shrink=True) - gajim.interface.roster.xml.get_object('show_roster_menuitem').\ - set_sensitive(True) + get_action('show-roster').set_enabled(True) orig_window.destroy() del orig_window @@ -626,8 +626,7 @@ class MessageWindow(object): # Don't close parent window, just remove the child child = self.parent_paned.get_child2() self.parent_paned.remove(child) - gajim.interface.roster.xml.get_object('show_roster_menuitem').\ - set_sensitive(False) + get_action('show-roster').set_enabled(False) else: self.window.destroy() return # don't show_title, we are dead @@ -1273,8 +1272,7 @@ class MessageWindowMgr(GObject.GObject): # Don't close parent window, just remove the child child = w.parent_paned.get_child2() w.parent_paned.remove(child) - gajim.interface.roster.xml.get_object('show_roster_menuitem').\ - set_sensitive(False) + get_action('show-roster').set_enabled(False) gtkgui_helpers.resize_window(w.window, gajim.config.get('roster_width'), gajim.config.get('roster_height')) ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -38,8 +38,8 @@ from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GObject from gi.repository import GLib +from gi.repository import Gio import os -import sys import time import locale @@ -57,10 +57,6 @@ import cell_renderer_image import tooltips import message_control import adhoc_commands -import features_window -import shortcuts_window -import plugins -import plugins.gui from common import gajim from common import helpers @@ -69,11 +65,10 @@ from common import i18n from common import location_listener from common import ged from common import dbus_support - from message_window import MessageWindowMgr - from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE + class Column(IntEnum): IMG = 0 # image to show state (online, new message etc) NAME = 1 # cellrenderer text that holds contact nickame @@ -2299,7 +2294,6 @@ class RosterWindow: for contact in [c for c in lcontact if ( (c.show != 'offline' or c.is_transport()) and not ctrl)]: self.chg_contact_status(contact, 'offline', '', account) - self.set_actions_menu_needs_rebuild() self.update_status_combobox() def get_status_message(self, show, on_response, show_pep=True, @@ -2678,6 +2672,7 @@ class RosterWindow: # sensitivity for this menuitem if gajim.get_number_of_connected_accounts() == 0: model[self.status_message_menuitem_iter][3] = False + self.application.set_account_actions_state(obj.conn.name) else: # sensitivity for this menuitem model[self.status_message_menuitem_iter][3] = True @@ -2716,7 +2711,7 @@ class RosterWindow: self.redraw_metacontacts(obj.conn.name) def _nec_signed_in(self, obj): - self.set_actions_menu_needs_rebuild() + self.application.set_account_actions_state(obj.conn.name, True) self.draw_account(obj.conn.name) def _nec_decrypted_message_received(self, obj): @@ -2778,74 +2773,10 @@ class RosterWindow: ### FIXME: order callbacks in itself... ################################################################################ - def on_actions_menuitem_activate(self, widget): - self.make_menu() - - def on_edit_menuitem_activate(self, widget): - """ - Need to call make_menu to build profile, avatar item - """ - self.make_menu() - def on_bookmark_menuitem_activate(self, widget, account, bookmark): gajim.interface.join_gc_room(account, bookmark['jid'], bookmark['nick'], bookmark['password']) - def on_send_server_message_menuitem_activate(self, widget, account): - server = gajim.config.get_per('accounts', account, 'hostname') - server += '/announce/online' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_xml_console_menuitem_activate(self, widget, account): - if 'xml_console' in gajim.interface.instances[account]: - gajim.interface.instances[account]['xml_console'].window.present() - else: - gajim.interface.instances[account]['xml_console'] = \ - dialogs.XMLConsoleWindow(account) - - def on_archiving_preferences_menuitem_activate(self, widget, account): - if 'archiving_preferences' in gajim.interface.instances[account]: - gajim.interface.instances[account]['archiving_preferences'].window.\ - present() - else: - if gajim.connections[account].archiving_313_supported: - gajim.interface.instances[account]['archiving_preferences'] = \ - dialogs.Archiving313PreferencesWindow(account) - else: - gajim.interface.instances[account]['archiving_preferences'] = \ - dialogs.ArchivingPreferencesWindow(account) - - def on_privacy_lists_menuitem_activate(self, widget, account): - if 'privacy_lists' in gajim.interface.instances[account]: - gajim.interface.instances[account]['privacy_lists'].window.present() - else: - gajim.interface.instances[account]['privacy_lists'] = \ - dialogs.PrivacyListsWindow(account) - - def on_set_motd_menuitem_activate(self, widget, account): - server = gajim.config.get_per('accounts', account, 'hostname') - server += '/announce/motd' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_update_motd_menuitem_activate(self, widget, account): - server = gajim.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/update' - dialogs.SingleMessageWindow(account, server, 'send') - - def on_delete_motd_menuitem_activate(self, widget, account): - server = gajim.config.get_per('accounts', account, 'hostname') - server += '/announce/motd/delete' - gajim.connections[account].send_motd(server) - - def on_history_manager_menuitem_activate(self, widget): - if os.name == 'nt': - if os.path.exists('history_manager.exe'): # user is running stable - helpers.exec_command('history_manager.exe') - else: # user is running svn - helpers.exec_command('%s history_manager.py' % sys.executable) - else: # Unix user - helpers.exec_command('%s history_manager.py' % sys.executable) - def on_info(self, widget, contact, account): """ Call vcard_information_window class to display contact's information @@ -3767,19 +3698,6 @@ class RosterWindow: self.get_status_message(status, on_continue) - def on_preferences_menuitem_activate(self, widget): - if 'preferences' in gajim.interface.instances: - gajim.interface.instances['preferences'].window.present() - else: - gajim.interface.instances['preferences'] = config.PreferencesWindow( - ) - - def on_plugins_menuitem_activate(self, widget): - if 'plugins' in gajim.interface.instances: - gajim.interface.instances['plugins'].window.present() - else: - gajim.interface.instances['plugins'] = plugins.gui.PluginsWindow() - def on_publish_tune_toggled(self, widget, account): active = widget.get_active() gajim.config.set_per('accounts', account, 'publish_tune', active) @@ -3843,52 +3761,14 @@ class RosterWindow: def on_new_chat_menuitem_activate(self, widget, account): dialogs.NewChatDialog(account) - def on_contents_menuitem_activate(self, widget): - helpers.launch_browser_mailer('url', 'http://trac.gajim.org/wiki') - - def on_faq_menuitem_activate(self, widget): - helpers.launch_browser_mailer('url', - 'http://trac.gajim.org/wiki/GajimFaq') - - def on_keyboard_shortcuts_menuitem_activate(self, widget): - shortcuts_window.show(self.window) - - def on_features_menuitem_activate(self, widget): - features_window.FeaturesWindow() - - def on_about_menuitem_activate(self, widget): - dialogs.AboutDialog() - - def on_accounts_menuitem_activate(self, widget): - if 'accounts' in gajim.interface.instances: - gajim.interface.instances['accounts'].window.present() - else: - gajim.interface.instances['accounts'] = config.AccountsWindow() - - def on_file_transfers_menuitem_activate(self, widget): - if gajim.interface.instances['file_transfers'].window.get_property( - 'visible'): - gajim.interface.instances['file_transfers'].window.present() - else: - gajim.interface.instances['file_transfers'].window.show_all() - - def on_history_menuitem_activate(self, widget): - if 'logs' in gajim.interface.instances: - gajim.interface.instances['logs'].window.present() - else: - gajim.interface.instances['logs'] = history_window.\ - HistoryWindow() - - def on_show_transports_menuitem_activate(self, widget): - gajim.config.set('show_transports_group', widget.get_active()) + def on_show_transports_action(self, action, param): + gajim.config.set('show_transports_group', param.get_boolean()) + action.set_state(param) self.refilter_shown_roster_items() def on_manage_bookmarks_menuitem_activate(self, widget): config.ManageBookmarksWindow() - def on_profile_avatar_menuitem_activate(self, widget, account): - gajim.interface.edit_own_details(account) - def on_execute_command(self, widget, contact, account, resource=None): """ Execute command. Full JID needed; if it is other contact, resource is @@ -4218,6 +4098,7 @@ class RosterWindow: # account = row[Column.ACCOUNT] # self._last_selected_contact.append((jid, account)) # GLib.idle_add(self.draw_contact, jid, account, True) + def on_service_disco_menuitem_activate(self, widget, account): server_jid = gajim.config.get_per('accounts', account, 'hostname') @@ -4231,50 +4112,43 @@ class RosterWindow: except GajimGeneralException: pass - def on_show_offline_contacts_menuitem_activate(self, widget): + def on_show_offline_contacts_action(self, action, param): """ When show offline option is changed: redraw the treeview """ - gajim.config.set('showoffline', not gajim.config.get('showoffline')) + action.set_state(param) + gajim.config.set('showoffline', param.get_boolean()) self.refilter_shown_roster_items() - w = self.xml.get_object('show_only_active_contacts_menuitem') - if gajim.config.get('showoffline'): + if param.get_boolean(): # We need to filter twice to show groups with no contacts inside # in the correct expand state self.refilter_shown_roster_items() - w.set_sensitive(False) + self.window.lookup_action('show-active').set_enabled(False) else: - w.set_sensitive(True) + self.window.lookup_action('show-active').set_enabled(True) - def on_show_only_active_contacts_menuitem_activate(self, widget): + def on_show_active_contacts_action(self, action, param): """ When show only active contact option is changed: redraw the treeview """ - gajim.config.set('show_only_chat_and_online', not gajim.config.get( - 'show_only_chat_and_online')) + action.set_state(param) + gajim.config.set('show_only_chat_and_online', param.get_boolean()) self.refilter_shown_roster_items() - w = self.xml.get_object('show_offline_contacts_menuitem') - if gajim.config.get('show_only_chat_and_online'): + + if param.get_boolean(): # We need to filter twice to show groups with no contacts inside # in the correct expand state self.refilter_shown_roster_items() - w.set_sensitive(False) + self.window.lookup_action('show-offline').set_enabled(False) else: - w.set_sensitive(True) + self.window.lookup_action('show-offline').set_enabled(True) - def on_view_menu_activate(self, widget): - self.make_menu() - # Hide the show roster menu if we are not in the right windowing mode. - if self.hpaned.get_child2() is not None: - self.xml.get_object('show_roster_menuitem').show() - else: - self.xml.get_object('show_roster_menuitem').hide() - - def on_show_roster_menuitem_toggled(self, widget): + def on_show_roster_action(self, action, param): # when num controls is 0 this menuitem is hidden, but still need to # disable keybinding + action.set_state(param) if self.hpaned.get_child2() is not None: - self.show_roster_vbox(widget.get_active()) + self.show_roster_vbox(param.get_boolean()) def on_rfilter_entry_changed(self, widget): """ When we update the content of the filter """ @@ -4339,7 +4213,9 @@ class RosterWindow: self._readjust_expand_collapse_state() # If roster was hidden before enable_rfilter was called, hide it back. - self.on_show_roster_menuitem_toggled(self.xml.get_object('show_roster_menuitem')) + state = self.window.lookup_action('show-roster').get_state().get_boolean() + if state is False and self.hpaned.get_child2() is not None: + self.show_roster_vbox(False) def on_roster_hpaned_notify(self, pane, gparamspec): """ @@ -5166,276 +5042,6 @@ class RosterWindow: ### FIXME: We really need to make it simpler! 1465 lines are a few to much.... ################################################################################ - def make_menu(self, force=False): - """ - Create the main window's menus - """ - if not force and not self.actions_menu_needs_rebuild: - return - history_menuitem = self.xml.get_object('history_menuitem') - new_chat_menuitem = self.xml.get_object('new_chat_menuitem') - single_message_menuitem = self.xml.get_object( - 'send_single_message_menuitem') - join_gc_menuitem = self.xml.get_object('join_gc_menuitem') - add_new_contact_menuitem = self.xml.get_object( - 'add_new_contact_menuitem') - service_disco_menuitem = self.xml.get_object('service_disco_menuitem') - advanced_menuitem = self.xml.get_object('advanced_menuitem') - profile_avatar_menuitem = self.xml.get_object('profile_avatar_menuitem') - - # destroy old advanced menus - for m in self.advanced_menus: - m.destroy() - - # make it sensitive. it is insensitive only if no accounts are - # *available* - advanced_menuitem.set_sensitive(True) - - if self.add_new_contact_handler_id: - add_new_contact_menuitem.handler_disconnect( - self.add_new_contact_handler_id) - self.add_new_contact_handler_id = None - - if self.service_disco_handler_id: - service_disco_menuitem.handler_disconnect( - self.service_disco_handler_id) - self.service_disco_handler_id = None - - if self.single_message_menuitem_handler_id: - single_message_menuitem.handler_disconnect( - self.single_message_menuitem_handler_id) - self.single_message_menuitem_handler_id = None - - if self.profile_avatar_menuitem_handler_id: - profile_avatar_menuitem.handler_disconnect( - self.profile_avatar_menuitem_handler_id) - self.profile_avatar_menuitem_handler_id = None - - # remove the existing submenus - add_new_contact_menuitem.set_submenu(None) - service_disco_menuitem.set_submenu(None) - join_gc_menuitem.set_submenu(None) - single_message_menuitem.set_submenu(None) - advanced_menuitem.set_submenu(None) - profile_avatar_menuitem.set_submenu(None) - - gc_sub_menu = Gtk.Menu() # gc is always a submenu - join_gc_menuitem.set_submenu(gc_sub_menu) - - connected_accounts = gajim.get_number_of_connected_accounts() - - connected_accounts_with_private_storage = 0 - - # items that get shown whether an account is zeroconf or not - accounts_list = sorted(gajim.contacts.get_accounts()) - if connected_accounts > 2 or \ - (connected_accounts > 1 and not gajim.zeroconf_is_connected()): - # 2 or more "real" (no zeroconf) accounts? make submenus - new_chat_sub_menu = Gtk.Menu() - - for account in accounts_list: - if gajim.connections[account].connected <= 1 or \ - gajim.config.get_per('accounts', account, 'is_zeroconf'): - # if offline or connecting or zeroconf - continue - - # new chat - new_chat_item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) - new_chat_item.set_use_underline(False) - new_chat_sub_menu.append(new_chat_item) - new_chat_item.connect('activate', - self.on_new_chat_menuitem_activate, account) - - new_chat_menuitem.set_submenu(new_chat_sub_menu) - new_chat_sub_menu.show_all() - - # menu items that don't apply to zeroconf connections - if connected_accounts == 1 or (connected_accounts == 2 and \ - gajim.zeroconf_is_connected()): - # only one 'real' (non-zeroconf) account is connected, don't need - # submenus - - for account in accounts_list: - if gajim.account_is_connected(account) and \ - not gajim.config.get_per('accounts', account, 'is_zeroconf'): - # gc - if gajim.connections[account].private_storage_supported: - connected_accounts_with_private_storage += 1 - self.add_bookmarks_list(gc_sub_menu, account) - gc_sub_menu.show_all() - # add - if not self.add_new_contact_handler_id: - self.add_new_contact_handler_id = \ - add_new_contact_menuitem.connect( - 'activate', self.on_add_new_contact, account) - # disco - if not self.service_disco_handler_id: - self.service_disco_handler_id = service_disco_menuitem.\ - connect('activate', - self.on_service_disco_menuitem_activate, account) - - # single message - if not self.single_message_menuitem_handler_id: - self.single_message_menuitem_handler_id = \ - single_message_menuitem.connect('activate', \ - self.on_send_single_message_menuitem_activate, account) - - break # No other account connected - else: - # 2 or more 'real' accounts are connected, make submenus - single_message_sub_menu = Gtk.Menu() - add_sub_menu = Gtk.Menu() - disco_sub_menu = Gtk.Menu() - - for account in accounts_list: - if gajim.connections[account].connected <= 1 or \ - gajim.config.get_per('accounts', account, 'is_zeroconf'): - # skip account if it's offline or connecting or is zeroconf - continue - - # single message - single_message_item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) - single_message_item.set_use_underline(False) - single_message_sub_menu.append(single_message_item) - single_message_item.connect('activate', - self.on_send_single_message_menuitem_activate, account) - - # join gc - if gajim.connections[account].private_storage_supported: - connected_accounts_with_private_storage += 1 - gc_item = Gtk.MenuItem.new_with_label( - _('using account %s') % account) - gc_item.set_use_underline(False) - gc_sub_menu.append(gc_item) - gc_menuitem_menu = Gtk.Menu() - self.add_bookmarks_list(gc_menuitem_menu, account) - gc_item.set_submenu(gc_menuitem_menu) - - # add - add_item = Gtk.MenuItem.new_with_label( - _('to %s account') % account) - add_item.set_use_underline(False) - add_sub_menu.append(add_item) - add_item.connect('activate', self.on_add_new_contact, account) - - # disco - disco_item = Gtk.MenuItem.new_with_label( - _('using %s account') % account) - disco_item.set_use_underline(False) - disco_sub_menu.append(disco_item) - disco_item.connect('activate', - self.on_service_disco_menuitem_activate, account) - - single_message_menuitem.set_submenu(single_message_sub_menu) - single_message_sub_menu.show_all() - gc_sub_menu.show_all() - add_new_contact_menuitem.set_submenu(add_sub_menu) - add_sub_menu.show_all() - service_disco_menuitem.set_submenu(disco_sub_menu) - disco_sub_menu.show_all() - - if connected_accounts == 0: - # no connected accounts, make the menuitems insensitive - for item in (new_chat_menuitem, join_gc_menuitem, - add_new_contact_menuitem, service_disco_menuitem, - single_message_menuitem): - item.set_sensitive(False) - else: # we have one or more connected accounts - for item in (new_chat_menuitem, join_gc_menuitem, - add_new_contact_menuitem, service_disco_menuitem, - single_message_menuitem): - item.set_sensitive(True) - # disable some fields if only local account is there - if connected_accounts == 1: - for account in gajim.connections: - if gajim.account_is_connected(account) and \ - gajim.connections[account].is_zeroconf: - for item in (new_chat_menuitem, join_gc_menuitem, - add_new_contact_menuitem, service_disco_menuitem, - single_message_menuitem): - item.set_sensitive(False) - - # Manage GC bookmarks - newitem = Gtk.SeparatorMenuItem.new() # separator - gc_sub_menu.append(newitem) - - newitem = Gtk.MenuItem.new_with_mnemonic(_('_Manage Bookmarks…')) - newitem.connect('activate', self.on_manage_bookmarks_menuitem_activate) - gc_sub_menu.append(newitem) - gc_sub_menu.show_all() - if connected_accounts_with_private_storage == 0: - newitem.set_sensitive(False) - - connected_accounts_with_vcard = [] - for account in gajim.connections: - if gajim.account_is_connected(account) and \ - gajim.connections[account].vcard_supported: - connected_accounts_with_vcard.append(account) - if len(connected_accounts_with_vcard) > 1: - # 2 or more accounts? make submenus - profile_avatar_sub_menu = Gtk.Menu() - for account in connected_accounts_with_vcard: - # profile, avatar - profile_avatar_item = Gtk.MenuItem.new_with_label( - _('of account %s') % account) - profile_avatar_item.set_use_underline(False) - profile_avatar_sub_menu.append(profile_avatar_item) - profile_avatar_item.connect('activate', - self.on_profile_avatar_menuitem_activate, account) - profile_avatar_menuitem.set_submenu(profile_avatar_sub_menu) - profile_avatar_sub_menu.show_all() - elif len(connected_accounts_with_vcard) == 1: - # user has only one account - account = connected_accounts_with_vcard[0] - # profile, avatar - if not self.profile_avatar_menuitem_handler_id: - self.profile_avatar_menuitem_handler_id = \ - profile_avatar_menuitem.connect('activate', - self.on_profile_avatar_menuitem_activate, account) - - if len(connected_accounts_with_vcard) == 0: - profile_avatar_menuitem.set_sensitive(False) - else: - profile_avatar_menuitem.set_sensitive(True) - - # Advanced Actions - if len(gajim.connections) == 0: # user has no accounts - advanced_menuitem.set_sensitive(False) - elif len(gajim.connections) == 1: # we have one acccount - account = list(gajim.connections.keys())[0] - advanced_menuitem_menu = \ - self.get_and_connect_advanced_menuitem_menu(account) - self.advanced_menus.append(advanced_menuitem_menu) - - self.add_history_manager_menuitem(advanced_menuitem_menu) - - advanced_menuitem.set_submenu(advanced_menuitem_menu) - advanced_menuitem_menu.show_all() - else: # user has *more* than one account : build advanced submenus - advanced_sub_menu = Gtk.Menu() - accounts = [] # Put accounts in a list to sort them - for account in gajim.connections: - accounts.append(account) - accounts.sort() - for account in accounts: - advanced_item = Gtk.MenuItem.new_with_label( - _('for account %s') % account) - advanced_item.set_use_underline(False) - advanced_sub_menu.append(advanced_item) - advanced_menuitem_menu = \ - self.get_and_connect_advanced_menuitem_menu(account) - self.advanced_menus.append(advanced_menuitem_menu) - advanced_item.set_submenu(advanced_menuitem_menu) - - self.add_history_manager_menuitem(advanced_sub_menu) - - advanced_menuitem.set_submenu(advanced_sub_menu) - advanced_sub_menu.show_all() - - self.actions_menu_needs_rebuild = False - def build_account_menu(self, account): # we have to create our own set of icons for the menu # using self.jabber_status_images is poopoo @@ -6034,34 +5640,6 @@ class RosterWindow: account, bookmark) gc_sub_menu.append(item) - def set_actions_menu_needs_rebuild(self): - self.actions_menu_needs_rebuild = True - # Just handle new_chat_menuitem to have ctrl+N working even if we don't - # open the menu - new_chat_menuitem = self.xml.get_object('new_chat_menuitem') - ag = Gtk.accel_groups_from_object(self.window)#[0] - - if self.new_chat_menuitem_handler_id: - new_chat_menuitem.handler_disconnect( - self.new_chat_menuitem_handler_id) - self.new_chat_menuitem_handler_id = None - - new_chat_menuitem.set_submenu(None) - - connected_accounts = gajim.get_number_of_connected_accounts() - if connected_accounts == 1 or (connected_accounts == 2 and \ - gajim.zeroconf_is_connected()): - # only one 'real' (non-zeroconf) account is connected, don't need - # submenus - accounts_list = sorted(gajim.contacts.get_accounts()) - for account in accounts_list: - if gajim.account_is_connected(account) and \ - not gajim.config.get_per('accounts', account, 'is_zeroconf'): - if not self.new_chat_menuitem_handler_id: - self.new_chat_menuitem_handler_id = new_chat_menuitem.\ - connect('activate', - self.on_new_chat_menuitem_activate, account) - def show_appropriate_context_menu(self, event, iters): # iters must be all of the same type model = self.modelfilter @@ -6172,6 +5750,36 @@ class RosterWindow: tooltip.populate(connected_contacts, account, typ) return True + 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(gajim.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( + gajim.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(gajim.config.get('show_transports_group'))) + action.connect("change-state", self.on_show_transports_action) + self.window.add_action(action) + ################################################################################ ### ################################################################################ @@ -6194,6 +5802,7 @@ class RosterWindow: self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') self.window = self.xml.get_object('roster_window') app.add_window(self.window) + self.add_actions() self.hpaned = self.xml.get_object('roster_hpaned') gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned) gajim.interface.msg_win_mgr.connect('window-delete', @@ -6225,7 +5834,6 @@ class RosterWindow: #FIXME: When list_accel_closures will be wrapped in pygtk # no need of this variable self.have_new_chat_accel = False # Is the "Ctrl+N" shown ? - self.set_actions_menu_needs_rebuild() self.regroup = gajim.config.get('mergeaccounts') self.clicked_path = None # Used remember on wich row we clicked if len(gajim.connections) < 2: @@ -6316,24 +5924,15 @@ class RosterWindow: # selected item and not stay with that item selected self.previous_status_combobox_active = number_of_menuitem - showOffline = gajim.config.get('showoffline') - showOnlyChatAndOnline = gajim.config.get('show_only_chat_and_online') - - w = self.xml.get_object('show_offline_contacts_menuitem') - w.set_active(showOffline) - if showOnlyChatAndOnline: - w.set_sensitive(False) - - w = self.xml.get_object('show_only_active_contacts_menuitem') - w.set_active(showOnlyChatAndOnline) - if showOffline: - w.set_sensitive(False) + # Enable/Disable checkboxes at start + if gajim.config.get('showoffline'): + self.window.lookup_action('show-active').set_enabled(False) - show_transports_group = gajim.config.get('show_transports_group') - self.xml.get_object('show_transports_menuitem').set_active( - show_transports_group) + if gajim.config.get('show_only_chat_and_online'): + self.window.lookup_action('show-offline').set_enabled(False) - self.xml.get_object('show_roster_menuitem').set_active(True) + if self.hpaned.get_child2() is None: + self.window.lookup_action('show-roster').set_enabled(False) # columns col = Gtk.TreeViewColumn() @@ -6462,11 +6061,6 @@ class RosterWindow: accel_group.connect(Gdk.KEY_j, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.MASK, self.on_ctrl_j) - # Setting CTRL+N to be the shortcut for show Start chat dialog - new_chat_menuitem = self.xml.get_object('new_chat_menuitem') - new_chat_menuitem.add_accelerator('activate', accel_group, - Gdk.KEY_n, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE) - # Setting CTRL+S to be the shortcut to change status message accel_group = Gtk.AccelGroup() keyval, mod = Gtk.accelerator_parse('<Control>s') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1b2324ca978db4218cf9dd9dfcde9adcc…

1 0

[Git][gajim/gajim][master] 4 commits: Dont try to select iter if there is none
by Philipp Hörist 12 Feb '17

12 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: d24bed12 by Philipp Hörist at 2017-02-12T19:09:48+01:00 Dont try to select iter if there is none - - - - - 50514393 by Philipp Hörist at 2017-02-12T19:09:48+01:00 Fix key error on removing account - - - - - 09f54f97 by Philipp Hörist at 2017-02-12T19:09:49+01:00 Use platform identifier with better granularity Fixes #8542 - - - - - 1b2324ca by Philipp Hörist at 2017-02-12T19:10:55+01:00 Merge branch 'small-fixes' into 'master' Small fixes Closes #8542 See merge request !58 - - - - - 3 changed files: - src/common/helpers.py - src/config.py - src/roster_window.py Changes: ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -746,13 +746,13 @@ def play_sound_file(path_to_soundfile): path_to_soundfile = check_soundfile_path(path_to_soundfile) if path_to_soundfile is None: return - elif os.name == 'nt' and HAS_WINSOUND: + elif sys.platform == 'win32' and HAS_WINSOUND: try: winsound.PlaySound(path_to_soundfile, winsound.SND_FILENAME|winsound.SND_ASYNC) except Exception: log.exception('Sound Playback Error') - elif os.name == 'posix': + elif sys.platform == 'linux': if gajim.config.get('soundplayer') == '': def _oss_play(): sndfile = wave.open(path_to_soundfile, 'rb') ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -3254,7 +3254,9 @@ class ManageBookmarksWindow: self.xml.connect_signals(self) self.window.show_all() # select root iter - self.selection.select_iter(self.treestore.get_iter_first()) + first_iter = self.treestore.get_iter_first() + if first_iter: + self.selection.select_iter(first_iter) def on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1558,6 +1558,8 @@ class RosterWindow: """ if not self.tree.get_model(): return + if account not in gajim.connections: + return delimiter = gajim.connections[account].nested_group_delimiter group_splited = group.split(delimiter) i = 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/eec1a69efd90620686cbeac52f37decc4…

1 0

[Git][gajim/gajim][master] 3 commits: Remove old gtk2 code
by Philipp Hörist 12 Feb '17

12 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: aaef09fc by Philipp Hörist at 2017-02-12T16:45:56+01:00 Remove old gtk2 code - - - - - 2a599d1e by Philipp Hörist at 2017-02-12T16:45:56+01:00 Fix constants usage in history manager - - - - - eec1a69e by Philipp Hörist at 2017-02-12T16:50:28+01:00 Merge branch 'history-manager' into 'master' History manager fixes See merge request !57 - - - - - 1 changed file: - src/history_manager.py Changes: ===================================== src/history_manager.py ===================================== --- a/src/history_manager.py +++ b/src/history_manager.py @@ -29,24 +29,6 @@ ## the same can be said for history_window.py import os - -if os.name == 'nt': - import warnings - warnings.filterwarnings(action='ignore') - - if os.path.isdir('gtk'): - # Used to create windows installer with GTK included - paths = os.environ['PATH'] - list_ = paths.split(';') - new_list = [] - for p in list_: - if p.find('gtk') < 0 and p.find('GTK') < 0: - new_list.append(p) - new_list.insert(0, 'gtk/lib') - new_list.insert(0, 'gtk/bin') - os.environ['PATH'] = ';'.join(new_list) - os.environ['GTK_BASEPATH'] = 'gtk' - import sys import signal import gi @@ -91,11 +73,7 @@ common.configpaths.gajimpaths.init(config_path) del config_path from common import gajim import gtkgui_helpers -from common.logger import LOG_DB_PATH, constants - -#FIXME: constants should implement 2 way mappings -status = dict((constants.__dict__[i], i[5:].lower()) for i in \ - constants.__dict__.keys() if i.startswith('SHOW_')) +from common.logger import LOG_DB_PATH, JIDConstant, KindConstant from common import helpers import dialogs @@ -342,7 +320,7 @@ class HistoryManager: possible_room_jid = jid.split('/', 1)[0] self.cur.execute('SELECT jid_id FROM jids WHERE jid = ? AND type = ?', - (possible_room_jid, constants.JID_ROOM_TYPE)) + (possible_room_jid, JIDConstant.ROOM_TYPE)) row = self.cur.fetchone() if row is None: return False @@ -357,7 +335,7 @@ class HistoryManager: row = self.cur.fetchone() if row is None: raise - elif row[0] == constants.JID_ROOM_TYPE: + elif row[0] == JIDConstant.ROOM_TYPE: return True else: # normal type return False @@ -399,15 +377,15 @@ class HistoryManager: pass else: color = None - if kind in (constants.KIND_SINGLE_MSG_RECV, - constants.KIND_CHAT_MSG_RECV, constants.KIND_GC_MSG): + if kind in (KindConstant.SINGLE_MSG_RECV, + KindConstant.CHAT_MSG_RECV, KindConstant.GC_MSG): # it is the other side color = gajim.config.get('inmsgcolor') # so incoming color - elif kind in (constants.KIND_SINGLE_MSG_SENT, - constants.KIND_CHAT_MSG_SENT): # it is us + elif kind in (KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_SENT): # it is us color = gajim.config.get('outmsgcolor') # so outgoing color - elif kind in (constants.KIND_STATUS, - constants.KIND_GCSTATUS): # is is statuses + elif kind in (KindConstant.STATUS, + KindConstant.GCSTATUS): # is is statuses # so status color color = gajim.config.get('statusmsgcolor') # include status into (status) message @@ -540,13 +518,13 @@ class HistoryManager: # in store: time, kind, message, contact_name FROM logs # in text: JID or You or nickname (if it's gc_msg), time, message time_, kind, message, nickname = row - if kind in (constants.KIND_SINGLE_MSG_RECV, - constants.KIND_CHAT_MSG_RECV): + if kind in (KindConstant.SINGLE_MSG_RECV, + KindConstant.CHAT_MSG_RECV): who = self._get_jid_from_jid_id(jid_id) - elif kind in (constants.KIND_SINGLE_MSG_SENT, - constants.KIND_CHAT_MSG_SENT): + elif kind in (KindConstant.SINGLE_MSG_SENT, + KindConstant.CHAT_MSG_SENT): who = _('You') - elif kind == constants.KIND_GC_MSG: + elif kind == KindConstant.GC_MSG: who = nickname else: # status or gc_status. do not save #print kind View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7814f07bd3fae75d76e29bd1229d6a49b…

1 0

[Git][gajim/gajim][master] 10 commits: Handle some commandline options only locally
by Philipp Hörist 11 Feb '17

11 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 819bee12 by Philipp Hörist at 2017-02-11T18:08:52+01:00 Handle some commandline options only locally - - - - - e30527f8 by Philipp Hörist at 2017-02-11T19:38:45+01:00 Move Gajim startup code into do_startup - - - - - f9269d5c by Philipp Hörist at 2017-02-11T21:07:11+01:00 Save log file into config dir when frozen - - - - - 4bf65a40 by Philipp Hörist at 2017-02-11T21:09:31+01:00 Handle version option in Gtk.Application - - - - - 2ea30b3d by Philipp Hörist at 2017-02-11T21:18:10+01:00 Move nbxmpp import test into do_startup - - - - - 5215641c by Philipp Hörist at 2017-02-11T21:25:43+01:00 Move GajimApplication into gajim.py - - - - - 271af708 by Philipp Hörist at 2017-02-11T21:32:13+01:00 Update Authors - - - - - 5789c8a8 by Philipp Hörist at 2017-02-11T23:31:06+01:00 Start Interface after remote cmdline handling Because otherwise we would lose log information from Interface, because logging levels are set after startup - - - - - 33c9a1c5 by Philipp Hörist at 2017-02-11T23:40:42+01:00 Simplify module import - - - - - 7814f07b by Philipp Hörist at 2017-02-11T23:44:19+01:00 Merge branch 'master' into 'master' Refactor Gajim startup See merge request !56 - - - - - 2 changed files: - − src/application.py - src/gajim.py Changes: ===================================== src/application.py deleted ===================================== --- a/src/application.py +++ /dev/null @@ -1,249 +0,0 @@ -# -*- coding:utf-8 -*- -## src/application.py -## -## Copyright (C) 2016 Emmanuel Gil Peyrot <linkmauve AT linkmauve.fr> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import sys -import os -import logging -import signal -import locale -from gi.repository import GLib, Gio, Gtk -from common import i18n -from common import logging_helpers -from common import crypto -try: - PYOPENSSL_PRNG_PRESENT = True - import OpenSSL.rand -except ImportError: - print('PyOpenSSL not available, impossible to generate entropy', file=sys.stderr) - PYOPENSSL_PRNG_PRESENT = False - -logging_helpers.init(sys.stderr.isatty()) -log = logging.getLogger('gajim.gajim') - - -class GajimApplication(Gtk.Application): - '''Main class handling activation and command line.''' - - def __init__(self): - Gtk.Application.__init__(self, application_id='org.gajim.Gajim', - flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE) - self.add_main_option('version', ord('V'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show the application\'s version')) - self.add_main_option('quiet', ord('q'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show only critical errors')) - self.add_main_option('separate', ord('s'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Separate profile files completely (even ' - 'history db and plugins)')) - self.add_main_option('verbose', ord('v'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Print XML stanzas and other debug ' - 'information')) - self.add_main_option('windev', ord('w'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Print stdout/stderr to the console ' - 'on Windows')) - self.add_main_option('profile', ord('p'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Use defined profile in configuration ' - 'directory'), 'NAME') - self.add_main_option('config-path', ord('c'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Set configuration directory'), 'PATH') - self.add_main_option('loglevel', ord('l'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Configure logging system'), 'LEVEL') - - self.profile = '' - self.config_path = None - self.profile_separation = False - self.interface = None - self.rng_seed = None - - GLib.set_prgname('gajim') - GLib.set_application_name('Gajim') - - def do_startup(self): - Gtk.Application.do_startup(self) - - def do_activate(self): - # If a second instance starts do_activate() is called - # We bringt the Roster window to the front, GTK exits afterwards. - if self.interface: - self.interface.roster.window.present() - return - - Gtk.Application.do_activate(self) - - import gtkexcepthook - gtkexcepthook.init() - - # Create and initialize Application Paths & Databases - import common.configpaths - common.configpaths.gajimpaths.init( - self.config_path, self.profile, self.profile_separation) - from common import gajim - from common import check_paths - from common import exceptions - from common import logger - from common import caps_cache - try: - gajim.logger = logger.Logger() - caps_cache.initialize(gajim.logger) - check_paths.check_and_possibly_create_paths() - except exceptions.DatabaseMalformed: - dlg = Gtk.MessageDialog( - None, - Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL, - Gtk.MessageType.ERROR, - Gtk.ButtonsType.OK, - _('Database Error')) - dlg.format_secondary_text( - _('The database file (%s) cannot be read. Try to repair it ' - '(see http://trac.gajim.org/wiki/DatabaseBackup) or remove it ' - '(all history will be lost).') % gajim.gajimpaths['LOG_DB']) - dlg.run() - dlg.destroy() - sys.exit() - - if os.name == 'nt': - import gettext - # needed for docutils - sys.path.append('.') - APP = 'gajim' - DIR = '../po' - lang, enc = locale.getdefaultlocale() - os.environ['LANG'] = lang - gettext.bindtextdomain(APP, DIR) - gettext.textdomain(APP) - gettext.install(APP, DIR) - - # This is for Windows translation which is currently not - # working on GTK 3.18.9 - # locale.setlocale(locale.LC_ALL, '') - # import ctypes - # import ctypes.util - # libintl_path = ctypes.util.find_library('intl') - # if libintl_path == None: - # local_intl = os.path.join('gtk', 'bin', 'intl.dll') - # if os.path.exists(local_intl): - # libintl_path = local_intl - # if libintl_path == None: - # raise ImportError('intl.dll library not found') - # libintl = ctypes.cdll.LoadLibrary(libintl_path) - # libintl.bindtextdomain(APP, DIR) - # libintl.bind_textdomain_codeset(APP, 'UTF-8') - # plugins_locale_dir = os.path.join(common.configpaths.gajimpaths[ - # 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) - # libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) - # libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8') - - if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: - i18n.direction_mark = '\u200F' - - from ctypes import CDLL - from ctypes.util import find_library - import platform - - sysname = platform.system() - if sysname in ('Linux', 'FreeBSD', 'OpenBSD', 'NetBSD'): - libc = CDLL(find_library('c')) - - # The constant defined in <linux/prctl.h> which is used to set the name - # of the process. - PR_SET_NAME = 15 - - if sysname == 'Linux': - libc.prctl(PR_SET_NAME, 'gajim') - elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): - libc.setproctitle('gajim') - - # Seed the OpenSSL pseudo random number generator from file and initialize - if PYOPENSSL_PRNG_PRESENT: - self.rng_seed = gajim.gajimpaths['RNG_SEED'] - # Seed from file - try: - OpenSSL.rand.load_file(self.rng_seed) - except TypeError: - OpenSSL.rand.load_file(self.rng_seed.encode('utf-8')) - crypto.add_entropy_sources_OpenSSL() - try: - OpenSSL.rand.write_file(self.rng_seed) - except TypeError: - OpenSSL.rand.write_file(self.rng_seed.encode('utf-8')) - - def sigint_cb(num, stack): - print('SIGINT/SIGTERM received') - self.quit() - # ^C exits the application normally - signal.signal(signal.SIGINT, sigint_cb) - signal.signal(signal.SIGTERM, sigint_cb) - - log.info("Encodings: d:%s, fs:%s, p:%s", sys.getdefaultencoding(), - sys.getfilesystemencoding(), locale.getpreferredencoding()) - - from gui_interface import Interface - self.interface = Interface() - self.interface.run(self) - - def do_shutdown(self, *args): - Gtk.Application.do_shutdown(self) - # Save the entropy from OpenSSL PRNG - if PYOPENSSL_PRNG_PRESENT and self.rng_seed: - try: - OpenSSL.rand.write_file(self.rng_seed) - except TypeError: - OpenSSL.rand.write_file(self.rng_seed.encode('utf-8')) - # Shutdown GUI and save config - if hasattr(self.interface, 'roster') and self.interface.roster: - self.interface.roster.prepare_quit() - - def do_handle_local_options(self, options: GLib.VariantDict) -> int: - if options.contains('profile'): - # Incorporate profile name into application id - # to have a single app instance for each profile. - profile = options.lookup_value('profile').get_string() - app_id = '%s.%s' % (self.get_application_id(), profile) - self.set_application_id(app_id) - return -1 - - def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: - Gtk.Application.do_command_line(self, command_line) - options = command_line.get_options_dict() - if options.contains('quiet'): - logging_helpers.set_quiet() - if options.contains('separate'): - self.profile_separation = True - if options.contains('verbose'): - logging_helpers.set_verbose() - if options.contains('profile'): - variant = options.lookup_value('profile') - self.profile = variant.get_string() - if options.contains('loglevel'): - variant = options.lookup_value('loglevel') - string = variant.get_string() - logging_helpers.set_loglevels(string) - if options.contains('config-path'): - variant = options.lookup_value('config-path') - self.config_path = variant.get_string() - self.activate() - return 0 ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/gajim.py ## -## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2017 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> ## Norman Rasmussen <norman AT rasmussen.co.za> @@ -19,6 +19,8 @@ ## Julien Pivotto <roidelapluie AT gmail.com> ## Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Copyright (C) 2016-2017 Emmanuel Gil Peyrot <linkmauve AT linkmauve.fr> +## Philipp Hörist <philipp AT hoerist.com> ## ## This file is part of Gajim. ## @@ -37,52 +39,9 @@ import sys import os - -if '--version' in sys.argv or '-V' in sys.argv: - from common.defs import version - print(version) - sys.exit(0) - -WINDEV = False -if '--windev' in sys.argv or '-w' in sys.argv: - WINDEV = True - -if os.name == 'nt' and not WINDEV: - import warnings - log_path = os.path.join(os.environ['APPDATA'], 'Gajim') - if not os.path.exists(log_path): - os.mkdir(log_path, 0o700) - log_file = os.path.join(log_path, 'gajim.log') - - class MyStd(object): - _file = None - _error = None - - def write(self, text): - if self._file is None and self._error is None: - try: - self._file = open(log_file, 'a') - except Exception as details: - self._error = details - if self._file is not None: - self._file.write(text) - self._file.flush() - - def flush(self): - if self._file is not None: - self._file.flush() - - def isatty(self): - return False - - outerr = MyStd() - sys.stdout = outerr - sys.stderr = outerr - warnings.filterwarnings(action='ignore') - - -# Test here for all required versions so we dont have to -# test multiple times in every module. nbxmpp also needs GLib. +import logging +import signal +import locale import gi gi.require_version('GLib', '2.0') gi.require_version('Gio', '2.0') @@ -90,21 +49,272 @@ gi.require_version('Gtk', '3.0') gi.require_version('Gdk', '3.0') gi.require_version('GObject', '2.0') gi.require_version('Pango', '1.0') +from gi.repository import GLib, Gio, Gtk +from common import i18n +from common import logging_helpers +from common import crypto +try: + PYOPENSSL_PRNG_PRESENT = True + import OpenSSL.rand +except ImportError: + print('PyOpenSSL not available, impossible to generate entropy', file=sys.stderr) + PYOPENSSL_PRNG_PRESENT = False + +logging_helpers.init(sys.stderr.isatty()) +log = logging.getLogger('gajim.gajim') MIN_NBXMPP_VER = "0.5.3" -try: - import nbxmpp -except ImportError: - print('Gajim needs python-nbxmpp to run. Quiting…') - sys.exit(1) -from distutils.version import LooseVersion as V -if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): - print('Gajim needs python-nbxmpp >= %s to run. Quiting…' % MIN_NBXMPP_VER) - sys.exit(1) +class GajimApplication(Gtk.Application): + '''Main class handling activation and command line.''' + + def __init__(self): + Gtk.Application.__init__(self, application_id='org.gajim.Gajim', + flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE) + + self.add_main_option('version', ord('V'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show the application\'s version')) + self.add_main_option('quiet', ord('q'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show only critical errors')) + self.add_main_option('separate', ord('s'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Separate profile files completely (even ' + 'history db and plugins)')) + self.add_main_option('verbose', ord('v'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Print XML stanzas and other debug ' + 'information')) + self.add_main_option('profile', ord('p'), GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Use defined profile in configuration ' + 'directory'), 'NAME') + self.add_main_option('config-path', ord('c'), GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Set configuration directory'), 'PATH') + self.add_main_option('loglevel', ord('l'), GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Configure logging system'), 'LEVEL') + + self.profile = '' + self.config_path = None + self.profile_separation = False + self.interface = None + self.rng_seed = None + + GLib.set_prgname('gajim') + GLib.set_application_name('Gajim') + + def do_startup(self): + Gtk.Application.do_startup(self) + + import gtkexcepthook + gtkexcepthook.init() + + try: + import nbxmpp + except ImportError: + print('Gajim needs python-nbxmpp to run. Quitting…') + sys.exit(1) + + from distutils.version import LooseVersion as V + if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): + print('Gajim needs python-nbxmpp >= %s to run. ' + 'Quitting…' % MIN_NBXMPP_VER) + sys.exit(1) + + # Create and initialize Application Paths & Databases + from common import configpaths + configpaths.gajimpaths.init( + self.config_path, self.profile, self.profile_separation) + + if hasattr(sys, 'frozen'): + self.frozen_logging(configpaths.gajimpaths.config_root) + + from common import gajim + from common import check_paths + from common import exceptions + from common import logger + from common import caps_cache + try: + gajim.logger = logger.Logger() + caps_cache.initialize(gajim.logger) + check_paths.check_and_possibly_create_paths() + except exceptions.DatabaseMalformed: + dlg = Gtk.MessageDialog( + None, + Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL, + Gtk.MessageType.ERROR, + Gtk.ButtonsType.OK, + _('Database Error')) + dlg.format_secondary_text( + _('The database file (%s) cannot be read. Try to repair it ' + '(see http://trac.gajim.org/wiki/DatabaseBackup) or remove it ' + '(all history will be lost).') % gajim.gajimpaths['LOG_DB']) + dlg.run() + dlg.destroy() + sys.exit() + + if os.name == 'nt': + import gettext + # needed for docutils + sys.path.append('.') + APP = 'gajim' + DIR = '../po' + lang, enc = locale.getdefaultlocale() + os.environ['LANG'] = lang + gettext.bindtextdomain(APP, DIR) + gettext.textdomain(APP) + gettext.install(APP, DIR) + + # This is for Windows translation which is currently not + # working on GTK 3.18.9 + # locale.setlocale(locale.LC_ALL, '') + # import ctypes + # import ctypes.util + # libintl_path = ctypes.util.find_library('intl') + # if libintl_path == None: + # local_intl = os.path.join('gtk', 'bin', 'intl.dll') + # if os.path.exists(local_intl): + # libintl_path = local_intl + # if libintl_path == None: + # raise ImportError('intl.dll library not found') + # libintl = ctypes.cdll.LoadLibrary(libintl_path) + # libintl.bindtextdomain(APP, DIR) + # libintl.bind_textdomain_codeset(APP, 'UTF-8') + # plugins_locale_dir = os.path.join(common.configpaths.gajimpaths[ + # 'PLUGINS_USER'], 'locale').encode(locale.getpreferredencoding()) + # libintl.bindtextdomain('gajim_plugins', plugins_locale_dir) + # libintl.bind_textdomain_codeset('gajim_plugins', 'UTF-8') + + if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: + i18n.direction_mark = '\u200F' + + from ctypes import CDLL + from ctypes.util import find_library + import platform + + sysname = platform.system() + if sysname in ('Linux', 'FreeBSD', 'OpenBSD', 'NetBSD'): + libc = CDLL(find_library('c')) + + # The constant defined in <linux/prctl.h> which is used to set the name + # of the process. + PR_SET_NAME = 15 + + if sysname == 'Linux': + libc.prctl(PR_SET_NAME, 'gajim') + elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): + libc.setproctitle('gajim') + + # Seed the OpenSSL pseudo random number generator from file and initialize + if PYOPENSSL_PRNG_PRESENT: + self.rng_seed = gajim.gajimpaths['RNG_SEED'] + # Seed from file + try: + OpenSSL.rand.load_file(self.rng_seed) + except TypeError: + OpenSSL.rand.load_file(self.rng_seed.encode('utf-8')) + crypto.add_entropy_sources_OpenSSL() + try: + OpenSSL.rand.write_file(self.rng_seed) + except TypeError: + OpenSSL.rand.write_file(self.rng_seed.encode('utf-8')) + + def sigint_cb(num, stack): + print('SIGINT/SIGTERM received') + self.quit() + # ^C exits the application normally + signal.signal(signal.SIGINT, sigint_cb) + signal.signal(signal.SIGTERM, sigint_cb) + + print("Encodings: d:{}, fs:{}, p:{}".format(sys.getdefaultencoding(), + sys.getfilesystemencoding(), locale.getpreferredencoding())) + + def do_activate(self): + Gtk.Application.do_activate(self) + from gui_interface import Interface + self.interface = Interface() + self.interface.run(self) + + def do_shutdown(self, *args): + Gtk.Application.do_shutdown(self) + # Save the entropy from OpenSSL PRNG + if PYOPENSSL_PRNG_PRESENT and self.rng_seed: + try: + OpenSSL.rand.write_file(self.rng_seed) + except TypeError: + OpenSSL.rand.write_file(self.rng_seed.encode('utf-8')) + # Shutdown GUI and save config + if hasattr(self.interface, 'roster') and self.interface.roster: + self.interface.roster.prepare_quit() + + def do_handle_local_options(self, options: GLib.VariantDict) -> int: + if options.contains('profile'): + # Incorporate profile name into application id + # to have a single app instance for each profile. + profile = options.lookup_value('profile').get_string() + app_id = '%s.%s' % (self.get_application_id(), profile) + self.set_application_id(app_id) + self.profile = profile + if options.contains('separate'): + self.profile_separation = True + if options.contains('config-path'): + self.config_path = options.lookup_value('config-path').get_string() + if options.contains('version'): + from common.defs import version + print(version) + return 0 + return -1 + + def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: + Gtk.Application.do_command_line(self, command_line) + options = command_line.get_options_dict() + if options.contains('quiet'): + logging_helpers.set_quiet() + if options.contains('verbose'): + logging_helpers.set_verbose() + if options.contains('loglevel'): + string = options.lookup_value('loglevel').get_string() + logging_helpers.set_loglevels(string) + if not command_line.get_is_remote(): + self.activate() + return 0 + + def frozen_logging(self, path): + import warnings + if not os.path.exists(path): + os.mkdir(path, 0o700) + + class MyStd(object): + _file = None + _error = None + log_file = os.path.join(path, 'gajim.log') + + def write(self, text): + if self._file is None and self._error is None: + try: + self._file = open(self.log_file, 'a') + except Exception as details: + self._error = details + if self._file is not None: + self._file.write(text) + self._file.flush() + + def flush(self): + if self._file is not None: + self._file.flush() + + def isatty(self): + return False + + outerr = MyStd() + sys.stdout = outerr + sys.stderr = outerr + warnings.filterwarnings(action='ignore') -from application import GajimApplication app = GajimApplication() app.run(sys.argv) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c8e03993fe71268b48bdd7b4fdcb7476a…

1 0

[Git][gajim/gajim][master] 2 commits: Use more gender neutral language
by Yann Leboulanger 11 Feb '17

11 Feb '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: f5eb35cb by Johannes 'josch' Schauer at 2017-02-11T20:05:30+01:00 Use more gender neutral language - - - - - c8e03993 by Yann Leboulanger at 2017-02-11T21:16:26+01:00 Merge branch 'master' into 'master' Use more gender neutral language See merge request !55 - - - - - 3 changed files: - src/chat_control.py - src/gui_interface.py - src/roster_window.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -429,7 +429,7 @@ class ChatControl(ChatControlBase): else: self._send_file_button.set_tooltip_text( _("You need to know the real JID of the contact to send " - "him or her a file.")) + "them a file.")) # Convert to GC if gajim.config.get_per('accounts', self.account, 'is_zeroconf'): ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -520,8 +520,8 @@ class Interface: list_ = [(contact, account)] dialogs.YesNoDialog( _('Contact "%s" removed subscription from you') % contact.jid, - _('You will always see him or her as offline.\nDo you want to ' - 'remove him or her from your contact list?'), + _('You will always see them as offline.\nDo you want to ' + 'remove them from your contact list?'), on_response_yes=(on_yes, list_)) # FIXME: Per RFC 3921, we can "deny" ack as well, but the GUI does # not show deny ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -3575,7 +3575,7 @@ class RosterWindow: if contact.sub == 'to': dialogs.ConfirmationDialog(pritext, sectext + \ _('By removing this contact you also remove authorization ' - 'resulting in him or her always seeing you as offline.'), + 'resulting in them always seeing you as offline.'), on_response_ok=(on_ok2, list_)) elif _('Not in Roster') in contact.get_shown_groups(): # Contact is not in roster @@ -3585,7 +3585,7 @@ class RosterWindow: else: dialogs.ConfirmationDialogCheck(pritext, sectext + \ _('By removing this contact you also by default remove ' - 'authorization resulting in him or her always seeing you as' + 'authorization resulting in them always seeing you as' ' offline.'), _('I want this contact to know my status after removal'), on_response_ok=(on_ok, list_)) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/26aa0382d31e4264157b6665ae6cf7ebb…

1 0

[Git][gajim/gajim][master] 17 commits: Autogenerate a pylint configuration file.
by Philipp Hörist 11 Feb '17

11 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8c928c2 by Emmanuel Gil Peyrot at 2017-02-07T21:00:31+00:00 Autogenerate a pylint configuration file. - - - - - e2901f09 by Emmanuel Gil Peyrot at 2017-02-07T21:00:43+00:00 pylint: Tweak the configuration file a bit. - - - - - 51eb62bb by Emmanuel Gil Peyrot at 2017-02-07T21:00:52+00:00 Replace some wildcard imports with explicit ones. - - - - - 07716dae by Emmanuel Gil Peyrot at 2017-02-08T02:26:20+00:00 Use staticmethod decorator where it makes sense. - - - - - 289d82fa by Emmanuel Gil Peyrot at 2017-02-08T02:26:20+00:00 Remove unused imports. - - - - - 5f91455f by Emmanuel Gil Peyrot at 2017-02-08T02:26:20+00:00 common.dh: Reformat to follow PEP-0008. - - - - - fb221a69 by Emmanuel Gil Peyrot at 2017-02-08T02:26:21+00:00 Remove wrong usage of the list(range(…)) pattern. - - - - - b6b1a7a0 by Emmanuel Gil Peyrot at 2017-02-08T02:26:21+00:00 ACE: Remove unused constants. - - - - - 2fbadc91 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Use Enum or IntEnum instead of range() constants. - - - - - a7349dc6 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 common.connection: Fix indentation. - - - - - 381a8f2b by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Remove unnecessary semicolons. - - - - - 1f9ac730 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Replace long() in remaining python2 code with int(). - - - - - 57fb80f1 by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Remove every default argument using [] or {}. - - - - - ad9370af by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Fix a bunch of issues in common.jingle*. - - - - - eb51184a by Emmanuel Gil Peyrot at 2017-02-11T02:40:07+00:00 Fix a few things in common.connection_handlers_events. - - - - - a4387e84 by Emmanuel Gil Peyrot at 2017-02-11T02:40:10+00:00 Use “… is not …” everywhere instead of “not … is …”. - - - - - 26aa0382 by Philipp Hörist at 2017-02-11T17:54:19+01:00 Merge branch 'pylint' into 'master' Add a pylint configuration file and fix a few of the issues found See merge request !54 - - - - - 26 changed files: - + pylintrc - src/advanced_configuration_window.py - src/atom_window.py - src/chat_control.py - src/chat_control_base.py - src/command_system/framework.py - src/command_system/implementation/custom.py - src/command_system/implementation/execute.py - src/command_system/implementation/standard.py - src/command_system/tools.py - src/common/caps_cache.py - src/common/config.py - src/common/configpaths.py - src/common/connection.py - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/common/contacts.py - src/common/dh.py - src/common/events.py - src/common/gajim.py - src/common/helpers.py - src/common/jingle.py - src/common/jingle_content.py - src/common/jingle_ft.py - src/common/jingle_ftstates.py - src/common/jingle_rtp.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d6ceca834420345f14c09cba9250aa3a3…

1 0

[Git][gajim/gajim][master] 8 commits: Close Feature Window with ESC
by Philipp Hörist 09 Feb '17

09 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05566a63 by Philipp Hörist at 2017-02-06T22:28:07+01:00 Close Feature Window with ESC - - - - - 91bb0183 by Philipp Hörist at 2017-02-06T23:05:49+01:00 Close Bookmark Window with ESC - - - - - 9b0d7222 by Philipp Hörist at 2017-02-06T23:05:57+01:00 Close Service Discovery Window with ESC - - - - - 5dff9bb0 by Philipp Hörist at 2017-02-06T23:10:09+01:00 Close Archiving Preferences Window with ESC - - - - - ad936b8d by Philipp Hörist at 2017-02-06T23:12:31+01:00 Close XML Console Window with ESC - - - - - fa542371 by Philipp Hörist at 2017-02-06T23:19:07+01:00 Close Privacy Lists Window with ESC - - - - - 1ad087e5 by Philipp Hörist at 2017-02-06T23:21:04+01:00 Close Plugins Window with ESC - - - - - d6ceca83 by Philipp Hörist at 2017-02-09T20:19:20+01:00 Merge branch 'keypress' into 'master' Close Windows with ESC Key See merge request !53 - - - - - 13 changed files: - data/gui/archiving_313_preferences_window.ui - data/gui/features_window.ui - data/gui/manage_bookmarks_window.ui - data/gui/plugins_window.ui - data/gui/privacy_list_window.ui - data/gui/privacy_lists_window.ui - data/gui/service_discovery_window.ui - data/gui/xml_console_window.ui - src/config.py - src/dialogs.py - src/disco.py - src/features_window.py - src/plugins/gui.py Changes: ===================================== data/gui/archiving_313_preferences_window.ui ===================================== --- a/data/gui/archiving_313_preferences_window.ui +++ b/data/gui/archiving_313_preferences_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="add_image"> @@ -43,6 +43,7 @@ <property name="window_position">center</property> <property name="default_width">450</property> <signal name="destroy" handler="on_archiving_preferences_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkGrid" id="pref_grid"> <property name="visible">True</property> ===================================== data/gui/features_window.ui ===================================== --- a/data/gui/features_window.ui +++ b/data/gui/features_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkWindow" id="features_window"> @@ -10,6 +10,7 @@ <property name="default_width">300</property> <property name="default_height">530</property> <property name="type_hint">dialog</property> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -22,9 +23,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">0</property> <property name="label" translatable="yes"><b>List of possible features in Gajim:</b></property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -98,9 +99,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">12</property> - <property name="xalign">0</property> <property name="wrap">True</property> <property name="selectable">True</property> + <property name="xalign">0</property> </object> </child> <child type="label"> ===================================== data/gui/manage_bookmarks_window.ui ===================================== --- a/data/gui/manage_bookmarks_window.ui +++ b/data/gui/manage_bookmarks_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkListStore" id="liststore1"> @@ -15,6 +15,7 @@ <property name="default_width">550</property> <property name="default_height">300</property> <property name="type_hint">dialog</property> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox86"> <property name="visible">True</property> @@ -116,9 +117,9 @@ <object class="GtkLabel" id="label325"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Title:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -129,9 +130,9 @@ <object class="GtkLabel" id="label315"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Nickname:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -142,9 +143,9 @@ <object class="GtkLabel" id="label316"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Roo_m:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -155,9 +156,9 @@ <object class="GtkLabel" id="label317"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Server:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -168,9 +169,9 @@ <object class="GtkLabel" id="label318"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -231,9 +232,9 @@ <object class="GtkLabel" id="label326"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Pr_int status:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> ===================================== data/gui/plugins_window.ui ===================================== --- a/data/gui/plugins_window.ui +++ b/data/gui/plugins_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image1"> @@ -27,6 +27,7 @@ <property name="default_height">500</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_plugins_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -218,9 +219,9 @@ <object class="GtkLinkButton" id="plugin_homepage_linkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <property name="xalign">0</property> </object> <packing> ===================================== data/gui/privacy_list_window.ui ===================================== --- a/data/gui/privacy_list_window.ui +++ b/data/gui/privacy_list_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAdjustment" id="adjustment1"> @@ -47,6 +47,7 @@ <property name="title" translatable="yes">Privacy List</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_privacy_list_edit_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="main_vbox"> <property name="visible">True</property> ===================================== data/gui/privacy_lists_window.ui ===================================== --- a/data/gui/privacy_lists_window.ui +++ b/data/gui/privacy_lists_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkListStore" id="liststore1"> @@ -15,6 +15,7 @@ <property name="title" translatable="yes">window1</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_privacy_lists_first_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -30,8 +31,8 @@ <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">Privacy Lists:</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> ===================================== data/gui/service_discovery_window.ui ===================================== --- a/data/gui/service_discovery_window.ui +++ b/data/gui/service_discovery_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image1"> @@ -15,6 +15,7 @@ <property name="default_height">420</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_service_discovery_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox11"> <property name="visible">True</property> @@ -34,11 +35,11 @@ <object class="GtkLabel" id="banner_agent_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0.05000000074505806</property> <property name="ypad">6</property> <property name="label"><span weight="heavy" size="large">Agent name</span> Agent JID - node</property> <property name="use_markup">True</property> + <property name="xalign">0.05000000074505806</property> </object> <packing> <property name="expand">True</property> ===================================== data/gui/xml_console_window.ui ===================================== --- a/data/gui/xml_console_window.ui +++ b/data/gui/xml_console_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkImage" id="image1"> @@ -13,6 +13,7 @@ <property name="default_width">550</property> <property name="default_height">450</property> <signal name="destroy" handler="on_xml_console_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> <object class="GtkBox" id="vbox"> <property name="visible">True</property> ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -3256,6 +3256,10 @@ class ManageBookmarksWindow: # select root iter self.selection.select_iter(self.treestore.get_iter_first()) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_add_bookmark_button_clicked(self, widget): """ Add a new bookmark ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -3397,6 +3397,10 @@ class XMLConsoleWindow: self.xml.connect_signals(self) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_xml_console_window_destroy(self, widget): del gajim.interface.instances[self.account]['xml_console'] gajim.ged.remove_event_handler('stanza-received', ged.GUI1, @@ -4144,6 +4148,10 @@ class Archiving313PreferencesWindow: self.idle_id = GLib.timeout_add_seconds(3, self._nec_archiving_error) gajim.connections[self.account].request_archive_preferences() + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def set_widget_state(self, state): for widget in ('default_cb', 'save_button', 'add_button', 'remove_button'): @@ -4362,6 +4370,10 @@ class PrivacyListWindow: self.xml.connect_signals(self) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_privacy_list_edit_window_destroy(self, widget): key_name = 'privacy_list_%s' % self.privacy_list_name if key_name in gajim.interface.instances[self.account]: @@ -4676,6 +4688,10 @@ class PrivacyListsWindow: self.xml.connect_signals(self) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_privacy_lists_first_window_destroy(self, widget): if 'privacy_lists' in gajim.interface.instances[self.account]: del gajim.interface.instances[self.account]['privacy_lists'] ===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -603,6 +603,10 @@ _('Without a connection, you can not browse available services')) if self.browser: self.browser.account = value + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def accel_group_func(self, accel_group, acceleratable, keyval, modifier): if (modifier & Gdk.ModifierType.CONTROL_MASK) and (keyval == Gdk.KEY_r): self.reload() ===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -25,7 +25,7 @@ import os import gi -from gi.repository import Gtk +from gi.repository import Gtk, Gdk import gtkgui_helpers from common import gajim @@ -133,6 +133,10 @@ class FeaturesWindow: self.window.show_all() self.xml.get_object('close_button').grab_focus() + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() + def on_close_button_clicked(self, widget): self.window.destroy() ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -29,7 +29,7 @@ __all__ = ['PluginsWindow'] from gi.repository import Pango from gi.repository import Gtk from gi.repository import GdkPixbuf -from gi.repository import GLib +from gi.repository import GLib, Gdk import os import gtkgui_helpers @@ -116,6 +116,9 @@ class PluginsWindow(object): self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) + def on_key_press_event(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.window.destroy() def on_plugins_notebook_switch_page(self, widget, page, page_num): GLib.idle_add(self.xml.get_object('close_button').grab_focus) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/20c000415ce8d32c62de10c99d956d012…

1 0

[Git][gajim/gajim][master] Fix typo and remove unused import
by Philipp Hörist 06 Feb '17

06 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 20c00041 by Philipp Hörist at 2017-02-06T20:52:56+01:00 Fix typo and remove unused import - - - - - 1 changed file: - src/history_manager.py Changes: ===================================== src/history_manager.py ===================================== --- a/src/history_manager.py +++ b/src/history_manager.py @@ -55,7 +55,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib import time -import locale import getopt from common import i18n @@ -84,7 +83,7 @@ def parseOpts(): config_path = a return config_path -onfig_path = parseOpts() +config_path = parseOpts() del parseOpts import common.configpaths View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/20c000415ce8d32c62de10c99d956d0125…

1 0

[Git][gajim/python-nbxmpp][master] 5 commits: Implemented smacks 3 (xep revision 1.5), the location attribute is not implemented yet
by Yann Leboulanger 06 Feb '17

06 Feb '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 5876bdf3 by Thilo Molitor at 2016-12-31T21:00:03+01:00 Implemented smacks 3 (xep revision 1.5), the location attribute is not implemented yet - - - - - 34dccd23 by Thilo Molitor at 2017-02-05T23:36:11+01:00 Fix: request smacks ack AFTER sending out a stanza - - - - - 870b5a22 by Thilo Molitor at 2017-02-06T02:22:49+01:00 Add delay tag to message stanzas when replayed by smacks - - - - - bb4cb499 by Thilo Molitor at 2017-02-06T02:30:18+01:00 Corrected some typo (syntax error) - - - - - 5c2c0b22 by Yann Leboulanger at 2017-02-06T13:45:03+01:00 Merge branch 'smacks_rev_1.5' into 'master' Implemented smacks 3 (xep revision 1.5) See merge request !1 - - - - - 4 changed files: - nbxmpp/auth_nb.py - nbxmpp/dispatcher_nb.py - nbxmpp/protocol.py - nbxmpp/smacks.py Changes: ===================================== nbxmpp/auth_nb.py ===================================== --- a/nbxmpp/auth_nb.py +++ b/nbxmpp/auth_nb.py @@ -734,9 +734,9 @@ class NonBlockingBind(PlugIn): self._owner.User = jid.getNode() self._owner.Resource = jid.getResource() # Only negociate stream management after bounded - sm = self._owner._caller.sm if self.supports_sm: # starts negociation + sm = self._owner._caller.sm sm.supports_sm = True sm.set_owner(self._owner) sm.negociate() @@ -745,6 +745,7 @@ class NonBlockingBind(PlugIn): if hasattr(self, 'session') and self.session == -1: # Server don't want us to initialize a session log.info('No session required.') + self._owner._caller.sm.resend_queue() #resend old messages still in the smacks queue self.on_bound('ok') else: self._owner.SendAndWaitForResponse(Protocol('iq', typ='set', @@ -763,6 +764,7 @@ class NonBlockingBind(PlugIn): if isResultNode(resp): log.info('Successfully opened session.') self.session = 1 + self._owner._caller.sm.resend_queue() #resend old messages still in the smacks queue self.on_bound('ok') else: log.error('Session open failed.') ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -23,12 +23,13 @@ different handlers to different XMPP stanzas and namespaces from __future__ import unicode_literals from . import simplexml import sys +import time import locale import re import uuid from xml.parsers.expat import ExpatError from .plugin import PlugIn -from .protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, +from .protocol import (NS_DELAY2, NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) import logging @@ -387,7 +388,7 @@ class XMPPDispatcher(PlugIn): def UnregisterCycleHandler(self, handler): """ - Unregister handler that will is called on every Dispatcher.Process() call + Unregister handler that will be called on every Dispatcher.Process() call """ if handler in self._cycleHandlers: self._cycleHandlers.remove(handler) @@ -571,12 +572,21 @@ class XMPPDispatcher(PlugIn): # If no ID then it is a whitespace if self.sm and self.sm.enabled and ID: + # add timestamp to message stanza in queue + if stanza.getName() == 'message' and \ + (stanza.getType() == 'chat' or stanza.getType() == 'groupchat'): + our_jid = stanza.getAttr('from') + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(None)) + stanza.addChild('delay', namespace=NS_DELAY2, + attrs={'from': our_jid, 'stamp': timestamp}) self.sm.uqueue.append(stanza) self.sm.out_h += 1 - if len(self.sm.uqueue) > self.sm.max_queue: - self.sm.request_ack() self._owner.Connection.send(stanza, now) + + if self.sm and self.sm.enabled and ID and len(self.sm.uqueue) > self.sm.max_queue: + self.sm.request_ack() + return ID ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -169,7 +169,7 @@ NS_RECEIPTS = 'urn:xmpp:receipts' NS_PUBKEY_PUBKEY = 'urn:xmpp:pubkey:2' # XEP-0189 NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' -NS_STREAM_MGMT = 'urn:xmpp:sm:2' # XEP-198 +NS_STREAM_MGMT = 'urn:xmpp:sm:3' # XEP-198 NS_HASHES = 'urn:xmpp:hashes:1' # XEP-300 NS_HASHES_MD5 = 'urn:xmpp:hash-function-textual-names:md5' NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1' ===================================== nbxmpp/smacks.py ===================================== --- a/nbxmpp/smacks.py +++ b/nbxmpp/smacks.py @@ -22,7 +22,8 @@ class Smacks(object): self.session_id = None self.resumption = False # If server supports resume # Max number of stanzas in queue before making a request - self.max_queue = 5 + #be more agressive here (every message must be acked), this creates fewer message duplicates on failed resume) + self.max_queue = 0 self._owner = None self.resuming = False self.enabled = False # If SM is enabled @@ -47,6 +48,7 @@ class Smacks(object): def _neg_response(self, disp, stanza): r = stanza.getAttr('resume') + log.info("Session resumption: %s" % r) if r == 'true' or r == 'True' or r == '1': self.resumption = True self.session_id = stanza.getAttr('id') @@ -62,8 +64,8 @@ class Smacks(object): def negociate(self, resume=True): # Every time we attempt to negociate, we must erase all previous info # about any previous session + log.debug("Clearing smacks uqueue") self.uqueue = [] - self.old_uqueue = [] self.in_h = 0 self.out_h = 0 self.session_id = None @@ -73,12 +75,26 @@ class Smacks(object): stanza.buildEnable(resume) self._owner.Connection.send(stanza, now=True) + def resend_queue(self): + """ + Resends unsent stanzas when a new session is established. + This way there won't be any lost outgoing messages even on failed smacks resumes (but message duplicates are possible). + If your server supports revision 1.5 of smacks then even message duplicates are eliminated here :) + """ + if self.old_uqueue: + log.info('Session resumption failed, replaying %s stanzas anyways...' % len(self.old_uqueue)) + for i in self.old_uqueue: + self._owner.Dispatcher.send(i, False) #use this send so that our stanzas actually increment out_h + self.old_uqueue = [] + def resume_request(self): if not self.session_id: self.resuming = False log.error('Attempted to resume without a valid session id ') return - self.old_uqueue = self.uqueue #save old messages in an extra "queue" to avoid race conditions + #save old messages in an extra "queue" to avoid race conditions and to make it possible to replay stanzas even when resuming fails + #add messages here (instead of overwriting) so that repeated connection errors don't delete unacked stanzas (uqueue should be empty in this case anyways) + self.old_uqueue += self.uqueue self.uqueue = [] resume = Acks() resume.buildResume(self.in_h, self.session_id) @@ -124,6 +140,7 @@ class Smacks(object): number of stanzas received by the server. Resends stanzas not received by the server in the last session. """ + log.info("Session resumption succeeded") h = stanza.getAttr('h') if not h: log.error('Server did not send h attribute') @@ -137,7 +154,7 @@ class Smacks(object): elif len(self.old_uqueue) < diff: log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) else: - log.info('Removing %d already received stanzas from old outgoing queue (our h: %d, server h: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, diff)) + log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, diff)) while (len(self.old_uqueue) > diff): self.old_uqueue.pop(0) @@ -160,14 +177,33 @@ class Smacks(object): self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None) self.failed_resume = True + + h = stanza.getTag('item-not-found').getAttr('h') + log.info('Session resumption failed (item-not-found), server h: %s' % str(h)) + if not h: + return + #prepare old_queue to contain only unacked stanzas for later resend (which is happening after our session is established properly) + h = int(h) + diff = self.out_h - h + + if diff < 0: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) + self.old_uqueue = [] #that's weird, but we don't resend this stanzas if the server says we don't need to + elif len(self.old_uqueue) < diff: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) + else: + log.info('Removing %d already acked stanzas from old outgoing queue (our h: %d, server h: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, diff)) + while (len(self.old_uqueue) > diff): + self.old_uqueue.pop(0) return # Doesn't support resumption if stanza.getTag('feature-not-implemented'): + log.info('Session resumption failed (feature-not-implemented)') self.negociate(False) return if stanza.getTag('unexpected-request'): - self.enabled = False log.error('Gajim failed to negociate Stream Management') + self.enabled = False return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/ace6e018bb386132245743673…

1 0

[Git][gajim/gajim][master] 2 commits: Update strings for better english. Thanks to Allan Nordhøy for the suggestions
by Yann Leboulanger 04 Feb '17

04 Feb '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d3385722 by Yann Leboulanger at 2017-02-04T23:29:45+01:00 Update strings for better english. Thanks to Allan Nordhøy for the suggestions - - - - - a7c833f7 by Yann Leboulanger at 2017-02-04T23:31:33+01:00 Merge branch 'translations' into 'master' Update strings for better english. Thanks to Allan Nordhøy for the suggestions See merge request !51 - - - - - 30 changed files: - data/gajim-remote.1 - data/gajim.desktop.in.in - data/gui/accounts_window.ui - data/gui/history_window.ui - data/gui/preferences_window.ui - data/gui/roster_item_exchange_window.ui - plugins/dbus_plugin/plugin.py - src/application.py - src/chat_control.py - src/chat_control_base.py - src/command_system/mapping.py - src/common/config.py - src/common/connection.py - src/common/connection_handlers_events.py - src/common/helpers.py - src/config.py - src/conversation_textview.py - src/dataforms_widget.py - src/dialogs.py - src/features_window.py - src/filetransfers_window.py - src/gajim-remote.py - src/gajim.py - src/gajim_themes_window.py - src/groupchat_control.py - src/gtkgui_helpers.py - src/gui_interface.py - src/gui_menu_builder.py - src/history_manager.py - src/htmltextview.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7932cdf123115db2e790552372c0b805d…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2017