Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: StartChat: Remove unused strings
by Philipp Hörist 17 Jul '19

17 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a3b5628e by Philipp Hörist at 2019-07-17T19:14:32Z StartChat: Remove unused strings We dont show the column titles - - - - - 61080cab by Philipp Hörist at 2019-07-17T19:14:59Z Remove unused variable - - - - - 2 changed files: - gajim/data/gui/start_chat_dialog.ui - gajim/groupchat_control.py Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -320,7 +320,6 @@ </child> <child> <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">icon</property> <child> <object class="GtkCellRendererPixbuf" id="icon_pixbuf"/> <attributes> @@ -331,7 +330,6 @@ </child> <child> <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">account</property> <child> <object class="GtkCellRendererText" id="account_text"/> <attributes> ===================================== gajim/groupchat_control.py ===================================== @@ -171,7 +171,6 @@ class GroupchatControl(ChatControlBase): self.room_jid = self.contact.jid self.nick = nick - self.new_nick = '' bm_module = app.connections[self.account].get_module('Bookmarks') self.name = bm_module.get_name_from_bookmark(self.room_jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d7cab85830fa4ab4cd8dee9e6398d7cba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d7cab85830fa4ab4cd8dee9e6398d7cba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 22 commits: Change GTK+ to GTK
by Philipp Hörist 17 Jul '19

17 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 781f46dc by Daniel Brötzmann at 2019-07-17T06:41:04Z Change GTK+ to GTK - - - - - 08abb6d8 by Daniel Brötzmann at 2019-07-17T07:54:59Z Replace Jabber with XMPP - - - - - 04d1b78b by Daniel Brötzmann at 2019-07-17T18:55:22Z Replace Roster with Contact list - - - - - c931cd0c by Daniel Brötzmann at 2019-07-17T18:55:37Z Replace Jabber-ID with XMPP Address - - - - - 422f9fe2 by Daniel Brötzmann at 2019-07-17T18:55:37Z Replace JID with XMPP Address - - - - - 10c08ca9 by Daniel Brötzmann at 2019-07-17T18:55:37Z Replace Occupant with Participant - - - - - 2db195af by Daniel Brötzmann at 2019-07-17T18:55:37Z Replace MUC with Group chat - - - - - 3fef60be by Daniel Brötzmann at 2019-07-17T18:55:37Z Replace groupchat with group chat - - - - - 2a34ec01 by Daniel Brötzmann at 2019-07-17T18:55:37Z Replace logs and correspondence with chat history - - - - - 00d94f0c by Daniel Brötzmann at 2019-07-17T18:55:37Z Unify gpg/pgp/OpenPGP to OpenPGP - - - - - 908e85d3 by Daniel Brötzmann at 2019-07-17T18:55:38Z Replace Room with Group Chat - - - - - 900ab808 by Daniel Brötzmann at 2019-07-17T18:55:38Z Replace Conference with Group chat - - - - - 24e375f0 by Daniel Brötzmann at 2019-07-17T18:55:38Z Replace Groupchats group in roster with Group chats - - - - - 4ce9ea9f by Daniel Brötzmann at 2019-07-17T18:55:38Z Replace Not in Roster group with Not in contact list - - - - - 94e3f962 by Daniel Brötzmann at 2019-07-17T18:55:38Z Replace Nick with Nickname - - - - - 9e250f68 by Daniel Brötzmann at 2019-07-17T18:55:38Z Replace HTTP Upload with HTTP File Upload - - - - - 32422afb by Daniel Brötzmann at 2019-07-17T18:55:38Z Replace Audio/Video Session with Voice/Video chat - - - - - 741a943d by Daniel Brötzmann at 2019-07-17T18:55:38Z Rewording for settings in config.py - - - - - 1c147f2a by Daniel Brötzmann at 2019-07-17T18:55:38Z Rewording for dialog_messages - - - - - 2069e1cf by Daniel Brötzmann at 2019-07-17T18:55:38Z Address contacts without using he/she/other - - - - - 378d5200 by Daniel Brötzmann at 2019-07-17T18:55:39Z Replace Disconnect in group chat menu with Leave - - - - - d7cab858 by Daniel Brötzmann at 2019-07-17T18:55:39Z Replace autojoin with Join Automatically - - - - - 30 changed files: - data/org.gajim.Gajim.appdata.xml.in - data/org.gajim.Gajim.desktop.in - gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/config.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/roster.py - gajim/data/gui/account_creation_wizard_window.ui - gajim/data/gui/add_new_contact_window.ui - gajim/data/gui/application_menu.ui - gajim/data/gui/blocking_list.ui - gajim/data/gui/chat_to_muc_window.ui - gajim/data/gui/contact_context_menu.ui - gajim/data/gui/data_form_window.ui - gajim/data/gui/filetransfers.ui - gajim/data/gui/gc_control_popup_menu.ui - gajim/data/gui/gc_occupants_menu.ui - gajim/data/gui/groupchat_config.ui - gajim/data/gui/history_manager.ui - gajim/data/gui/history_window.ui - gajim/data/gui/join_groupchat_window.ui - gajim/data/gui/mam_preferences.ui - gajim/data/gui/preferences_window.ui - gajim/data/gui/privacy_list_window.ui - gajim/data/gui/profile_window.ui - gajim/data/gui/shortcuts_window.ui - gajim/data/gui/vcard_information_window.ui The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e2db032509a5d156435bf0a6a4f5e0d9d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e2db032509a5d156435bf0a6a4f5e0d9d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Groupchat: Integrate change nickname into control
by Philipp Hörist 16 Jul '19

16 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 358eab4a by Philipp Hörist at 2019-07-16T22:17:59Z Groupchat: Integrate change nickname into control Use a Stack page to display the change nickname entry instead of a popup dialog - - - - - 1411c02a by Philipp Hörist at 2019-07-16T22:25:33Z MessageWindow: Refactor shortcut handling AccelGroup/AccelMap is phased out in GTK3. Use actions instead because they can also have shortcuts. This makes the code much easier to read because we dont have to deal with keyval and key modifiers. Handle all actions that are not control specific inside the MessageWindow and delegate all control specific actions to the controls. - - - - - 8875aff5 by Philipp Hörist at 2019-07-16T22:25:37Z Groupchat: Remove bookmark action - - - - - e2db0325 by Philipp Hörist at 2019-07-16T22:25:37Z ServiceDiscovery: Remove bookmark option - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/data/gui/groupchat_control.ui - gajim/data/gui/shortcuts_window.ui - gajim/groupchat_control.py - gajim/gtk/dialogs.py - gajim/gtk/discovery.py - gajim/gui_menu_builder.py - gajim/message_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -33,6 +33,7 @@ from gi.repository import Gtk from gi.repository import Gio from gi.repository import Pango from gi.repository import GLib +from gi.repository import Gdk from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 @@ -358,6 +359,28 @@ class ChatControl(ChatControlBase): win.lookup_action( 'information-' + self.control_id).set_enabled(online) + def delegate_action(self, action): + res = super().delegate_action(action) + if res == Gdk.EVENT_STOP: + return res + + if action == 'show-contact-info': + self.parent_win.window.lookup_action( + 'information-%s' % self.control_id).activate() + return Gdk.EVENT_STOP + + if action == 'send-file': + if app.interface.msg_win_mgr.mode == \ + app.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: + app.interface.roster.tree.grab_focus() + return Gdk.EVENT_PROPAGATE + + self.parent_win.window.lookup_action( + 'send-file-%s' % self.control_id).activate() + return Gdk.EVENT_STOP + + return Gdk.EVENT_PROPAGATE + def _on_add_to_roster(self, action, param): AddNewContactWindow(self.account, self.contact.jid) ===================================== gajim/chat_control_base.py ===================================== @@ -390,6 +390,28 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # to properly use the super, because of the old code. CommandTools.__init__(self) + def delegate_action(self, action): + if action == 'browse-history': + dict_ = {'jid': GLib.Variant('s', self.contact.jid), + 'account': GLib.Variant('s', self.account)} + variant = GLib.Variant('a{sv}', dict_) + app.app.activate_action('browse-history', variant) + return Gdk.EVENT_STOP + + if action == 'clear-chat': + self.conv_textview.clear() + return Gdk.EVENT_STOP + + if action == 'delete-line': + self.clear(self.msg_textview) + return Gdk.EVENT_STOP + + if action == 'show-emoji-chooser': + self.emoticons_button.get_popover().show() + return Gdk.EVENT_STOP + + return Gdk.EVENT_PROPAGATE + def add_actions(self): action = Gio.SimpleAction.new_stateful( "set-encryption-%s" % self.control_id, ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -81,374 +81,515 @@ <object class="GtkBox" id="groupchat_control_hbox"> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="groupchat_control_vbox"> - <property name="can_focus">True</property> - <property name="margin_left">7</property> - <property name="margin_right">7</property> - <property name="margin_top">5</property> - <property name="margin_bottom">7</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkPaned" id="hpaned"> - <property name="visible">True</property> + <object class="GtkBox" id="groupchat_control_vbox"> <property name="can_focus">True</property> - <property name="position">495</property> - <property name="position_set">True</property> - <signal name="button-release-event" handler="_on_hpaned_release_button" swapped="no"/> - <signal name="notify::position" handler="_on_hpaned_handle_change" swapped="no"/> + <property name="margin_left">7</property> + <property name="margin_right">7</property> + <property name="margin_top">5</property> + <property name="margin_bottom">7</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> <child> - <object class="GtkOverlay" id="overlay"> + <object class="GtkPaned" id="hpaned"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="position">495</property> + <property name="position_set">True</property> + <signal name="button-release-event" handler="_on_hpaned_release_button" swapped="no"/> + <signal name="notify::position" handler="_on_hpaned_handle_change" swapped="no"/> <child> - <object class="GtkBox" id="gc_textviews_vbox"> - <property name="width_request">0</property> + <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">4</property> - <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">GroupChatControl-BannerEventBox</property> + <object class="GtkBox" id="gc_textviews_vbox"> + <property name="width_request">0</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">4</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="hbox3024"> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">GroupChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkImage" id="gc_banner_status_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="banner_name_label"> - <property name="name">GroupChatControl-BannerNameLabel</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><span weight="heavy" size="large">room jid</span></property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkActionBar" id="banner_actionbar"> + <object class="GtkBox" id="hbox3024"> <property name="visible">True</property> <property name="can_focus">False</property> - <style> - <class name="actionbar-no-border"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <style> - <class name="gajim-banner"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator-top"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="width_request">200</property> - <property name="height_request">60</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> - <child> - <placeholder/> - </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox"> - <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> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> + <child> + <object class="GtkImage" id="gc_banner_status_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="name">GroupChatControl-BannerNameLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><span weight="heavy" size="large">room jid</span></property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkActionBar" id="banner_actionbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="actionbar-no-border"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> </object> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="gajim-banner"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="lock_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> - </object> - </child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="chatcontrol-separator-top"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkMenuButton" id="encryption_menu"> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="width_request">200</property> + <property name="height_request">60</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> </child> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> </style> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkButton" id="sendfile_button"> + <object class="GtkSeparator"> <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> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> - </object> - </child> + <property name="can_focus">False</property> <style> - <class name="chatcontrol-actionbar-button"/> + <class name="chatcontrol-separator"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkMenuButton" id="emoticons_button"> + <object class="GtkBox" id="hbox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> - <property name="relief">none</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> <child> - <object class="GtkImage"> + <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile-symbolic</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">open-menu-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="authentication_button"> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="encryption_menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose encryption</property> + <property name="relief">none</property> + <child> + <placeholder/> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="sendfile_button"> + <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> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">mail-attachment-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">face-smile-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="formattings_button"> - <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> <child> - <object class="GtkImage" id="image10"> + <object class="GtkMenuButton" id="formattings_button"> + <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="popup">formattings_menu</property> + <child> + <object class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> + <property name="no_show_all">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> + <property name="fill">False</property> + <property name="position">4</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="index">-1</property> </packing> </child> </object> <packing> - <property name="index">-1</property> + <property name="resize">False</property> + <property name="shrink">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="list_scrolledwindow"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="margin_left">4</property> + <property name="margin_bottom">5</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="list_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">1</property> + <property name="headers_visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + </child> + <style> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + </style> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">False</property> </packing> </child> </object> <packing> - <property name="resize">False</property> - <property name="shrink">False</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="name">groupchat</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkScrolledWindow" id="list_scrolledwindow"> - <property name="width_request">100</property> + <object class="GtkSpinner" id="spinner"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="margin_left">4</property> - <property name="margin_bottom">5</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">progress</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> <child> - <object class="GtkTreeView" id="list_treeview"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Enter new nickname</property> + <property name="xalign">0</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="nickname_entry"> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">1</property> - <property name="headers_visible">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <property name="activates_default">True</property> + <property name="caps_lock_warning">False</property> + <property name="show_emoji_icon">True</property> + <signal name="notify::text" handler="_on_nickname_text_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_nickname_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="nickname_change_button"> + <property name="label" translatable="yes">Ch_ange</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_nickname_change_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - </style> </object> <packing> - <property name="resize">False</property> - <property name="shrink">False</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="name">nickname</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -109,7 +109,7 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator"><alt>Left <ctrl>Page_Up</property> + <property name="accelerator"><alt>Left <ctrl>Page_Up</property> <property name="title" translatable="yes">Switch to the previous tab</property> </object> </child> @@ -121,13 +121,6 @@ </object> </child> <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><Alt>1...9</property> - <property name="title" translatable="yes">Switch to the first - ninth tab</property> - </object> - </child> - <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> <property name="accelerator"><ctrl><shift>Tab</property> @@ -158,7 +151,7 @@ <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> - <property name="accelerator">Escape <ctrl>w <ctrl>F4</property> + <property name="accelerator">Escape <ctrl>w</property> <property name="title" translatable="yes">Close chat</property> </object> </child> ===================================== gajim/groupchat_control.py ===================================== @@ -33,7 +33,8 @@ import logging from enum import IntEnum, unique import nbxmpp -from nbxmpp.protocol import JID +from nbxmpp.protocol import InvalidJid +from nbxmpp.protocol import validate_resourcepart from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation from nbxmpp.const import Role @@ -76,7 +77,6 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputTextDialog from gajim.gtk.dialogs import DestroyMucDialog from gajim.gtk.dialogs import InputDialog -from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.add_contact import AddNewContactWindow @@ -346,9 +346,14 @@ class GroupchatControl(ChatControlBase): # disable win, we are not connected yet ChatControlBase.got_disconnected(self) + # Stack + self.xml.stack.show_all() + self.xml.stack.set_visible_child_name('groupchat') + self.update_ui() self.widget.show_all() + if app.config.get('hide_groupchat_occupants_list'): # Roster is shown by default, so toggle the roster button to hide it self.show_roster() @@ -361,11 +366,10 @@ class GroupchatControl(ChatControlBase): super().add_actions() actions = [ ('change-subject-', self._on_change_subject), - ('change-nick-', self._on_change_nick), + ('change-nickname-', self._on_change_nick), ('disconnect-', self._on_disconnect), ('destroy-', self._on_destroy_room), ('configure-', self._on_configure_room), - ('bookmark-', self._on_bookmark_room), ('request-voice-', self._on_request_voice), ('execute-command-', self._on_execute_command), ('upload-avatar-', self._on_upload_avatar), @@ -466,12 +470,6 @@ class GroupchatControl(ChatControlBase): self.is_connected and contact.affiliation in (Affiliation.ADMIN, Affiliation.OWNER)) - # Bookmarks - con = app.connections[self.account] - bookmarked = con.get_module('Bookmarks').is_bookmark(self.room_jid) - self._get_action('bookmark-').set_enabled(self.is_connected and - not bookmarked) - # Request Voice role = self.get_role(self.nick) self._get_action('request-voice-').set_enabled(self.is_connected and @@ -486,7 +484,7 @@ class GroupchatControl(ChatControlBase): subject) # Change Nick - self._get_action('change-nick-').set_enabled(self.is_connected) + self._get_action('change-nickname-').set_enabled(self.is_connected) # Execute command self._get_action('execute-command-').set_enabled(self.is_connected) @@ -537,6 +535,15 @@ class GroupchatControl(ChatControlBase): win = self.parent_win.window return win.lookup_action(name + self.control_id) + def _show_page(self, name): + transition = Gtk.StackTransitionType.SLIDE_DOWN + if name == 'groupchat': + transition = Gtk.StackTransitionType.SLIDE_UP + self.xml.stack.set_visible_child_full(name, transition) + + def _get_current_page(self): + return self.xml.stack.get_visible_child_name() + def _cell_data_func(self, column, renderer, model, iter_, user_data): # Background color has to be rendered for all cells theme = app.config.get('roster_theme') @@ -632,16 +639,6 @@ class GroupchatControl(ChatControlBase): _('Please specify the new subject:'), input_str=self.subject, ok_handler=on_ok, transient_for=self.parent_win.window) - def _on_change_nick(self, action, param): - if 'change_nick_dialog' in app.interface.instances: - app.interface.instances['change_nick_dialog'].dialog.present() - else: - title = _('Changing Nickname') - prompt = _('Please specify the new nickname you want to use:') - app.interface.instances['change_nick_dialog'] = \ - ChangeNickDialog(self.account, self.room_jid, title, - prompt, change_nick=True, transient_for=self.parent_win.window) - def _on_disconnect(self, action, param): app.connections[self.account].get_module('MUC').leave(self.room_jid) self.force_non_minimizable = True @@ -700,19 +697,6 @@ class GroupchatControl(ChatControlBase): app.config.set_per('rooms', self.contact.jid, 'print_status', param.get_boolean()) - def _on_bookmark_room(self, action, param): - """ - Bookmark the room, without autojoin and not minimized - """ - password = app.gc_passwords.get(self.room_jid, '') - con = app.connections[self.account] - con.get_module('Bookmarks').add_bookmark(self.name, - JID(self.room_jid), - True, - password, - self.nick) - self.update_actions() - def _on_request_voice(self, action, param): """ Request voice in the current room @@ -2500,6 +2484,29 @@ class GroupchatControl(ChatControlBase): widget.get_selection().unselect_all() return True + def delegate_action(self, action): + res = super().delegate_action(action) + if res == Gdk.EVENT_STOP: + return res + + if action == 'change-nickname': + control_action = '%s-%s' % (action, self.control_id) + self.parent_win.window.lookup_action(control_action).activate() + return Gdk.EVENT_STOP + + if action == 'escape': + if self._get_current_page() == 'groupchat': + return Gdk.EVENT_PROPAGATE + self._show_page('groupchat') + return Gdk.EVENT_STOP + + if action == 'change-subject': + control_action = '%s-%s' % (action, self.control_id) + self.parent_win.window.lookup_action(control_action).activate() + return Gdk.EVENT_STOP + + return Gdk.EVENT_PROPAGATE + def on_list_treeview_row_expanded(self, widget, iter_, path): """ When a row is expanded: change the icon of the arrow @@ -2941,6 +2948,33 @@ class GroupchatControl(ChatControlBase): else: self.revoke_owner(widget, jid) + def _on_change_nick(self, _action, _param): + self.xml.nickname_entry.set_text(self.nick) + self.xml.nickname_entry.grab_focus() + self.xml.nickname_change_button.grab_default() + self._show_page('nickname') + + def _on_nickname_text_changed(self, entry, _param): + text = entry.get_text() + if not text or text == self.nick: + self.xml.nickname_change_button.set_sensitive(False) + else: + try: + validate_resourcepart(text) + except InvalidJid: + self.xml.nickname_change_button.set_sensitive(False) + else: + self.xml.nickname_change_button.set_sensitive(True) + + def _on_nickname_change_clicked(self, _button): + new_nick = self.xml.nickname_entry.get_text() + app.connections[self.account].get_module('MUC').change_nick( + self.room_jid, new_nick) + self._show_page('groupchat') + + def _on_nickname_cancel_clicked(self, _button): + self._show_page('groupchat') + class SubjectPopover(Gtk.Popover): def __init__(self): ===================================== gajim/gtk/dialogs.py ===================================== @@ -22,7 +22,6 @@ from gi.repository import Gdk from gi.repository import Pango from gajim.common import app -from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.const import ButtonAction @@ -526,91 +525,6 @@ class InputDialogCheck(InputDialog): return False -class ChangeNickDialog(InputDialogCheck): - """ - Class for changing room nickname in case of conflict - """ - - def __init__(self, account, room_jid, title, prompt, check_text=None, - change_nick=False, transient_for=None): - """ - change_nick must be set to True when we are already occupant of the room - and we are changing our nick - """ - InputDialogCheck.__init__(self, title, '', - input_str='', is_modal=True, ok_handler=None, - cancel_handler=None, - transient_for=transient_for) - self.room_queue = [(account, room_jid, prompt, change_nick)] - self.check_next() - - def on_input_dialog_delete_event(self, widget, event): - self.on_cancelbutton_clicked(widget) - return True - - def setup_dialog(self): - self.gc_control = app.interface.msg_win_mgr.get_gc_control( - self.room_jid, self.account) - if not self.gc_control and \ - self.room_jid in app.interface.minimized_controls[self.account]: - self.gc_control = \ - app.interface.minimized_controls[self.account][self.room_jid] - if not self.gc_control: - self.check_next() - return - label = self.xml.get_object('label') - label.set_markup(self.prompt) - self.set_entry(self.gc_control.nick + \ - app.config.get('gc_proposed_nick_char')) - - def check_next(self): - if not self.room_queue: - self.cancel_handler = None - self.dialog.destroy() - if 'change_nick_dialog' in app.interface.instances: - del app.interface.instances['change_nick_dialog'] - return - self.account, self.room_jid, self.prompt, self.change_nick = \ - self.room_queue.pop(0) - self.setup_dialog() - self.dialog.show() - - def on_okbutton_clicked(self, widget): - nick = self.get_text() - if nick: - nick = nick - # send presence to room - try: - nick = helpers.parse_resource(nick) - except Exception: - # invalid char - ErrorDialog(_('Invalid nickname'), - _('The nickname contains invalid characters.')) - return - self.on_ok(nick, self.is_checked()) - - def on_ok(self, nick, is_checked): - app.connections[self.account].get_module('MUC').change_nick( - self.room_jid, nick) - if app.gc_connected[self.account][self.room_jid]: - # We are changing nick, we will change self.nick when we receive - # presence that inform that it works - self.gc_control.new_nick = nick - else: - # We are connecting, we will not get a changed nick presence so - # change it NOW. We don't already have a nick so it's harmless - self.gc_control.nick = nick - self.check_next() - - def on_cancelbutton_clicked(self, widget): - self.gc_control.new_nick = '' - self.check_next() - - def add_room(self, account, room_jid, prompt, change_nick=False): - if (account, room_jid, prompt, change_nick) not in self.room_queue: - self.room_queue.append((account, room_jid, prompt, change_nick)) - - class InputTextDialog(CommonInputDialog): """ Class for multilines Input dialog (more place than InputDialog) ===================================== gajim/gtk/discovery.py ===================================== @@ -46,7 +46,6 @@ import weakref import uuid import nbxmpp -from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.structs import DiscoIdentity @@ -61,7 +60,6 @@ from gajim.common.const import StyleAttr from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import InformationDialog from gajim.gtk.search import Search from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.util import icon_exists @@ -1637,7 +1635,6 @@ class MucBrowser(AgentBrowser): def __init__(self, *args, **kwargs): AgentBrowser.__init__(self, *args, **kwargs) self.join_button = None - self.bookmark_button = None def _create_treemodel(self): # JID, node, name, users_int, users_str, description, fetched @@ -1703,55 +1700,16 @@ class MucBrowser(AgentBrowser): AgentBrowser._clean_treemodel(self) def _add_actions(self): - self.bookmark_button = Gtk.Button(label=_('_Bookmark'), - use_underline=True) - self.bookmark_button.connect( - 'clicked', self._on_bookmark_button_clicked) - image = Gtk.Image.new_from_icon_name( - 'bookmark-new-symbolic', Gtk.IconSize.BUTTON) - self.bookmark_button.set_image(image) - self.window.action_buttonbox.add(self.bookmark_button) - self.bookmark_button.show_all() self.join_button = Gtk.Button(label=_('_Join'), use_underline=True) self.join_button.connect('clicked', self._on_join_button_clicked) self.window.action_buttonbox.add(self.join_button) self.join_button.show_all() def _clean_actions(self): - if self.bookmark_button: - self.bookmark_button.destroy() - self.bookmark_button = None if self.join_button: self.join_button.destroy() self.join_button = None - def _on_bookmark_button_clicked(self, *args): - con = app.connections[self.account] - model, iter_ = \ - self.window.services_treeview.get_selection().get_selected() - if not iter_: - return - - room_jid = model[iter_][0] - if con.get_module('Bookmarks').is_bookmark(room_jid): - ErrorDialog( - _('Bookmark already set'), - _('Group Chat \'%s\' is already in your bookmarks.') % room_jid, - transient_for=self.window.window) - return - - con.get_module('Bookmarks').add_bookmark(room_jid.split('@')[0], - JID(room_jid), - False, - '', - '') - - InformationDialog( - _('Bookmark has been added successfully'), - _('You can manage your bookmarks by clicking the Bookmarks menu ' - 'item in your contact list.'), - transient_for=self.window.window) - def _on_join_button_clicked(self, *args): """ When we want to join a conference: ask specific informations about the @@ -1773,8 +1731,6 @@ class MucBrowser(AgentBrowser): def update_actions(self): sens = \ self.window.services_treeview.get_selection().count_selected_rows() - if self.bookmark_button: - self.bookmark_button.set_sensitive(sens > 0) if self.join_button: self.join_button.set_sensitive(sens > 0) ===================================== gajim/gui_menu_builder.py ===================================== @@ -594,7 +594,7 @@ def get_groupchat_menu(control_id, account, jid): (_('Send Chatstate'), ['chatstate']), ]), (_('Sync Threshold'), ['sync']), - ('win.change-nick-', _('Change Nick')), + ('win.change-nickname-', _('Change Nick')), ('win.request-voice-', _('Request Voice')), ('win.execute-command-', _('Execute command')), ('app.browse-history', _('History')), ===================================== gajim/message_window.py ===================================== @@ -23,12 +23,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import time +import logging from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject from gi.repository import GLib +from gi.repository import Gio from gajim import common from gajim.common import app @@ -49,6 +50,9 @@ from gajim.gtk.util import get_app_icon_list from gajim.gtk.util import get_builder from gajim.gtk.util import set_urgency_hint + +log = logging.getLogger('gajim.message_window') + #################### class MessageWindow: @@ -119,19 +123,7 @@ class MessageWindow: id_ = self.window.connect('focus-in-event', self._on_window_focus) self.handlers[id_] = self.window - keys = ['<Control>f', '<Control>g', '<Control>h', '<Control>i', - '<Control>l', '<Control>L', '<Control><Shift>n', '<Control>u', - '<Control>b', '<Control>F4', - '<Control><Shift>Page_Up', '<Control><Shift>Page_Down', - '<Control>w', '<Control>Page_Up', '<Control>Page_Down', '<Alt>Right', - '<Alt>Left', '<Alt>d', '<Alt>c', '<Alt>m', '<Alt>t', 'Escape'] + \ - ['<Alt>'+str(i) for i in range(10)] - accel_group = Gtk.AccelGroup() - for key in keys: - keyval, mod = Gtk.accelerator_parse(key) - accel_group.connect(keyval, mod, Gtk.AccelFlags.VISIBLE, - self.accel_group_func) - self.window.add_accel_group(accel_group) + self._add_actions() # gtk+ doesn't make use of the motion notify on gtkwindow by default # so this line adds that @@ -164,6 +156,118 @@ class MessageWindow: self.notebook.set_show_border(app.config.get('tabs_border')) self.show_icon() + def _add_actions(self): + actions = [ + ('change-nickname', ['<Control><Shift>n']), + ('change-subject', ['<Alt>t']), + ('escape', ['Escape']), + ('browse-history', ['<Control>h']), + ('send-file', ['<Control>f']), + ('show-contact-info', ['<Control>i']), + ('show-emoji-chooser', ['<Alt>m']), + ('clear-chat', ['<Control>l']), + ('delete-line', ['<Control>u']), + ('close-tab', ['<Control>w']), + ('move-tab-up', ['<Control><Shift>Page_Up']), + ('move-tab-down', ['<Control><Shift>Page_Down']), + ('switch-next-tab', ['<Alt>Right']), + ('switch-prev-tab', ['<Alt>Left']), + ('switch-next-unread-tab-right', ['<Control>Tab', + '<Control>Page_Down']), + ('switch-next-unread-tab-left', ['<Control>ISO_Left_Tab', + '<Control>Page_Up']), + ] + + disabled_for_emacs = ( + 'browse-history', + 'send-file', + 'close-tab' + ) + + key_theme = Gtk.Settings.get_default().get_property( + 'gtk-key-theme-name') + + for action, keys in actions: + if key_theme == 'Emacs' and action in disabled_for_emacs: + continue + act = Gio.SimpleAction.new(action, None) + act.connect('activate', self._on_action) + self.window.add_action(act) + app.app.set_accels_for_action('win.%s' % action, keys) + + def _on_action(self, action, _param): + control = self.get_active_control() + if not control: + # No more control in this window + return + + log.info('Activate action: %s, active control: %s', + action.get_name(), control.contact.jid) + + action = action.get_name() + + # Pass the event to the control + res = control.delegate_action(action) + if res != Gdk.EVENT_PROPAGATE: + return res + + if action == 'escape' and app.config.get('escape_key_closes'): + self.remove_tab(control, self.CLOSE_ESC) + return + + if action == 'close-tab': + self.remove_tab(control, self.CLOSE_CTRL_KEY) + return + + if action == 'move-tab-up': + old_position = self.notebook.get_current_page() + self.notebook.reorder_child(control.widget, + old_position - 1) + return + + if action == 'move-tab-down': + old_position = self.notebook.get_current_page() + total_pages = self.notebook.get_n_pages() + if old_position == total_pages - 1: + self.notebook.reorder_child(control.widget, 0) + else: + self.notebook.reorder_child(control.widget, + old_position + 1) + return + + if action == 'switch-next-tab': + new = self.notebook.get_current_page() + 1 + if new >= self.notebook.get_n_pages(): + new = 0 + self.notebook.set_current_page(new) + return + + if action == 'switch-prev-tab': + new = self.notebook.get_current_page() - 1 + if new < 0: + new = self.notebook.get_n_pages() - 1 + self.notebook.set_current_page(new) + return + + if action == 'switch-next-unread-tab-right': + self.move_to_next_unread_tab(True) + return + + if action == 'switch-next-unread-tab-left': + self.move_to_next_unread_tab(False) + return + + def _on_notebook_key_press(self, _widget, event): + control = self.get_active_control() + if control is None: + return + + if isinstance(control, ChatControlBase): + # we forwarded it to message textview + control.msg_textview.remove_placeholder() + control.msg_textview.event(event) + control.msg_textview.grab_focus() + def change_account_name(self, old_name, new_name): if old_name in self._controls: self._controls[new_name] = self._controls[old_name] @@ -353,141 +457,6 @@ class MessageWindow: ctrl = self._widget_to_control(child) GLib.idle_add(ctrl.msg_textview.grab_focus) - def accel_group_func(self, accel_group, acceleratable, keyval, modifier): - st = '1234567890' # alt+1 means the first tab (tab 0) - control = self.get_active_control() - if not control: - # No more control in this window - return - - # CTRL mask - if modifier & Gdk.ModifierType.CONTROL_MASK: - if keyval == Gdk.KEY_h: # CTRL + h - if Gtk.Settings.get_default().get_property( - 'gtk-key-theme-name') != 'Emacs': - dict_ = {'jid': GLib.Variant('s', control.contact.jid), - 'account': GLib.Variant('s', control.account)} - variant = GLib.Variant('a{sv}', dict_) - app.app.activate_action('browse-history', variant) - return True - elif control.type_id == message_control.TYPE_CHAT and \ - keyval == Gdk.KEY_f: # CTRL + f - # CTRL + f moves cursor one char forward when user uses Emacs - # theme - if not Gtk.Settings.get_default().get_property( - 'gtk-key-theme-name') == 'Emacs': - if app.interface.msg_win_mgr.mode == \ - app.interface.msg_win_mgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - app.interface.roster.tree.grab_focus() - return False - self.window.lookup_action( - 'send-file-%s' % control.control_id).activate() - return True - elif control.type_id == message_control.TYPE_CHAT and \ - keyval == Gdk.KEY_g: # CTRL + g - control._on_convert_to_gc_menuitem_activate(None) - return True - elif control.type_id in (message_control.TYPE_CHAT, - message_control.TYPE_PM) and keyval == Gdk.KEY_i: # CTRL + i - self.window.lookup_action( - 'information-%s' % control.control_id).activate() - return True - elif keyval in (Gdk.KEY_l, Gdk.KEY_L): # CTRL + l|L - control.conv_textview.clear() - return True - elif keyval == Gdk.KEY_u: # CTRL + u: emacs style clear line - control.clear(control.msg_textview) - return True - elif control.type_id == message_control.TYPE_GC and \ - keyval == Gdk.KEY_b: # CTRL + b - # CTRL + b moves cursor one char backward when user uses Emacs - # theme - if not Gtk.Settings.get_default().get_property( - 'gtk-key-theme-name') == 'Emacs': - self.window.lookup_action( - 'bookmark-%s' % control.control_id).activate() - return True - # Tab switch bindings - elif keyval == Gdk.KEY_F4: # CTRL + F4 - self.remove_tab(control, self.CLOSE_CTRL_KEY) - return True - elif keyval == Gdk.KEY_w: # CTRL + w - # CTRL + w removes latest word before cursor when User uses emacs - # theme - if not Gtk.Settings.get_default().get_property( - 'gtk-key-theme-name') == 'Emacs': - self.remove_tab(control, self.CLOSE_CTRL_KEY) - return True - elif keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down) and not \ - modifier & Gdk.ModifierType.SHIFT_MASK: - # CTRL + PageUp | PageDown - # Create event and send it to notebook - event = Gdk.Event.new(Gdk.EventType.KEY_PRESS) - event.window = self.window.get_window() - event.time = int(time.time()) - event.state = Gdk.ModifierType.CONTROL_MASK - event.keyval = int(keyval) - self.notebook.event(event) - return True - - if modifier & Gdk.ModifierType.SHIFT_MASK: - # CTRL + SHIFT - if control.type_id == message_control.TYPE_GC and \ - keyval == Gdk.KEY_n: # CTRL + SHIFT + n - self.window.lookup_action( - 'change-nick-%s' % control.control_id).activate() - return True - # CTRL + SHIFT + PageUp | PageDown - old_position = self.notebook.get_current_page() - total_pages = self.notebook.get_n_pages() - if keyval == Gdk.KEY_Page_Up: - self.notebook.reorder_child(control.widget, - old_position - 1) - return True - if keyval == Gdk.KEY_Page_Down: - if old_position == total_pages - 1: - self.notebook.reorder_child(control.widget, 0) - return True - self.notebook.reorder_child(control.widget, - old_position + 1) - return True - # MOD1 (ALT) mask - elif modifier & Gdk.ModifierType.MOD1_MASK: - # Tab switch bindings - if keyval == Gdk.KEY_Right: # ALT + RIGHT - new = self.notebook.get_current_page() + 1 - if new >= self.notebook.get_n_pages(): - new = 0 - self.notebook.set_current_page(new) - return True - - if keyval == Gdk.KEY_Left: # ALT + LEFT - new = self.notebook.get_current_page() - 1 - if new < 0: - new = self.notebook.get_n_pages() - 1 - self.notebook.set_current_page(new) - return True - - if chr(keyval) in st: # ALT + 1,2,3.. - self.notebook.set_current_page(st.index(chr(keyval))) - return True - - if keyval == Gdk.KEY_m: # ALT + M show emoticons menu - control.emoticons_button.get_popover().show() - return True - - if (control.type_id == message_control.TYPE_GC and - keyval == Gdk.KEY_t): # ALT + t - self.window.lookup_action( - 'change-subject-%s' % control.control_id).activate() - return True - - # Close tab bindings - elif keyval == Gdk.KEY_Escape and \ - app.config.get('escape_key_closes'): # Escape - self.remove_tab(control, self.CLOSE_ESC) - return True - def _on_close_button_clicked(self, button, control): """ When close button is pressed: close a tab @@ -850,50 +819,6 @@ class MessageWindow: if isinstance(control, ChatControlBase): control.msg_textview.grab_focus() - def _on_notebook_key_press(self, widget, event): - # when tab itself is selected, - # make sure <- and -> are allowed for navigating between tabs - if event.keyval in (Gdk.KEY_Left, Gdk.KEY_Right): - return False - - control = self.get_active_control() - - if event.get_state() & Gdk.ModifierType.SHIFT_MASK: - # CTRL + SHIFT + TAB - if event.get_state() & Gdk.ModifierType.CONTROL_MASK and \ - event.keyval == Gdk.KEY_ISO_Left_Tab: - self.move_to_next_unread_tab(False) - return True - # SHIFT + PAGE_[UP|DOWN]: send to conv_textview - if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): - control.conv_textview.tv.event(event) - return True - - elif event.get_state() & Gdk.ModifierType.CONTROL_MASK: - if event.keyval == Gdk.KEY_Tab: # CTRL + TAB - self.move_to_next_unread_tab(True) - return True - # Ctrl+PageUP / DOWN has to be handled by notebook - if event.keyval == Gdk.KEY_Page_Down: - self.move_to_next_unread_tab(True) - return True - if event.keyval == Gdk.KEY_Page_Up: - self.move_to_next_unread_tab(False) - return True - - if event.keyval in (Gdk.KEY_Shift_L, Gdk.KEY_Shift_R, - Gdk.KEY_Control_L, Gdk.KEY_Control_R, Gdk.KEY_Caps_Lock, - Gdk.KEY_Shift_Lock, Gdk.KEY_Meta_L, Gdk.KEY_Meta_R, - Gdk.KEY_Alt_L, Gdk.KEY_Alt_R, Gdk.KEY_Super_L, - Gdk.KEY_Super_R, Gdk.KEY_Hyper_L, Gdk.KEY_Hyper_R): - return True - - if isinstance(control, ChatControlBase): - # we forwarded it to message textview - control.msg_textview.remove_placeholder() - control.msg_textview.event(event) - control.msg_textview.grab_focus() - def get_tab_at_xy(self, x, y): """ Return the tab under xy and if its nearer from left or right side of the View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/37b5be8b005fc653f138d8126296ed5d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/37b5be8b005fc653f138d8126296ed5d4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Remove bookmark option from menu
by Philipp Hörist 14 Jul '19

14 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 37b5be8b by Philipp Hörist at 2019-07-14T09:37:56Z Groupchat: Remove bookmark option from menu Groupchats are bookmarked on join - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -595,7 +595,6 @@ def get_groupchat_menu(control_id, account, jid): ]), (_('Sync Threshold'), ['sync']), ('win.change-nick-', _('Change Nick')), - ('win.bookmark-', _('Bookmark Room')), ('win.request-voice-', _('Request Voice')), ('win.execute-command-', _('Execute command')), ('app.browse-history', _('History')), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/37b5be8b005fc653f138d8126296ed5d4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/37b5be8b005fc653f138d8126296ed5d4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove bookmark/join groupchat menus
by Philipp Hörist 14 Jul '19

14 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6955a7ea by Philipp Hörist at 2019-07-14T08:17:09Z Remove bookmark/join groupchat menus - - - - - 4 changed files: - gajim/data/gui/account_context_menu.ui - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/account_context_menu.ui ===================================== @@ -28,14 +28,6 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> </child> - <child> - <object class="GtkMenuItem" id="join_group_chat_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="seperator"> <property name="visible">True</property> ===================================== gajim/gui_interface.py ===================================== @@ -601,9 +601,6 @@ class Interface: 'from', 'both'): self.instances[account]['sub_request'][obj.jid].destroy() - def handle_event_bookmarks(self, obj): - gui_menu_builder.build_bookmark_menu(obj.account) - def handle_event_file_send_error(self, event): ft = self.instances['file_transfers'] ft.set_status(event.file_props, 'stop') @@ -1226,7 +1223,6 @@ class Interface: self.handlers = { 'DB_ERROR': [self.handle_event_db_error], 'file-send-error': [self.handle_event_file_send_error], - 'bookmarks-received': [self.handle_event_bookmarks], 'client-cert-passphrase': [ self.handle_event_client_cert_passphrase], 'connection-lost': [self.handle_event_connection_lost], ===================================== gajim/gui_menu_builder.py ===================================== @@ -15,12 +15,11 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk, Gio, GLib -from nbxmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC +from nbxmpp.protocol import NS_COMMANDS, NS_FILE from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5, NS_CONFERENCE from gajim import gtkgui_helpers from gajim import message_control -from gajim.gtkgui_helpers import get_action from gajim.common import app from gajim.common import helpers from gajim.common.i18n import ngettext @@ -47,8 +46,6 @@ def build_resources_submenu(contacts, account, action, room_jid=None, if action == roster.on_invite_to_room: # pylint: disable=comparison-with-callable item.connect('activate', action, [(c, account)], room_jid, room_account, c.resource) - elif action == roster.on_invite_to_new_room: # pylint: disable=comparison-with-callable - item.connect('activate', action, [(c, account)], c.resource) else: # start_chat, execute_command, send_file item.connect('activate', action, c, account, c.resource) @@ -92,42 +89,7 @@ show_bookmarked=False, force_resource=False): return invite_to_submenu = Gtk.Menu() invite_menuitem.set_submenu(invite_to_submenu) - invite_to_new_room_menuitem = Gtk.MenuItem.new_with_mnemonic(_( - '_New Group Chat')) - if len(contact_list) > 1: # several resources - invite_to_new_room_menuitem.set_submenu(build_resources_submenu( - contact_list, account, roster.on_invite_to_new_room, cap=NS_MUC)) - elif len(list_) == 1: - invite_menuitem.set_sensitive(True) - # use resource if it's self contact - if contact.jid == app.get_jid_from_account(account) or force_resource: - resource = contact.resource - else: - resource = None - invite_to_new_room_menuitem.connect('activate', - roster.on_invite_to_new_room, list_, resource) - elif len(list_) > 1: - list2 = [] - for (c, a) in list_: - if c.supports(NS_MUC): - list2.append((c, a)) - if list2: - invite_to_new_room_menuitem.connect('activate', - roster.on_invite_to_new_room, list2, None) - else: - invite_menuitem.set_sensitive(False) - else: - invite_menuitem.set_sensitive(False) - # transform None in 'jabber' - c_t = contacts_transport or 'jabber' - muc_jid = {} - for account in connected_accounts: - for t in app.connections[account].muc_jid: - muc_jid[t] = app.connections[account].muc_jid[t] - if c_t not in muc_jid: - invite_to_new_room_menuitem.set_sensitive(False) rooms = [] # a list of (room_jid, account) tuple - invite_to_submenu.append(invite_to_new_room_menuitem) minimized_controls = [] for account in connected_accounts: minimized_controls += \ @@ -698,43 +660,6 @@ def get_groupchat_menu(control_id, account, jid): return build_menu(groupchat_menu) -def get_bookmarks_menu(account, rebuild=False): - con = app.connections[account] - bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks(short_name=True) - - menu = Gio.Menu() - - # Build Join Groupchat - action = 'app.{}-join-groupchat'.format(account) - menuitem = Gio.MenuItem.new(_('Join Group Chat'), action) - variant = GLib.Variant('as', [account, '']) - menuitem.set_action_and_target_value(action, variant) - menu.append_item(menuitem) - - # Build Bookmarks - section = Gio.Menu() - for bookmark in bookmarks: - action = 'app.{}-activate-bookmark'.format(account) - menuitem = Gio.MenuItem.new(bookmark.name, action) - - # Create Variant Dict - dict_ = {'account': GLib.Variant('s', account), - 'jid': GLib.Variant('s', str(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)] @@ -744,7 +669,6 @@ def get_account_menu(account): ''' account_menu = [ ('-add-contact', _('Add Contact…')), - ('-join-groupchat', _('Join Group Chat')), ('-profile', _('Profile')), ('-services', _('Discover Services')), ('-start-single-chat', _('Send Single Message…')), @@ -773,11 +697,6 @@ def get_account_menu(account): 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) if 'add-contact' in action: @@ -832,37 +751,6 @@ def build_accounts_menu(): menubar.insert_submenu(menu_position, _('Accounts'), acc_menu) -def build_bookmark_menu(account): - menubar = app.app.get_menubar() - bookmark_menu = get_bookmarks_menu(account) - if not bookmark_menu: - return - - menu_position = 1 - if app.prefers_app_menu(): - menu_position = 0 - - # Accounts Submenu - acc_menu = menubar.get_item_link(menu_position, 'submenu') - - # We have more than one Account active - if acc_menu.get_item_link(1, 'submenu'): - for i in range(acc_menu.get_n_items()): - label = acc_menu.get_item_attribute_value(i, 'label') - account_label = escape_mnemonic( - app.config.get_per('accounts', account, 'account_label')) - if label.get_string() in (account_label, account): - menu = acc_menu.get_item_link(i, 'submenu') - bookmark_position = 1 - else: - # We have only one Account active - menu = acc_menu - bookmark_position = 2 - label = menu.get_item_attribute_value(1, 'label').get_string() - menu.remove(bookmark_position) - menu.insert_submenu(bookmark_position, label, bookmark_menu) - - def get_encryption_menu(control_id, type_id, zeroconf=False): menu = Gio.Menu() menu.append( ===================================== gajim/roster_window.py ===================================== @@ -74,7 +74,6 @@ from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog from gajim.gtk.dialogs import CertificateDialog from gajim.gtk.dialogs import InvitationReceivedDialog -from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.pep_config import ManagePEPServicesWindow @@ -2998,34 +2997,6 @@ class RosterWindow: app.interface.instances['file_transfers'].show_file_send_request( account, contact) - def on_invite_to_new_room(self, widget, list_, resource=None): - """ - Resource parameter MUST NOT be used if more than one contact in list - """ - account_list = [] - jid_list = [] - for (contact, account) in list_: - if contact.jid not in jid_list: - if resource: # we MUST have one contact only in list_ - fjid = contact.jid + '/' + resource - jid_list.append(fjid) - else: - jid_list.append(contact.jid) - if account not in account_list: - account_list.append(account) - # transform None in 'jabber' - type_ = app.get_transport_name_from_jid(jid_list[0]) or 'jabber' - for account in account_list: - if app.connections[account].muc_jid[type_]: - # create the room on this muc server - if 'join_gc' in app.interface.instances[account]: - app.interface.instances[account]['join_gc'].destroy() - else: - app.interface.instances[account]['join_gc'] = \ - JoinGroupchatWindow( - account, None, automatic={'invities': jid_list}) - break - def on_invite_to_room(self, widget, list_, room_jid, room_account, resource=None): """ @@ -3544,13 +3515,6 @@ class RosterWindow: def on_add_new_contact(self, widget, account): AddNewContactWindow(account) - def on_join_gc_activate(self, widget, account): - """ - When the join gc menuitem is clicked, show the join gc window - """ - app.app.activate_action('%s-join-groupchat' % account, - GLib.Variant('as', [account, ''])) - def on_create_gc_activate(self, widget, account): """ When the create gc menuitem is clicked, show the create gc window @@ -4802,8 +4766,6 @@ class RosterWindow: account_context_menu = xml.get_object('account_context_menu') status_menuitem = xml.get_object('status_menuitem') - join_group_chat_menuitem = xml.get_object( - 'join_group_chat_menuitem') add_contact_menuitem = xml.get_object('add_contact_menuitem') service_discovery_menuitem = xml.get_object( 'service_discovery_menuitem') @@ -4900,14 +4862,10 @@ class RosterWindow: view_certificate_menuitem.connect('activate', self.on_view_certificate, account) - gc_sub_menu = Gtk.Menu() # gc is always a submenu - join_group_chat_menuitem.set_submenu(gc_sub_menu) - self.add_bookmarks_list(gc_sub_menu, account) - # make some items insensitive if account is offline if not app.account_is_connected(account): for widget in (add_contact_menuitem, service_discovery_menuitem, - join_group_chat_menuitem, execute_command_menuitem, + execute_command_menuitem, view_certificate_menuitem, pep_menuitem): widget.set_sensitive(False) else: @@ -5345,34 +5303,6 @@ class RosterWindow: menu.append(item) item.connect('activate', self.on_history_manager_menuitem_activate) - def add_bookmarks_list(self, gc_sub_menu, account): - """ - Show join new group chat item and bookmarks list for an account - """ - item = Gtk.MenuItem.new_with_mnemonic(_('_Join New Group Chat')) - item.connect('activate', self.on_join_gc_activate, account) - gc_sub_menu.append(item) - item = Gtk.MenuItem.new_with_mnemonic(_('_Create Group Chat')) - item.connect('activate', self.on_create_gc_activate, account) - gc_sub_menu.append(item) - - # User has at least one bookmark. - con = app.connections[account] - if con.get_module('Bookmarks').bookmarks: - item = Gtk.SeparatorMenuItem.new() - gc_sub_menu.append(item) - - bookmarks = con.get_module('Bookmarks').get_sorted_bookmarks( - short_name=True) - for bookmark in bookmarks: - # Do not use underline. - item = Gtk.MenuItem.new_with_label(bookmark.name) - item.set_use_underline(False) - item.connect( - 'activate', self.on_bookmark_menuitem_activate, - account, bookmark) - gc_sub_menu.append(item) - def show_appropriate_context_menu(self, event, iters): # iters must be all of the same type model = self.modelfilter @@ -5413,19 +5343,6 @@ class RosterWindow: return True - def on_ctrl_j(self, accel_group, acceleratable, keyval, modifier): - """ - Bring up the conference join dialog, when CTRL+J accelerator is being - activated - """ - # find a connected account: - for account in app.connections: - if account == 'Local': - continue - if app.account_is_connected(account): - self.on_join_gc_activate(None, account) - return True - def fill_column(self, col): for rend in self.renderers_list: col.pack_start(rend[1], rend[2]) @@ -5731,12 +5648,6 @@ class RosterWindow: # transient for the roster window GLib.idle_add(_open_wizard) - # Setting CTRL+J to be the shortcut for bringing up the dialog to join a - # conference. - accel_group = Gtk.accel_groups_from_object(self.window)[0] - accel_group.connect(Gdk.KEY_j, Gdk.ModifierType.CONTROL_MASK, - Gtk.AccelFlags.MASK, self.on_ctrl_j) - # 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/commit/6955a7eafea1952e2f51e4258100f2a7be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6955a7eafea1952e2f51e4258100f2a7be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Avatars: Take display scale into consideration
by Philipp Hörist 13 Jul '19

13 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d53ef36c by Philipp Hörist at 2019-07-13T22:46:24Z Avatars: Take display scale into consideration - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -87,14 +87,17 @@ def clip_circle(surface): new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, surface.get_width(), surface.get_height()) + + new_surface.set_device_scale(*surface.get_device_scale()) context = cairo.Context(new_surface) context.set_source_surface(surface, 0, 0) width = surface.get_width() height = surface.get_height() - radius = width / 2 + scale = surface.get_device_scale()[0] + radius = width / 2 / scale - context.arc(width / 2, height / 2, radius, 0, 2 * pi) + context.arc(width / 2 / scale, height / 2 / scale, radius, 0, 2 * pi) context.clip() context.paint() @@ -239,4 +242,6 @@ class AvatarStorage(metaclass=Singleton): color_string = contact.jid color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) - return clip_circle(surface) + surface = clip_circle(surface) + surface.set_device_scale(scale, scale) + return surface View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d53ef36cd74fba907b1fddb34b0a81565e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d53ef36cd74fba907b1fddb34b0a81565e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Better integrate the global search
by Philipp Hörist 13 Jul '19

13 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d970409 by Philipp Hörist at 2019-07-13T19:51:24Z StartChat: Better integrate the global search - Add account selector - Add toggle button for global search - Disco MUCs found via global search - Light refactoring - - - - - 4 changed files: - gajim/data/gui/start_chat_dialog.ui - gajim/data/style/gajim.css - gajim/gtk/groupchat_info.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -2,84 +2,20 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkGrid" id="search_result_grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="name_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="jid_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="ellipsize">end</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">system-users-symbolic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="user_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Users</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> + <object class="GtkListStore" id="account_store"> + <columns> +  + <column type="GdkPixbuf"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> </object> <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can_focus">False</property> + <signal name="notify::visible-child-name" handler="_on_page_changed" swapped="no"/> <child> <object class="GtkBox" id="box"> <property name="visible">True</property> @@ -88,14 +24,50 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkSearchEntry" id="search_entry"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="is_focus">True</property> - <property name="primary_icon_name">edit-find-symbolic</property> - <property name="primary_icon_activatable">False</property> - <property name="primary_icon_sensitive">False</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="is_focus">True</property> + <property name="hexpand">True</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="global_search_toggle"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Global Group Chat Search</property> + <property name="halign">end</property> + <property name="relief">half</property> + <signal name="toggled" handler="_on_global_search_toggle" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">content-loading-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -304,143 +276,140 @@ <property name="position">3</property> </packing> </child> - </object> - <object class="GtkGrid" id="tooltip"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> <child> - <object class="GtkLabel" id="tooltip_name"> + <object class="GtkBox"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select Account</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <style> + <class name="bold16"/> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="account_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">account_store</property> + <property name="headers_visible">False</property> + <property name="enable_search">False</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">icon</property> + <child> + <object class="GtkCellRendererPixbuf" id="icon_pixbuf"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">account</property> + <child> + <object class="GtkCellRendererText" id="account_text"/> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + <style> + <class name="start-chat-treeview"/> + </style> + </object> + </child> + <style> + <class name="start-chat-scrolled"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Back</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Select</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_select_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> <style> - <class name="bold"/> + <class name="margin-18"/> </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="tooltip_jid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="ellipsize">end</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="tooltip_description"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="wrap">True</property> - <property name="max_width_chars">65</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="tooltip_name_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Name:</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="tooltip_description_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Description:</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Address:</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="tooltip_user"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="icon_name">system-users-symbolic</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="anonymous_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Semi-Anonymous -<span size="small">(Only moderators can see your XMPP-Address)</span></property> - <property name="use_markup">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="anonymous_icon"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="icon_name">security-medium-symbolic</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="name">account</property> + <property name="position">4</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -135,12 +135,10 @@ list.settings > row > box { font-weight: bold; color: @insensitive_fg_color;} -/* StartChatListBox */ -#StartChatListBox > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } -#StartChatListBox > row:last-child { border-bottom: 0px} -#StartChatListBox > row.activatable:active { box-shadow: none; } -#StartChatListBox > row { padding: 10px 20px 10px 10px; } -#StartChatListBox > row:not(.activatable) label { color: @insensitive_fg_color } +/* Start Chat Accounts Treeview */ +.start-chat-treeview { padding: 5px; } +.start-chat-treeview:focus {outline: none; } +.start-chat-scrolled { border: 1px solid; border-color:@unfocused_borders; } /* StartChatListBox */ .start-chat-row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } @@ -258,7 +256,6 @@ button.flat.link { padding: 0; border: 0; } /*Image Preview*/ .preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } - /* Treeview */ .adhoc-treeview { padding: 5px; } .adhoc-scrolled { border: 1px solid; border-color:@unfocused_borders; } ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -101,14 +101,21 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self._account = account + self._info = None self._ui = get_builder('groupchat_info_scrolled.ui') self.add(self._ui.info_grid) self._ui.connect_signals(self) self.show_all() + def get_account(self): + return self._account + def set_account(self, account): self._account = account + def get_jid(self): + return self._info.jid + def set_author(self, author, epoch_timestamp=None): if not author: return @@ -129,6 +136,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.subject_label.set_visible(True) def set_from_disco_info(self, info): + self._info = info # Set name has_name = bool(info.muc_name) self._ui.name.set_text(info.muc_name or '') ===================================== gajim/gtk/start_chat.py ===================================== @@ -23,7 +23,6 @@ from gi.repository import Pango from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import JID from nbxmpp.util import is_error_result -from nbxmpp.const import AnonymityMode from gajim.common import app from gajim.common import helpers @@ -39,7 +38,7 @@ from gajim.gtk.util import ensure_not_destroyed class Search(IntEnum): CONTACT = 0 - MUC = 1 + GLOBAL = 1 class StartChatDialog(Gtk.ApplicationWindow): @@ -62,9 +61,10 @@ class StartChatDialog(Gtk.ApplicationWindow): self.new_contact_row_visible = False self.new_contact_rows = {} self.new_groupchat_rows = {} - self.accounts = app.connections.keys() - self.add_contacts() - self.add_groupchats() + self._accounts = app.get_enabled_accounts_with_labels() + self._add_accounts() + self._add_contacts() + self._add_groupchats() self._ui.search_entry.connect('search-changed', self._on_search_changed) @@ -79,7 +79,9 @@ class StartChatDialog(Gtk.ApplicationWindow): self._ui.listbox.set_sort_func(self._sort_func, None) self._ui.listbox.connect('row-activated', self._on_row_activated) - self._muc_search_listbox = MUCSearch() + self._global_search_listbox = GlobalSearch() + self._global_search_listbox.connect('row-activated', + self._on_row_activated) self._current_listbox = self._ui.listbox self._muc_info_box = GroupChatInfoScrolled() @@ -95,9 +97,16 @@ class StartChatDialog(Gtk.ApplicationWindow): def set_search_text(self, text): self._ui.search_entry.set_text(text) - def add_contacts(self): - show_account = len(self.accounts) > 1 - for account in self.accounts: + def _global_search_active(self): + return self._ui.global_search_toggle.get_active() + + def _add_accounts(self): + for account in self._accounts: + self._ui.account_store.append([None, *account]) + + def _add_contacts(self): + show_account = len(self._accounts) > 1 + for account, _label in self._accounts: self.new_contact_rows[account] = None for jid in app.contacts.get_jid_list(account): contact = app.contacts.get_contact_with_highest_priority( @@ -108,9 +117,9 @@ class StartChatDialog(Gtk.ApplicationWindow): contact.get_shown_name(), show_account) self._ui.listbox.add(row) - def add_groupchats(self): - show_account = len(self.accounts) > 1 - for account in self.accounts: + def _add_groupchats(self): + show_account = len(self._accounts) > 1 + for account, _label in self._accounts: self.new_groupchat_rows[account] = None con = app.connections[account] bookmarks = con.get_module('Bookmarks').bookmarks @@ -131,42 +140,72 @@ class StartChatDialog(Gtk.ApplicationWindow): show_account, True) self._ui.listbox.add(row) + def _on_page_changed(self, stack, _param): + if stack.get_visible_child_name() == 'account': + self._ui.account_view.grab_focus() + def _on_row_activated(self, _listbox, row): - row = row.get_child() - self._start_new_chat(row) + if self._current_listbox_is(Search.GLOBAL): + self._select_muc() + else: + self._start_new_chat(row) + + def _select_muc(self): + if len(self._accounts) > 1: + self._ui.stack.set_visible_child_name('account') + else: + self._on_select_clicked() def _on_key_press(self, _widget, event): is_search = self._ui.stack.get_visible_child_name() == 'search' if event.keyval in (Gdk.KEY_Down, Gdk.KEY_Tab): - if is_search: + if not is_search: + return Gdk.EVENT_PROPAGATE + + if self._global_search_active(): + self._global_search_listbox.select_next() + else: self._ui.search_entry.emit('next-match') - return Gdk.EVENT_STOP - return Gdk.EVENT_PROPAGATE + return Gdk.EVENT_STOP if (event.state == Gdk.ModifierType.SHIFT_MASK and event.keyval == Gdk.KEY_ISO_Left_Tab): - if is_search: + if not is_search: + return Gdk.EVENT_PROPAGATE + + if self._global_search_active(): + self._global_search_listbox.select_prev() + else: self._ui.search_entry.emit('previous-match') - return Gdk.EVENT_STOP - return Gdk.EVENT_PROPAGATE + return Gdk.EVENT_STOP if event.keyval == Gdk.KEY_Up: - if is_search: + if not is_search: + return Gdk.EVENT_PROPAGATE + + if self._global_search_active(): + self._global_search_listbox.select_prev() + else: self._ui.search_entry.emit('previous-match') - return Gdk.EVENT_STOP - return Gdk.EVENT_PROPAGATE + return Gdk.EVENT_STOP if event.keyval == Gdk.KEY_Escape: if self._ui.stack.get_visible_child_name() == 'progress': self.destroy() return Gdk.EVENT_STOP + if self._ui.stack.get_visible_child_name() == 'account': + self._on_back_clicked() + return Gdk.EVENT_STOP + if self._ui.stack.get_visible_child_name() in ('error', 'info'): self._ui.stack.set_visible_child_name('search') return Gdk.EVENT_STOP self._search_stopped = True - self._muc_search_listbox.remove_all() + self._ui.search_entry.grab_focus() + self._scroll_to_first_row() + self._global_search_listbox.remove_all() if self._ui.search_entry.get_text() != '': self._ui.search_entry.emit('stop-search') else: @@ -177,6 +216,10 @@ class StartChatDialog(Gtk.ApplicationWindow): if self._ui.stack.get_visible_child_name() == 'progress': return Gdk.EVENT_STOP + if self._ui.stack.get_visible_child_name() == 'account': + self._on_select_clicked() + return Gdk.EVENT_STOP + if self._ui.stack.get_visible_child_name() == 'error': self._ui.stack.set_visible_child_name('search') return Gdk.EVENT_STOP @@ -185,9 +228,13 @@ class StartChatDialog(Gtk.ApplicationWindow): self._on_join_clicked() return Gdk.EVENT_STOP - if self._current_listbox_is(Search.MUC): - self._muc_search_listbox.remove_all() - self._start_search() + if self._current_listbox_is(Search.GLOBAL): + if self._ui.search_entry.is_focus(): + self._global_search_listbox.remove_all() + self._start_search() + + elif self._global_search_listbox.get_selected_row() is not None: + self._select_muc() return Gdk.EVENT_STOP row = self._ui.listbox.get_selected_row() @@ -204,7 +251,7 @@ class StartChatDialog(Gtk.ApplicationWindow): try: JID(row.jid) except InvalidJid as error: - self._show_error_page(str(error)) + self._show_error_page(error) return if row.groupchat: @@ -215,8 +262,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._disco_muc(row.account, row.jid) else: app.interface.new_chat_from_jid(row.account, row.jid) - - self.ready_to_destroy = True + self.ready_to_destroy = True def _disco_muc(self, account, jid): self._ui.stack.set_visible_child_name('progress') @@ -245,17 +291,37 @@ class StartChatDialog(Gtk.ApplicationWindow): self._show_error_page(MUC_DISCO_ERRORS[error_code]) def _show_error_page(self, text): - self._ui.error_label.set_text(text) + self._ui.error_label.set_text(str(text)) self._ui.stack.set_visible_child_name('error') def _on_join_clicked(self, _button=None): - row = self._ui.listbox.get_selected_row().get_child() - app.interface.join_gc_minimal(row.account, row.jid) + account = self._muc_info_box.get_account() + jid = self._muc_info_box.get_jid() + app.interface.join_gc_minimal(account, str(jid)) self.ready_to_destroy = True - def _on_back_clicked(self, _button): + def _on_back_clicked(self, _button=None): self._ui.stack.set_visible_child_name('search') + def _on_select_clicked(self, _button=None): + model, iter_ = self._ui.account_view.get_selection().get_selected() + if iter_ is not None: + account = model[iter_][1] + elif len(self._accounts) == 1: + account = self._accounts[0][0] + else: + return + + selected_row = self._global_search_listbox.get_selected_row() + if selected_row is None: + return + + if not app.account_is_connected(account): + self._show_error_page(_('You can not join a group chat ' + 'unless you are connected.')) + return + self._disco_muc(account, selected_row.jid) + def _set_listbox(self, listbox): if self._current_listbox == listbox: return @@ -268,15 +334,24 @@ class StartChatDialog(Gtk.ApplicationWindow): def _current_listbox_is(self, box): if self._current_listbox == self._ui.listbox: return box == Search.CONTACT - return box == Search.MUC + return box == Search.GLOBAL + + def _on_global_search_toggle(self, button): + self._ui.search_entry.set_text('') + self._ui.search_entry.grab_focus() + if button.get_active(): + self._set_listbox(self._global_search_listbox) + self._remove_new_jid_row() + self._ui.listbox.invalidate_filter() + else: + self._set_listbox(self._ui.listbox) + self._global_search_listbox.remove_all() def _on_search_changed(self, entry): - search_text = entry.get_text() - if search_text.startswith('g:'): - self._set_listbox(self._muc_search_listbox) + if self._global_search_active(): return - self._set_listbox(self._ui.listbox) + search_text = entry.get_text() if '@' in search_text: self._add_new_jid_row() self._update_new_jid_rows(search_text) @@ -288,7 +363,7 @@ class StartChatDialog(Gtk.ApplicationWindow): if self.new_contact_row_visible: return for account in self.new_contact_rows: - show_account = len(self.accounts) > 1 + show_account = len(self._accounts) > 1 row = ContactRow(account, None, '', None, show_account) self.new_contact_rows[account] = row group_row = ContactRow(account, None, '', None, show_account, True) @@ -342,10 +417,13 @@ class StartChatDialog(Gtk.ApplicationWindow): first_row = self._ui.listbox.get_row_at_y(0) self._ui.listbox.select_row(first_row) + def _scroll_to_first_row(self): + self._ui.scrolledwindow.get_vadjustment().set_value(0) + def _filter_func(self, row, _user_data): search_text = self._ui.search_entry.get_text().lower() search_text_list = search_text.split() - row_text = row.get_child().get_search_text().lower() + row_text = row.get_search_text().lower() for text in search_text_list: if text not in row_text: GLib.timeout_add(50, self.select_first_row) @@ -355,14 +433,14 @@ class StartChatDialog(Gtk.ApplicationWindow): @staticmethod def _sort_func(row1, row2, _user_data): - name1 = row1.get_child().get_search_text() - name2 = row2.get_child().get_search_text() - account1 = row1.get_child().account - account2 = row2.get_child().account - is_groupchat1 = row1.get_child().groupchat - is_groupchat2 = row2.get_child().groupchat - new1 = row1.get_child().new - new2 = row2.get_child().new + name1 = row1.get_search_text() + name2 = row2.get_search_text() + account1 = row1.account + account2 = row2.account + is_groupchat1 = row1.groupchat + is_groupchat2 = row2.groupchat + new1 = row1.new + new2 = row2.new result = locale.strcoll(account1.lower(), account2.lower()) if result != 0: @@ -376,23 +454,15 @@ class StartChatDialog(Gtk.ApplicationWindow): return locale.strcoll(name1.lower(), name2.lower()) - @staticmethod - def _get_connection(): - accounts = app.get_connected_accounts() - if not accounts: - raise NotConnected - return app.connections[accounts.pop()].connection - def _start_search(self): self._search_stopped = False - try: - con = self._get_connection() - except NotConnected: + accounts = app.get_connected_accounts() + if not accounts: return + con = app.connections[accounts[0]].connection - text = self._ui.search_entry.get_text() - text = text[2:].strip() - self._muc_search_listbox.start_search() + text = self._ui.search_entry.get_text().strip() + self._global_search_listbox.start_search() if self._parameter_form is None: con.get_module('Muclumbus').request_parameters( @@ -411,7 +481,8 @@ class StartChatDialog(Gtk.ApplicationWindow): @ensure_not_destroyed def _parameters_received(self, result, user_data): if is_error_result(result): - self._on_error(result) + self._global_search_listbox.remove_progress() + self._show_error_page(result.message) return con, text = user_data @@ -431,14 +502,15 @@ class StartChatDialog(Gtk.ApplicationWindow): return if is_error_result(result): - self._on_error(result) + self._global_search_listbox.remove_progress() + self._show_error_page(result.message) return for item in result.items: - self._muc_search_listbox.add(ResultRow(item)) + self._global_search_listbox.add(ResultRow(item)) if result.end: - self._muc_search_listbox.end_search() + self._global_search_listbox.end_search() return con.get_module('Muclumbus').set_search( @@ -449,19 +521,15 @@ class StartChatDialog(Gtk.ApplicationWindow): callback=self._on_search_result, user_data=con) - def _on_error(self, result): - self._muc_search_listbox.show_error(result) - def _destroy(self, *args): self._destroyed = True -class ContactRow(Gtk.Grid): +class ContactRow(Gtk.ListBoxRow): def __init__(self, account, contact, jid, name, show_account, groupchat=False): - Gtk.Grid.__init__(self) - self.set_column_spacing(12) - self.set_size_request(260, -1) + Gtk.ListBoxRow.__init__(self) + self.get_style_context().add_class('start-chat-row') self.account = account self.account_label = app.get_account_label(account) self.show_account = show_account @@ -471,6 +539,11 @@ class ContactRow(Gtk.Grid): self.groupchat = groupchat self.new = jid == '' + + grid = Gtk.Grid() + grid.set_column_spacing(12) + grid.set_size_request(260, -1) + if self.groupchat: muc_icon = get_icon_name( 'muc-inactive' if self.new else 'muc-active') @@ -486,7 +559,7 @@ class ContactRow(Gtk.Grid): image = Gtk.Image.new_from_surface(avatar) image.set_size_request(AvatarSize.CHAT, AvatarSize.CHAT) - self.add(image) + grid.add(image) middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) middle_box.set_hexpand(True) @@ -518,7 +591,7 @@ class ContactRow(Gtk.Grid): self.jid_label.get_style_context().add_class('dim-label') middle_box.add(self.jid_label) - self.add(middle_box) + grid.add(middle_box) if show_account: account_label = Gtk.Label(label=self.account_label) @@ -528,8 +601,9 @@ class ContactRow(Gtk.Grid): right_box = Gtk.Box() right_box.set_vexpand(True) right_box.add(account_label) - self.add(right_box) + grid.add(right_box) + self.add(grid) self.show_all() def update_jid(self, jid): @@ -544,16 +618,12 @@ class ContactRow(Gtk.Grid): return '%s %s' % (self.name, self.jid) -class MUCSearch(Gtk.ListBox): +class GlobalSearch(Gtk.ListBox): def __init__(self): Gtk.ListBox.__init__(self) self.set_has_tooltip(True) self.set_activate_on_single_click(False) self._progress = None - - self._ui = get_builder('start_chat_dialog.ui', ['tooltip']) - self.connect('query-tooltip', self._query_tooltip) - self.connect('row-activated', self._on_row_activated) self.show_all() def remove_all(self): @@ -562,8 +632,7 @@ class MUCSearch(Gtk.ListBox): row.destroy() self.foreach(remove) - def show_error(self, error): - self.insert(ErrorRow(error), 0) + def remove_progress(self): self.remove(self._progress) self._progress.destroy() @@ -576,44 +645,36 @@ class MUCSearch(Gtk.ListBox): def add(self, row): super().add(row) + if self.get_selected_row() is None: + row = self.get_row_at_index(1) + if row is not None: + self.select_row(row) + row.grab_focus() self._progress.update() - def _query_tooltip(self, _widget, _x_pos, y_pos, _keyboard_mode, tooltip): - row = self.get_row_at_y(y_pos) - if row is None or not isinstance(row, ResultRow): - self._clear_tooltip() - return False - - if row.item.anonymity_mode == AnonymityMode.SEMI: - self._ui.anonymous_icon.show() - self._ui.anonymous_label.show() - - self._ui.tooltip_user.set_text(row.item.nusers) - self._ui.tooltip_jid.set_text(row.item.jid) - if row.item.description: - self._ui.tooltip_description.set_text(row.item.description) - self._ui.tooltip_description.show() - self._ui.tooltip_description_label.show() - - if row.item.name: - self._ui.tooltip_name.set_text(row.item.name) - self._ui.tooltip_name.show() - self._ui.tooltip_name_label.show() - - tooltip.set_custom(self._ui.tooltip) - return True + def _select(self, direction): + selected_row = self.get_selected_row() + if selected_row is None: + return - def _clear_tooltip(self): - self._ui.anonymous_icon.hide() - self._ui.anonymous_label.hide() - self._ui.tooltip_description.hide() - self._ui.tooltip_description_label.hide() - self._ui.tooltip_name.hide() - self._ui.tooltip_name_label.hide() + index = selected_row.get_index() + if direction == 'next': + index += 1 + else: + index -= 1 - @staticmethod - def _on_row_activated(_listbox, row): - app.interface.join_gc_minimal(None, row.item.jid) + new_selected_row = self.get_row_at_index(index) + if new_selected_row is None: + return + + self.select_row(new_selected_row) + new_selected_row.grab_focus() + + def select_next(self): + self._select('next') + + def select_prev(self): + self._select('prev') class ResultRow(Gtk.ListBoxRow): @@ -621,33 +682,23 @@ class ResultRow(Gtk.ListBoxRow): Gtk.ListBoxRow.__init__(self) self.set_activatable(True) self.get_style_context().add_class('start-chat-row') - self.item = item - self._ui = get_builder('start_chat_dialog.ui', ['search_result_grid']) - self._ui.jid_label.set_text(item.jid) - self._ui.name_label.set_text(item.name) - self._ui.user_label.set_text(item.nusers) - self.add(self._ui.search_result_grid) - self.show_all() + self.new = False + self.jid = item.jid + self.groupchat = True + + name_label = Gtk.Label(label=item.name) + name_label.set_halign(Gtk.Align.START) + name_label.set_ellipsize(Pango.EllipsizeMode.END) + name_label.set_max_width_chars(40) + name_label.get_style_context().add_class('bold16') + jid_label = Gtk.Label(label=item.jid) + jid_label.set_halign(Gtk.Align.START) + jid_label.set_ellipsize(Pango.EllipsizeMode.END) + jid_label.set_max_width_chars(40) + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + box.add(name_label) + box.add(jid_label) - -class ErrorRow(Gtk.ListBoxRow): - def __init__(self, error): - Gtk.ListBoxRow.__init__(self) - self.set_selectable(False) - self.set_activatable(False) - self.get_style_context().add_class('start-chat-row') - self._error = Gtk.Label(label=str(error)) - self._error.set_line_wrap(True) - self._error.set_line_wrap_mode(Pango.WrapMode.WORD) - self._error.set_xalign(0) - self._error_image = Gtk.Image.new_from_icon_name( - 'dialog-error', Gtk.IconSize.MENU) - self._error_image.get_style_context().add_class('error-color') - self._error_image.set_valign(Gtk.Align.CENTER) - box = Gtk.Box() - box.set_spacing(6) - box.add(self._error_image) - box.add(self._error) self.add(box) self.show_all() @@ -685,7 +736,3 @@ class ProgressRow(Gtk.ListBoxRow): self._spinner.stop() self._spinner.hide() self._finished_image.show() - - -class NotConnected(Exception): - pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d97040956b2602deecfe274f3ed23335f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d97040956b2602deecfe274f3ed23335f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move muclumbus api JID to config
by Philipp Hörist 12 Jul '19

12 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cbc01eb by Philipp Hörist at 2019-07-12T21:43:09Z Move muclumbus api JID to config - - - - - 2 changed files: - gajim/common/config.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/config.py ===================================== @@ -294,6 +294,7 @@ class Config: 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')], 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')], + 'muclumbus_api_jid': [opt_str, 'rodrigo.de.mucobedo(a)dreckshal.de'], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/gtk/start_chat.py ===================================== @@ -37,9 +37,6 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import ensure_not_destroyed -SERVICE_JID = 'rodrigo.de.mucobedo(a)dreckshal.de' - - class Search(IntEnum): CONTACT = 0 MUC = 1 @@ -399,14 +396,14 @@ class StartChatDialog(Gtk.ApplicationWindow): if self._parameter_form is None: con.get_module('Muclumbus').request_parameters( - SERVICE_JID, + app.config.get('muclumbus_api_jid'), callback=self._parameters_received, user_data=(con, text)) else: self._parameter_form.vars['q'].value = text con.get_module('Muclumbus').set_search( - SERVICE_JID, + app.config.get('muclumbus_api_jid'), self._parameter_form, callback=self._on_search_result, user_data=con) @@ -423,7 +420,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._parameter_form.vars['q'].value = text con.get_module('Muclumbus').set_search( - SERVICE_JID, + app.config.get('muclumbus_api_jid'), self._parameter_form, callback=self._on_search_result, user_data=con) @@ -445,7 +442,7 @@ class StartChatDialog(Gtk.ApplicationWindow): return con.get_module('Muclumbus').set_search( - SERVICE_JID, + app.config.get('muclumbus_api_jid'), self._parameter_form, items_per_page=result.max, after=result.last, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cbc01ebf66a274bb06c62d6b968f9aedf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7cbc01ebf66a274bb06c62d6b968f9aedf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DiscoInfo: Add more propertys
by Philipp Hörist 12 Jul '19

12 Jul '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7b7746b7 by Philipp Hörist at 2019-07-12T13:25:12Z DiscoInfo: Add more propertys - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -147,6 +147,28 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' except Exception: continue + def supports(self, feature): + return feature in self.features + + @property + def mam_namespace(self): + if NS_MAM_2 in self.features: + return NS_MAM_2 + if NS_MAM_1 in self.features: + return NS_MAM_1 + + @property + def has_mam_2(self): + return NS_MAM_2 in self.features + + @property + def has_mam_1(self): + return NS_MAM_1 in self.features + + @property + def has_mam(self): + return self.has_mam_1 or self.has_mam_2 + @property def is_muc(self): for identity in self.identities: @@ -192,10 +214,6 @@ class DiscoInfo(namedtuple('DiscoInfo', 'jid node identities features dataforms' def muc_lang(self): return self._get_form_value(NS_MUC_INFO, 'muc#roominfo_lang') - @property - def muc_has_mam(self): - return NS_MAM_2 in self.features or NS_MAM_1 in self.features - @property def muc_is_persistent(self): return 'muc_persistent' in self.features View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7b7746b7089b21fce460a5c2b5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7b7746b7089b21fce460a5c2b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: StartChat: Use JID arg for start-chat action
by Philipp Hörist 11 Jul '19

11 Jul '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 25e31bd5 by Philipp Hörist at 2019-07-10T16:36:18Z StartChat: Use JID arg for start-chat action - - - - - 799c284e by Philipp Hörist at 2019-07-10T16:53:43Z MUC: Fix joining with bookmark - - - - - 5586a209 by Philipp Hörist at 2019-07-10T17:34:07Z CmdLine: Use new Join Group Chat dialog If there is only one account active we use the GroupchatJoin, else the jid is passed to StartChat - - - - - b6c26e57 by Philipp Hörist at 2019-07-11T21:29:49Z StartChat: Integrate Groupchat info - - - - - 7f33ecfb by Philipp Hörist at 2019-07-11T21:31:33Z StartChat: Fix some pylint errors - - - - - 8 changed files: - gajim/application.py - gajim/data/gui/start_chat_dialog.ui - gajim/data/style/gajim.css - gajim/dialog_messages.py - gajim/gtk/groupchat_info.py - gajim/gtk/start_chat.py - gajim/gui_interface.py - gajim/remote_control.py Changes: ===================================== gajim/application.py ===================================== @@ -39,6 +39,8 @@ from pathlib import Path from urllib.parse import unquote import nbxmpp +from nbxmpp import JID +from nbxmpp.protocol import InvalidJid from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk @@ -236,6 +238,10 @@ class GajimApplication(Gtk.Application): self._on_feature_discovered) def _open_uris(self, uris): + accounts = list(app.connections.keys()) + if not accounts: + return + for uri in uris: app.log('uri_handler').info('open %s', uri) if not uri.startswith('xmpp:'): @@ -247,10 +253,30 @@ class GajimApplication(Gtk.Application): except ValueError: # No query argument jid, cmd = uri, 'message' + + try: + jid = JID(jid) + except InvalidJid as error: + app.log('uri_handler').warning('Invalid JID %s: %s', uri, error) + continue + + if cmd == 'join' and jid.getResource(): + app.log('uri_handler').warning('Invalid MUC JID %s', uri) + continue + + jid = str(jid) + if cmd == 'join': - self.interface.join_gc_minimal(None, jid) + if len(accounts) == 1: + self.activate_action( + 'groupchat-join', + GLib.Variant('as', [accounts[0], jid])) + else: + self.activate_action('start-chat', GLib.Variant('s', jid)) + elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) + elif cmd.startswith('message'): attributes = cmd.split(';') message = None @@ -261,15 +287,11 @@ class GajimApplication(Gtk.Application): message = unquote(key.split('=')[1]) except Exception: app.log('uri_handler').error('Invalid URI: %s', cmd) - accounts = list(app.connections.keys()) - if not accounts: - continue + if len(accounts) == 1: app.interface.new_chat_from_jid(accounts[0], jid, message) else: - self.activate_action('start-chat', GLib.Variant('s', '')) - start_chat = app.get_app_window('StartChatDialog') - start_chat.set_search_text(jid) + self.activate_action('start-chat', GLib.Variant('s', jid)) def do_shutdown(self, *args): Gtk.Application.do_shutdown(self) ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -2,57 +2,6 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkBox" id="box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="is_focus">True</property> - <property name="primary_icon_name">edit-find-symbolic</property> - <property name="primary_icon_activatable">False</property> - <property name="primary_icon_sensitive">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkListBox" id="listbox"> - <property name="name">StartChatListBox</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="selection_mode">browse</property> - <property name="activate_on_single_click">False</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> <object class="GtkGrid" id="search_result_grid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -128,6 +77,234 @@ </packing> </child> </object> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="is_focus">True</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkListBox" id="listbox"> + <property name="name">StartChatListBox</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="selection_mode">browse</property> + <property name="activate_on_single_click">False</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">search</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkSpinner" id="spinner"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + <property name="active">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">progress</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="icon_name">dialog-error</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="error_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Back</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + <packing> + <property name="name">error</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="info_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Back</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Join</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_join_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + <packing> + <property name="name">info</property> + <property name="position">3</property> + </packing> + </child> + </object> <object class="GtkGrid" id="tooltip"> <property name="visible">True</property> <property name="can_focus">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -227,6 +227,7 @@ list.settings > row > box { /* Padding/Margins */ .margin-top6 { margin-top: 6px; } .margin-12 { margin: 12px; } +.margin-18 { margin: 18px; } /* Treeview */ treeview.space { padding: 6px; } ===================================== gajim/dialog_messages.py ===================================== @@ -27,11 +27,6 @@ from gajim.gtk.dialogs import InformationDialog Message = namedtuple('Message', ['title', 'text', 'dialog']) messages = { - 'start-chat-not-connected': Message( - _('You are not connected to the server'), - _('You can not start a new conversation unless you are connected.'), - ErrorDialog), - 'invalid-jid-with-error': Message( _('Invalid JID'), '%s', ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -93,9 +93,10 @@ MUC_FEATURES = { class GroupChatInfoScrolled(Gtk.ScrolledWindow): - def __init__(self, account): + def __init__(self, account=None): Gtk.ScrolledWindow.__init__(self) self.set_size_request(400, -1) + self.set_vexpand(True) self.set_min_content_height(400) self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) @@ -105,6 +106,9 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): self._ui.connect_signals(self) self.show_all() + def set_account(self, account): + self._account = account + def set_author(self, author, epoch_timestamp=None): if not author: return @@ -181,6 +185,11 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): def _add_features(self, features): grid = self._ui.info_grid + for row in range(30, 9, -1): + # Remove everything from row 30 to 10 + # We probably will never have 30 rows and + # there is no method to count grid rows + grid.remove_row(row) features = list(features) has_mam = NS_MAM_2 in features or NS_MAM_1 in features ===================================== gajim/gtk/start_chat.py ===================================== @@ -20,6 +20,8 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango +from nbxmpp.protocol import InvalidJid +from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.const import AnonymityMode @@ -27,7 +29,9 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.const import AvatarSize +from gajim.common.const import MUC_DISCO_ERRORS +from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder from gajim.gtk.util import ensure_not_destroyed @@ -56,7 +60,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._search_stopped = False self._ui = get_builder('start_chat_dialog.ui') - self.add(self._ui.box) + self.add(self._ui.stack) self.new_contact_row_visible = False self.new_contact_rows = {} @@ -81,10 +85,14 @@ class StartChatDialog(Gtk.ApplicationWindow): self._muc_search_listbox = MUCSearch() self._current_listbox = self._ui.listbox + self._muc_info_box = GroupChatInfoScrolled() + self._ui.info_box.add(self._muc_info_box) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._destroy) self.select_first_row() + self._ui.connect_signals(self) self.show_all() def set_search_text(self, text): @@ -126,64 +134,131 @@ class StartChatDialog(Gtk.ApplicationWindow): show_account, True) self._ui.listbox.add(row) - def _on_row_activated(self, listbox, row): + def _on_row_activated(self, _listbox, row): row = row.get_child() self._start_new_chat(row) - def _on_key_press(self, widget, event): + def _on_key_press(self, _widget, event): + is_search = self._ui.stack.get_visible_child_name() == 'search' if event.keyval in (Gdk.KEY_Down, Gdk.KEY_Tab): - self._ui.search_entry.emit('next-match') - return True + if is_search: + self._ui.search_entry.emit('next-match') + return Gdk.EVENT_STOP + return Gdk.EVENT_PROPAGATE if (event.state == Gdk.ModifierType.SHIFT_MASK and event.keyval == Gdk.KEY_ISO_Left_Tab): - self._ui.search_entry.emit('previous-match') - return True + if is_search: + self._ui.search_entry.emit('previous-match') + return Gdk.EVENT_STOP + return Gdk.EVENT_PROPAGATE if event.keyval == Gdk.KEY_Up: - self._ui.search_entry.emit('previous-match') - return True + if is_search: + self._ui.search_entry.emit('previous-match') + return Gdk.EVENT_STOP + return Gdk.EVENT_PROPAGATE if event.keyval == Gdk.KEY_Escape: + if self._ui.stack.get_visible_child_name() == 'progress': + self.destroy() + return Gdk.EVENT_STOP + + if self._ui.stack.get_visible_child_name() in ('error', 'info'): + self._ui.stack.set_visible_child_name('search') + return Gdk.EVENT_STOP + self._search_stopped = True self._muc_search_listbox.remove_all() if self._ui.search_entry.get_text() != '': self._ui.search_entry.emit('stop-search') else: self.destroy() - return True + return Gdk.EVENT_STOP if event.keyval == Gdk.KEY_Return: + if self._ui.stack.get_visible_child_name() == 'progress': + return Gdk.EVENT_STOP + + if self._ui.stack.get_visible_child_name() == 'error': + self._ui.stack.set_visible_child_name('search') + return Gdk.EVENT_STOP + + if self._ui.stack.get_visible_child_name() == 'info': + self._on_join_clicked() + return Gdk.EVENT_STOP + if self._current_listbox_is(Search.MUC): self._muc_search_listbox.remove_all() self._start_search() - return True + return Gdk.EVENT_STOP row = self._ui.listbox.get_selected_row() if row is not None: row.emit('activate') - return True + return Gdk.EVENT_STOP - self._ui.search_entry.grab_focus_without_selecting() + if is_search: + self._ui.search_entry.grab_focus_without_selecting() + return Gdk.EVENT_PROPAGATE def _start_new_chat(self, row): if row.new: - if not app.account_is_connected(row.account): - app.interface.raise_dialog('start-chat-not-connected') - return try: - helpers.parse_jid(row.jid) - except helpers.InvalidFormat as e: - app.interface.raise_dialog('invalid-jid-with-error', str(e)) + JID(row.jid) + except InvalidJid as error: + self._show_error_page(str(error)) return if row.groupchat: - app.interface.join_gc_minimal(row.account, row.jid) + if not app.account_is_connected(row.account): + self._show_error_page(_('You can not join a group chat ' + 'unless you are connected.')) + return + self._disco_muc(row.account, row.jid) else: app.interface.new_chat_from_jid(row.account, row.jid) self.ready_to_destroy = True + def _disco_muc(self, account, jid): + self._ui.stack.set_visible_child_name('progress') + con = app.connections[account] + con.get_module('Discovery').disco_info( + jid, callback=self._disco_info_received, user_data=account) + + @ensure_not_destroyed + def _disco_info_received(self, result, account): + if is_error_result(result): + self._set_error(result) + + elif result.is_muc: + self._muc_info_box.set_account(account) + self._muc_info_box.set_from_disco_info(result) + self._ui.stack.set_visible_child_name('info') + + else: + self._set_error_from_code('not-muc-service') + + def _set_error(self, error): + text = MUC_DISCO_ERRORS.get(error.type, str(error)) + self._show_error_page(text) + + def _set_error_from_code(self, error_code): + self._show_error_page(MUC_DISCO_ERRORS[error_code]) + + def _show_error_page(self, text): + self._ui.error_label.set_text(text) + self._ui.stack.set_visible_child_name('error') + + def _on_join_clicked(self, _button=None): + row = self._ui.listbox.get_selected_row().get_child() + app.interface.join_gc_minimal(row.account, row.jid) + self.ready_to_destroy = True + + def _on_back_clicked(self, _button): + self._ui.stack.set_visible_child_name('search') + def _set_listbox(self, listbox): if self._current_listbox == listbox: return @@ -241,7 +316,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self.new_contact_rows[account].update_jid(search_text) self.new_groupchat_rows[account].update_jid(search_text) - def _select_new_match(self, entry, direction): + def _select_new_match(self, _entry, direction): selected_row = self._ui.listbox.get_selected_row() if selected_row is None: return @@ -270,19 +345,19 @@ class StartChatDialog(Gtk.ApplicationWindow): first_row = self._ui.listbox.get_row_at_y(0) self._ui.listbox.select_row(first_row) - def _filter_func(self, row, user_data): + def _filter_func(self, row, _user_data): search_text = self._ui.search_entry.get_text().lower() search_text_list = search_text.split() row_text = row.get_child().get_search_text().lower() for text in search_text_list: if text not in row_text: GLib.timeout_add(50, self.select_first_row) - return + return None GLib.timeout_add(50, self.select_first_row) return True @staticmethod - def _sort_func(row1, row2, user_data): + def _sort_func(row1, row2, _user_data): name1 = row1.get_child().get_search_text() name2 = row2.get_child().get_search_text() account1 = row1.get_child().account @@ -539,7 +614,8 @@ class MUCSearch(Gtk.ListBox): self._ui.tooltip_name.hide() self._ui.tooltip_name_label.hide() - def _on_row_activated(self, _listbox, row): + @staticmethod + def _on_row_activated(_listbox, row): app.interface.join_gc_minimal(None, row.item.jid) ===================================== gajim/gui_interface.py ===================================== @@ -1441,7 +1441,7 @@ class Interface: bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) if bookmark is not None: app.interface.join_gc_room( - account, bookmark.jid, bookmark.nick, bookmark.password) + account, str(bookmark.jid), bookmark.nick, bookmark.password) return try: ===================================== gajim/remote_control.py ===================================== @@ -221,7 +221,7 @@ class GajimRemote(Server): <method name='show_next_pending_event' /> <method name='show_roster' /> <method name='start_chat'> - <arg name='account' type='s' /> + <arg name='jid' type='s' /> <arg direction='out' type='b' /> </method> <method name='toggle_ipython' /> @@ -884,11 +884,8 @@ class GajimRemote(Server): unread -= 1 return str(unread) - def start_chat(self, account): - if not account: - # error is shown in gajim-remote check_arguments(..) - return False - app.app.activate_action('start-chat', GLib.Variant('s', '')) + def start_chat(self, jid=''): + app.app.activate_action('start-chat', GLib.Variant('s', jid)) return True def send_xml(self, xml, account): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/58cfd1e44fe99b31f0bdf4d928c268e1b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/58cfd1e44fe99b31f0bdf4d928c268e1b… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits