Commits January 2018

commits@gajim.org

1 participants
59 discussions

[Git][gajim/gajim][master] Dont set Avatar if there is none
by Philipp Hörist 30 Jan '18

30 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 258c7922 by Philipp Hörist at 2018-01-30T23:40:15+01:00 Dont set Avatar if there is none Fixes #8878 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -4843,8 +4843,9 @@ class RosterWindow: return image = model[titer][Column.AVATAR_IMG] - surface = image.get_property('surface') - renderer.set_property('surface', surface) + if image is not None: + surface = image.get_property('surface') + renderer.set_property('surface', surface) # allocate space for the icon only if needed if model[titer][Column.AVATAR_IMG] or \ app.config.get('avatar_position_in_roster') == 'left': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/258c7922a585b171abecbe77b12173b2f7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/258c7922a585b171abecbe77b12173b2f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Only use logind listener on linux
by Philipp Hörist 29 Jan '18

29 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6deedb17 by Philipp Hörist at 2018-01-29T23:12:58+01:00 Only use logind listener on linux - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2879,10 +2879,9 @@ class Interface: self.remote_ctrl = None - from gajim import logind_listener - # Handle screensaver if sys.platform == 'linux': + from gajim import logind_listener from gajim import screensaver_listener self.show_vcard_when_connect = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6deedb1743fa78604cfbaf67a179f9ce91… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6deedb1743fa78604cfbaf67a179f9ce91… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused method
by Philipp Hörist 29 Jan '18

29 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f73b03d by Philipp Hörist at 2018-01-29T20:08:37+01:00 Remove unused method - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -572,15 +572,6 @@ def load_iconset(path, pixbuf2=None, transport=False): 'offline', 'error', 'requested', 'event', 'not in roster') return _load_icon_list(list_, path, pixbuf2) -def load_icon(icon_name): - """ - Load an icon from the iconset in 16x16 - """ - iconset = app.config.get('iconset') - path = os.path.join(helpers.get_iconset_path(iconset), '16x16', '') - icon_list = _load_icon_list([icon_name], path) - return icon_list[icon_name] - def load_mood_icon(icon_name): """ Load an icon from the mood iconset in 16x16 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f73b03d360a9b81100cb6606a58aaa9f6… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f73b03d360a9b81100cb6606a58aaa9f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use IconTheme for some icons
by Philipp Hörist 29 Jan '18

29 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c5c717dd by Philipp Hörist at 2018-01-29T20:02:30+01:00 Use IconTheme for some icons - - - - - 3 changed files: - gajim/dialogs.py - gajim/groupchat_control.py - gajim/message_window.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1319,7 +1319,7 @@ class AboutDialog(Gtk.AboutDialog): self.add_credit_section('Thanks', thanks) self.set_translator_credits(_('translator-credits')) - self.set_logo(gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128)) + self.set_logo_icon_name('org.gajim.Gajim') self.connect( 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -984,12 +984,11 @@ class GroupchatControl(ChatControlBase): return (label_str, color) def get_tab_image(self, count_unread=True): - # Set tab image (always 16x16) tab_image = None if app.gc_connected[self.account][self.room_jid]: - tab_image = gtkgui_helpers.load_icon('muc_active') + tab_image = gtkgui_helpers.get_iconset_name_for('muc-active') else: - tab_image = gtkgui_helpers.load_icon('muc_inactive') + tab_image = gtkgui_helpers.get_iconset_name_for('muc-inactive') return tab_image def update_ui(self): ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -483,13 +483,15 @@ class MessageWindow(object): pass # keep default icon elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE: if self.type_ == 'gc': - icon = gtkgui_helpers.load_icon('muc_active') + icon = gtkgui_helpers.get_iconset_name_for('muc-active') else: # chat, pm - icon = gtkgui_helpers.load_icon('online') + icon = 'org.gajim.Gajim' if icon: if isinstance(icon, GdkPixbuf.Pixbuf): self.window.set_icon(icon) + elif isinstance(icon, str): + self.window.set_icon_name(icon) else: self.window.set_icon(icon.get_pixbuf()) @@ -685,6 +687,8 @@ class MessageWindow(object): status_img.set_from_animation(tab_img.get_animation()) else: status_img.set_from_pixbuf(tab_img.get_pixbuf()) + elif isinstance(tab_img, str): + status_img.set_from_icon_name(tab_img, Gtk.IconSize.MENU) else: status_img.set_from_surface(tab_img) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c5c717ddd17bf681a4d12273e2801849be… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c5c717ddd17bf681a4d12273e2801849be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 12 commits: Move icons to hicolor folder
by Philipp Hörist 29 Jan '18

29 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 440b6e48 by Philipp Hörist at 2018-01-29T00:06:21+01:00 Move icons to hicolor folder also add svg images for scaling - - - - - 232dc1dd by Philipp Hörist at 2018-01-29T00:06:31+01:00 Scale Avatars for HiDPI Screens - - - - - c983b1f5 by Philipp Hörist at 2018-01-29T00:06:31+01:00 Set padlock icon correctly - - - - - 749fcc1b by Philipp Hörist at 2018-01-29T00:06:31+01:00 Set enryption icon correctly - - - - - adb326a5 by Philipp Hörist at 2018-01-29T00:06:31+01:00 Refactor StatusComboBox - Move as much code as possible into Glade file - Pull icons from the IconsTheme (because of HiDPI scaling) - - - - - dd12584f by Philipp Hörist at 2018-01-29T00:06:32+01:00 Use icons from IconTheme for ChatControl Banner It will correctly scale on HiDPI Displays if we set it like that - - - - - cb90d469 by Philipp Hörist at 2018-01-29T00:06:40+01:00 Use icons from IconTheme for StatusIcon - - - - - 2c2e946a by Philipp Hörist at 2018-01-29T00:06:46+01:00 Use icons from IconTheme in HistoryWindow - - - - - 4f92142d by Philipp Hörist at 2018-01-29T00:06:46+01:00 Use icons from IconTheme in Dialogs - - - - - e19f7ef9 by Philipp Hörist at 2018-01-29T00:06:46+01:00 Use icons from IconTheme in TransformChatToMUC - - - - - 762617e0 by Philipp Hörist at 2018-01-29T00:06:46+01:00 Use icons from IconTheme for Groupchat Roster - - - - - bb9b949f by Philipp Hörist at 2018-01-29T18:14:19+01:00 Merge branch 'master' into 'master' Improvements for HiDPI See merge request gajim/gajim!203 - - - - - 30 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/const.py - gajim/common/contacts.py - gajim/data/gui/chat_control.ui - gajim/data/gui/chat_to_muc_window.ui - gajim/data/gui/groupchat_control.ui - gajim/data/gui/roster_window.ui - − gajim/data/icons/hicolor/16x16/actions/document-send.png - + gajim/data/icons/hicolor/16x16/status/aim-away.png - + gajim/data/icons/hicolor/16x16/status/aim-chat.png - + gajim/data/icons/hicolor/16x16/status/aim-dnd.png - + gajim/data/icons/hicolor/16x16/status/aim-notinroster.png - + gajim/data/icons/hicolor/16x16/status/aim-offline.png - + gajim/data/icons/hicolor/16x16/status/aim-online.png - + gajim/data/icons/hicolor/16x16/status/aim-xa.png - + gajim/data/icons/hicolor/16x16/status/dcraven-away.png - + gajim/data/icons/hicolor/16x16/status/dcraven-chat.png - + gajim/data/icons/hicolor/16x16/status/dcraven-closed.png - + gajim/data/icons/hicolor/16x16/status/dcraven-connecting.png - + gajim/data/icons/hicolor/16x16/status/dcraven-dnd.png - + gajim/data/icons/hicolor/16x16/status/dcraven-error.png - + gajim/data/icons/hicolor/16x16/status/dcraven-event.png - + gajim/data/icons/hicolor/16x16/status/dcraven-invisible.png - + gajim/data/icons/hicolor/16x16/status/dcraven-muc-active.png - + gajim/data/icons/hicolor/16x16/status/dcraven-muc-inactive.png - + gajim/data/icons/hicolor/16x16/status/dcraven-notinroster.png - + gajim/data/icons/hicolor/16x16/status/dcraven-offline.png - + gajim/data/icons/hicolor/16x16/status/dcraven-online.png - + gajim/data/icons/hicolor/16x16/status/dcraven-opened.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5ce0c65ce4d3b9e2cf8a1c0261e303e19… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5ce0c65ce4d3b9e2cf8a1c0261e303e19… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch 8711-links-in-muc-subjects-do-not-work-on-windows
by Philipp Hörist 28 Jan '18

28 Jan '18

Philipp Hörist deleted branch 8711-links-in-muc-subjects-do-not-work-on-windows at gajim / gajim --- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move chat options menu
by Philipp Hörist 28 Jan '18

28 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5ce0c65c by Philipp Hörist at 2018-01-28T20:39:02+01:00 Move chat options menu Putting it into the header forced GTK Window Decorations, that makes the application look alien on all systems except Gnome. - - - - - 8 changed files: - gajim/chat_control.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/gui/message_window.ui - gajim/data/gui/roster_window.ui - gajim/groupchat_control.py - gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -107,6 +107,8 @@ class ChatControl(ChatControlBase): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( self.control_id) + settings_menu = self.xml.get_object('settings_menu') + settings_menu.set_menu_model(self.control_menu) self._audio_banner_image = self.xml.get_object('audio_banner_image') self._video_banner_image = self.xml.get_object('video_banner_image') ===================================== gajim/data/gui/chat_control.ui ===================================== --- a/gajim/data/gui/chat_control.ui +++ b/gajim/data/gui/chat_control.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> @@ -627,58 +627,6 @@ <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="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 emoticons (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">0</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"> - <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">1</property> - </packing> - </child> - <child> <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -687,7 +635,7 @@ <property name="expand">True</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> @@ -791,7 +739,31 @@ audio-mic-volume-low</property> <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">1</property> + </packing> + </child> + <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> + </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">2</property> </packing> </child> <child> @@ -818,7 +790,7 @@ audio-mic-volume-low</property> <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -843,7 +815,7 @@ audio-mic-volume-low</property> <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> @@ -870,10 +842,62 @@ audio-mic-volume-low</property> <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> + <property name="position">5</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 emoticons (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">6</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"> + <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">7</property> + </packing> + </child> + <child> <placeholder/> </child> </object> ===================================== gajim/data/gui/groupchat_control.ui ===================================== --- a/gajim/data/gui/groupchat_control.ui +++ b/gajim/data/gui/groupchat_control.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkMenu" id="formattings_menu"> @@ -222,17 +222,16 @@ <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="emoticons_button"> + <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="tooltip_text" translatable="yes">Show a list of emoticons (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> + <property name="icon_name">open-menu-symbolic</property> </object> </child> <style> @@ -242,24 +241,23 @@ <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="GtkMenuButton" id="formattings_button"> - <property name="visible">True</property> + <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="has_tooltip">True</property> + <property name="no_show_all">True</property> <property name="relief">none</property> - <property name="popup">formattings_menu</property> <child> - <object class="GtkImage" id="image10"> + <object class="GtkImage" id="lock_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> + <property name="stock">gtk-dialog-authentication</property> <property name="icon_size">1</property> </object> </child> @@ -269,24 +267,23 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkButton" id="authentication_button"> + <object class="GtkMenuButton" id="encryption_menu"> + <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="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Choose an encryption</property> <property name="relief">none</property> <child> - <object class="GtkImage" id="lock_image"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> + <property name="icon_name">channel-secure-symbolic</property> </object> </child> <style> @@ -295,38 +292,48 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> <child> - <placeholder/> - </child> - <child> - <object class="GtkComboBox" id="label_selector"> + <object class="GtkButton" id="sendfile_button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">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">True</property> - <property name="fill">True</property> - <property name="position">4</property> + <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="encryption_menu"> + <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">Choose an encryption</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (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">channel-secure-symbolic</property> + <property name="icon_name">face-smile-symbolic</property> </object> </child> <style> @@ -336,22 +343,25 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> - <object class="GtkButton" id="sendfile_button"> + <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"> + <object class="GtkImage" id="image10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> </object> </child> <style> @@ -360,9 +370,23 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">6</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">True</property> + <property name="fill">True</property> + <property name="position">7</property> </packing> </child> </object> ===================================== gajim/data/gui/message_window.ui ===================================== --- a/gajim/data/gui/message_window.ui +++ b/gajim/data/gui/message_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkEventBox" id="chat_tab_ebox"> @@ -64,25 +64,6 @@ </object> </child> </object> - <object class="GtkHeaderBar" id="headerbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_close_button">True</property> - <child> - <object class="GtkMenuButton" id="header_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</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> - </object> - </child> - </object> <object class="GtkApplicationWindow" id="message_window"> <property name="name">MessageWindow</property> <property name="can_focus">False</property> @@ -96,5 +77,8 @@ <property name="scrollable">True</property> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/roster_window.ui ===================================== --- a/gajim/data/gui/roster_window.ui +++ b/gajim/data/gui/roster_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -115,29 +115,8 @@ </child> </object> </child> - </object> - <object class="GtkHeaderBar" id="headerbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title">Gajim</property> - <property name="show_close_button">True</property> - <child> - <object class="GtkMenuButton" id="header_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</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> - </object> - <packing> - <property name="pack_type">end</property> - </packing> + <child type="titlebar"> + <placeholder/> </child> </object> </interface> ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -482,6 +482,8 @@ class GroupchatControl(ChatControlBase): self.gc_tooltip = tooltips.GCTooltip() self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id) + settings_menu = self.xml.get_object('settings_menu') + settings_menu.set_menu_model(self.control_menu) app.ged.register_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -101,18 +101,6 @@ class MessageWindow(object): orig_window.destroy() del orig_window - # Set headermenu - # single-window mode: show the header menu on the roster window - # all other modes: add the headerbar to the new window - # A headerbar has to be set before the window calls show() - if parent_window: - self.header_menu = app.interface.roster.header_menu - self.header_menu.show() - else: - self.header_menu = self.xml.get_object('header_menu') - headerbar = self.xml.get_object('headerbar') - self.window.set_titlebar(headerbar) - # NOTE: we use 'connect_after' here because in # MessageWindowMgr._new_window we register handler that saves window # state when closing it, and it should be called before @@ -170,9 +158,6 @@ class MessageWindow(object): self.notebook.set_show_border(app.config.get('tabs_border')) self.show_icon() - def set_header_menu(self, menu): - self.header_menu.set_menu_model(menu) - def change_account_name(self, old_name, new_name): if old_name in self._controls: self._controls[new_name] = self._controls[old_name] @@ -589,7 +574,6 @@ class MessageWindow(object): ask any confirmation """ def close(ctrl): - self.remove_headermenu(self.notebook, ctrl) if reason is not None: # We are leaving gc with a status message ctrl.shutdown(reason) else: # We are leaving gc without status message or it's a chat @@ -627,7 +611,6 @@ class MessageWindow(object): def on_minimize(ctrl): if method != self.CLOSE_COMMAND: - self.remove_headermenu(self.notebook, ctrl) ctrl.minimize() self.check_tabs() return @@ -639,13 +622,6 @@ class MessageWindow(object): else: ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) - def remove_headermenu(self, notebook, ctrl): - page_num = notebook.page_num(ctrl.widget) - if page_num == notebook.get_current_page(): - self.set_header_menu(None) - elif notebook.get_n_pages() == 1: - self.set_header_menu(None) - def check_tabs(self): if self.parent_paned: # Do nothing in single window mode @@ -866,7 +842,6 @@ class MessageWindow(object): new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num)) new_ctrl.set_control_active(True) self.show_title(control = new_ctrl) - self.set_header_menu(new_ctrl.control_menu) control = self.get_active_control() if isinstance(control, ChatControlBase): @@ -1321,7 +1296,6 @@ class MessageWindowMgr(GObject.GObject): gtkgui_helpers.resize_window(w.window, app.config.get('roster_width'), app.config.get('roster_height')) - self.hide_header_bar(self.parent_win) self._windows = {} @@ -1335,12 +1309,6 @@ class MessageWindowMgr(GObject.GObject): ctrl.update_actions() mw.new_tab(ctrl) - @staticmethod - def hide_header_bar(parent_win): - header_bar = parent_win.get_titlebar() - for child in header_bar.get_children(): - child.hide() - def save_opened_controls(self): if not app.config.get('remember_opened_chat_controls'): return ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -5675,13 +5675,6 @@ class RosterWindow: app.interface.msg_win_mgr.connect('window-delete', self.on_message_window_delete) - # Set headermenu but hide it. - # MessageWindow will show it if we are in single-window mode - headerbar = self.xml.get_object('headerbar') - self.window.set_titlebar(headerbar) - self.header_menu = self.xml.get_object('header_menu') - self.header_menu.hide() - self.advanced_menus = [] # We keep them to destroy them if app.config.get('roster_window_skip_taskbar'): self.window.set_property('skip-taskbar-hint', True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ce0c65ce4d3b9e2cf8a1c0261e303e190… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ce0c65ce4d3b9e2cf8a1c0261e303e190… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove cmp_to_key functions
by Philipp Hörist 27 Jan '18

27 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 28749a79 by André Apitzsch at 2018-01-27T00:21:53+01:00 Remove cmp_to_key functions - - - - - c609d3c5 by Philipp Hörist at 2018-01-27T17:27:53+01:00 Merge branch 'removeCmp' into 'master' Remove cmp_to_key functions See merge request gajim/gajim!197 - - - - - 2 changed files: - gajim/common/caps_cache.py - gajim/common/contacts.py Changes: ===================================== gajim/common/caps_cache.py ===================================== --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -108,37 +108,16 @@ def compute_caps_hash(identities, features, dataforms=None, hash_method='sha-1') """ if dataforms is None: dataforms = [] - def sort_identities_func(i1, i2): - cat1 = i1['category'] - cat2 = i2['category'] - if cat1 < cat2: - return -1 - if cat1 > cat2: - return 1 - type1 = i1.get('type', '') - type2 = i2.get('type', '') - if type1 < type2: - return -1 - if type1 > type2: - return 1 - lang1 = i1.get('xml:lang', '') - lang2 = i2.get('xml:lang', '') - if lang1 < lang2: - return -1 - if lang1 > lang2: - return 1 - return 0 - - def sort_dataforms_func(d1, d2): - f1 = d1.getField('FORM_TYPE') - f2 = d2.getField('FORM_TYPE') - if f1 and f2 and (f1.getValue() < f2.getValue()): - return -1 - return 1 + + def sort_identities_key(i): + return (i['category'], i.get('type', ''), i.get('xml:lang', '')) + + def sort_dataforms_key(dataform): + f = dataform.getField('FORM_TYPE') + return (bool(f), f.getValue()) S = '' - from functools import cmp_to_key - identities.sort(key=cmp_to_key(sort_identities_func)) + identities.sort(key=sort_identities_key) for i in identities: c = i['category'] type_ = i.get('type', '') @@ -148,7 +127,7 @@ def compute_caps_hash(identities, features, dataforms=None, hash_method='sha-1') features.sort() for f in features: S += '%s<' % f - dataforms.sort(key=cmp_to_key(sort_dataforms_func)) + dataforms.sort(key=sort_dataforms_key) for dataform in dataforms: # fields indexed by var fields = {} ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -28,8 +28,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from functools import cmp_to_key - try: from gajim.common import caps_cache from gajim.common.account import Account @@ -788,88 +786,29 @@ class MetacontactManager(): answers.append(data) return answers - def _compare_metacontacts(self, data1, data2): + def _metacontact_key(self, data): """ - Compare 2 metacontacts - Data is {'jid': jid, 'account': account, 'order': order} order is optional """ - jid1 = data1['jid'] - jid2 = data2['jid'] - account1 = data1['account'] - account2 = data2['account'] - contact1 = self._contacts.get_contact_with_highest_priority(account1, jid1) - contact2 = self._contacts.get_contact_with_highest_priority(account2, jid2) show_list = ['not in roster', 'error', 'offline', 'invisible', 'dnd', - 'xa', 'away', 'chat', 'online', 'requested', 'message'] + 'xa', 'away', 'chat', 'online', 'requested', 'message'] + + jid = data['jid'] + account = data['account'] # contact can be null when a jid listed in the metacontact data # is not in our roster - if not contact1: - if contact2: - return -1 # prefer the known contact - else: - show1 = 0 - priority1 = 0 - else: - show1 = show_list.index(contact1.show) - priority1 = contact1.priority - if not contact2: - if contact1: - return 1 # prefer the known contact - else: - show2 = 0 - priority2 = 0 - else: - show2 = show_list.index(contact2.show) - priority2 = contact2.priority - # If only one is offline, it's always second - if show1 > 2 and show2 < 3: - return 1 - if show2 > 2 and show1 < 3: - return -1 - if 'order' in data1 and 'order' in data2: - if data1['order'] > data2['order']: - return 1 - if data1['order'] < data2['order']: - return -1 - if 'order' in data1: - return 1 - if 'order' in data2: - return -1 - transport1 = common.app.get_transport_name_from_jid(jid1) - transport2 = common.app.get_transport_name_from_jid(jid2) - if transport2 and not transport1: - return 1 - if transport1 and not transport2: - return -1 - if show1 > show2: - return 1 - if show2 > show1: - return -1 - if priority1 > priority2: - return 1 - if priority2 > priority1: - return -1 - server1 = common.app.get_server_from_jid(jid1) - server2 = common.app.get_server_from_jid(jid2) - myserver1 = common.app.config.get_per('accounts', account1, 'hostname') - myserver2 = common.app.config.get_per('accounts', account2, 'hostname') - if server1 == myserver1: - if server2 != myserver2: - return 1 - elif server2 == myserver2: - return -1 - if jid1 > jid2: - return 1 - if jid2 > jid1: - return -1 - # If all is the same, compare accounts, they can't be the same - if account1 > account2: - return 1 - if account2 > account1: - return -1 - return 0 + contact = self._contacts.get_contact_with_highest_priority( + account, jid) + show = show_list.index(contact.show) if contact else 0 + priority = contact.priority if contact else 0 + has_order = 'order' in data + order = data.get('order', 0) + transport = common.app.get_transport_name_from_jid(jid) + server = common.app.get_server_from_jid(jid) + myserver = common.app.config.get_per('accounts', account, 'hostname') + return (bool(contact), show > 2, has_order, order, bool(transport), + show, priority, server == myserver, jid, account) def get_nearby_family_and_big_brother(self, family, account): """ @@ -901,8 +840,7 @@ class MetacontactManager(): Which of the family will be the big brother under wich all others will be ? """ - family.sort(key=cmp_to_key(self._compare_metacontacts)) - return family[-1] + return max(family, key=self._metacontact_key) if __name__ == "__main__": View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8bf3a179df6f85ee363f03da735654bac… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8bf3a179df6f85ee363f03da735654bac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Logind listener: make string translatable
by Philipp Hörist 27 Jan '18

27 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f20e5e6 by André Apitzsch at 2018-01-27T00:20:53+01:00 Logind listener: make string translatable - - - - - 8bf3a179 by Philipp Hörist at 2018-01-27T17:26:42+01:00 Merge branch 'logind' into 'master' Logind listener: make string translatable See merge request gajim/gajim!200 - - - - - 1 changed file: - gajim/logind_listener.py Changes: ===================================== gajim/logind_listener.py ===================================== --- a/gajim/logind_listener.py +++ b/gajim/logind_listener.py @@ -42,7 +42,6 @@ def signal_received(connection, sender_name, object_path, global fd - connected = None log.info('Signal received: %s - %s', interface_name, parameters) # signal is sent right before (with the parameter True) and after @@ -88,7 +87,7 @@ def get_inhibitor(connection): 'org.freedesktop.login1.Manager', 'Inhibit', GLib.Variant('(ssss)', ('sleep', 'org.gajim.Gajim', - 'Disconnect from the network', 'delay')), + _('Disconnect from the network'), 'delay')), GLib.VariantType.new('(h)'), Gio.DBusCallFlags.NONE, -1, None, None) @@ -97,8 +96,6 @@ def get_inhibitor(connection): def appeared(connection, name, name_owner, *user_data): '''Set up a listener for suspend signals''' - global supported - supported = True log.info('%s appeared', name) if name == 'org.freedesktop.login1': connection.signal_subscribe( View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/36f23c9cf2de22a157a3b057576d45d14… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/36f23c9cf2de22a157a3b057576d45d14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Refactor adding actions to chat windows
by Philipp Hörist 27 Jan '18

27 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: afc30754 by Philipp Hörist at 2018-01-27T10:29:52+01:00 Refactor adding actions to chat windows - - - - - 36f23c9c by Philipp Hörist at 2018-01-27T10:55:25+01:00 Update httpupload action on discovery - - - - - 5 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/httpupload.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -245,6 +245,7 @@ class ChatControl(ChatControlBase): self.update_actions() def add_actions(self): + super().add_actions() actions = [ ('invite-contacts-', self._on_invite_contacts), ('add-to-roster-', self._on_add_to_roster), ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -371,8 +371,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self._schedule_activity_timers() self.encryption = self.get_encryption_state() - if self.parent_win: - self.add_window_actions() # PluginSystem: adding GUI extension point for ChatControlBase # instance object (also subclasses, eg. ChatControl or GroupchatControl) @@ -391,7 +389,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # to properly use the super, because of the old code. CommandTools.__init__(self) - def add_window_actions(self): + def add_actions(self): action = Gio.SimpleAction.new_stateful( "set-encryption-%s" % self.control_id, GLib.VariantType.new("s"), ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -165,7 +165,6 @@ class CommonConnection: # the fake jid self.groupchat_jids = {} # {ID : groupchat_jid} - self.httpupload = False self.privacy_rules_supported = False self.vcard_supported = False self.private_storage_supported = False @@ -1970,8 +1969,6 @@ class Connection(CommonConnection, ConnectionHandlers): self._continue_connection_request_privacy() - if nbxmpp.NS_HTTPUPLOAD in obj.features: - self.httpupload = True if nbxmpp.NS_BYTESTREAM in obj.features and \ app.config.get_per('accounts', self.name, 'use_ft_proxies'): our_fjid = helpers.parse_jid(our_jid + '/' + \ ===================================== gajim/common/httpupload.py ===================================== --- a/gajim/common/httpupload.py +++ b/gajim/common/httpupload.py @@ -47,6 +47,7 @@ class ConnectionHTTPUpload: (XEP-0363, https://xmpp.org/extensions/xep-0363.html) """ def __init__(self): + self.httpupload = False self.encrypted_upload = False self.component = None self.max_file_size = None # maximum file size in bytes @@ -103,6 +104,10 @@ class ConnectionHTTPUpload: log.info('%s has a maximum file size of: %s MiB', account, self.max_file_size/(1024*1024)) + self.httpupload = True + for ctrl in app.interface.msg_win_mgr.get_controls(acct=self.name): + ctrl.update_actions() + def handle_outgoing_stanza(self, event): if event.conn.name != self.name: return ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -514,6 +514,7 @@ class GroupchatControl(ChatControlBase): app.plugin_manager.gui_extension_point('groupchat_control', self) def add_actions(self): + super().add_actions() actions = [ ('change-subject-', self._on_change_subject), ('change-nick-', self._on_change_nick), @@ -729,7 +730,6 @@ class GroupchatControl(ChatControlBase): def on_groupchat_maximize(self): self.set_tooltip() - self.add_window_actions() self.add_actions() self.update_actions() self.set_lock_image() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b8a62a8bb22f3577bc4e10442745b49c8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b8a62a8bb22f3577bc4e10442745b49c8… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2018