Commits May 2021

commits@gajim.org

1 participants
67 discussions

[Git][gajim/gajim][mainwindow] StatusIcon: Integrate AppIndicator
by Daniel Brötzmann 22 May '21

22 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: d2024af1 by wurstsalat at 2021-05-23T01:14:52+02:00 StatusIcon: Integrate AppIndicator - - - - - 6 changed files: - gajim/common/app.py - gajim/data/gui/systray_context_menu.ui - gajim/gtk/features.py - gajim/gtk/main.py - gajim/gtk/statusicon.py → gajim/gtk/status_icon.py - gajim/gui_interface.py Changes: ===================================== gajim/common/app.py ===================================== @@ -149,6 +149,8 @@ def __init__(self): 'GSOUND': False, 'GSPELL': False, 'IDLE': False, + 'APPINDICATOR': False, + 'AYATANA_APPINDICATOR': False, } _tasks = defaultdict(list) # type: Dict[int, List[Any]] @@ -285,6 +287,21 @@ def detect_dependencies(): except (ImportError, ValueError): pass + # APPINDICATOR + try: + gi.require_version('AppIndicator3', '0.1') + from gi.repository import AppIndicator3 + _dependencies['APPINDICATOR'] = True + except (ImportError, ValueError): + pass + # AYATANA APPINDICATOR + try: + gi.require_version('AyatanaAppIndicator3', '0.1') + from gi.repository import AyatanaAppIndicator3 + _dependencies['AYATANA_APPINDICATOR'] = True + except (ImportError, ValueError): + pass + # Print results for dep, val in _dependencies.items(): log('gajim').info('%-13s %s', dep, val) ===================================== gajim/data/gui/systray_context_menu.ui ===================================== @@ -1,87 +1,81 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.24"/> <object class="GtkAccelGroup" id="accelgroup1"/> <object class="GtkMenu" id="systray_context_menu"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkMenuItem" id="status_menu"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Sta_tus</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> </object> </child> <child> <object class="GtkMenuItem" id="start_chat_menuitem"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_Start Chat...</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <signal name="activate" handler="_on_new_chat" swapped="no"/> </object> </child> <child> - <object class="GtkMenuItem" id="single_message_menuitem"> + <object class="GtkSeparatorMenuItem"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Send Single _Message...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator12"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> </child> <child> <object class="GtkMenuItem" id="show_all_events_menuitem"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Show All Pending _Events</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <signal name="activate" handler="_on_show_all_events" swapped="no"/> </object> </child> <child> <object class="GtkCheckMenuItem" id="sounds_mute_menuitem"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Mute Sounds</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <signal name="activate" handler="_on_sounds_mute" swapped="no"/> </object> </child> <child> - <object class="GtkMenuItem" id="show_roster_menuitem"> + <object class="GtkMenuItem" id="toggle_window_menuitem"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Show/Hide Window</property> + <property name="use-underline">True</property> + <signal name="activate" handler="_on_toggle_window" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="preferences_menuitem"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_Preferences</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <signal name="activate" handler="_on_preferences" swapped="no"/> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> </child> <child> <object class="GtkMenuItem" id="quit_menuitem"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_Quit</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <signal name="activate" handler="_on_quit" swapped="no"/> </object> </child> ===================================== gajim/gtk/features.py ===================================== @@ -87,6 +87,14 @@ def _get_features(self): auto_status_enabled = bool(any(auto_status)) return [ + Feature(_('App Indicator Icon'), + app.is_installed('APPINDICATOR') or + app.is_installed('AYATANA_APPINDICATOR'), + _('Enables Gajim to provide a system notification area ' + 'icon'), + _('Requires: libappindicator3'), + _('Feature not available under Windows'), + None), Feature(_('Audio / Video'), app.is_installed('AV'), _('Enables Gajim to provide Audio and Video chats'), ===================================== gajim/gtk/main.py ===================================== @@ -97,7 +97,6 @@ def _on_account_disabled(self, event): @staticmethod def _on_our_show(event): - app.interface.systray.update_icon() if event.show == 'offline': app.app.set_account_actions_state(event.account) app.app.update_app_actions_state() ===================================== gajim/gtk/statusicon.py → gajim/gtk/status_icon.py ===================================== @@ -25,132 +25,179 @@ from gi.repository import GLib from gajim.common import app +from gajim.common import configpaths +from gajim.common import ged from gajim.common.i18n import _ from gajim.common.helpers import get_global_show from gajim.common.helpers import get_uf_show from gajim.common.helpers import save_roster_position +from gajim.common.nec import EventHelper from .util import get_builder from .util import get_icon_name from .util import restore_roster_position from .util import open_window +HAS_INDICATOR = False +if app.is_installed('APPINDICATOR'): + from gi.repository import AppIndicator3 as appindicator + HAS_INDICATOR = True +elif app.is_installed('AYATANA_APPINDICATOR'): + from gi.repository import AyatanaAppIndicator3 as appindicator + HAS_INDICATOR = True -class StatusIcon: + +class StatusIcon(EventHelper): """ Class for the notification area icon """ def __init__(self): - self._single_message_handler_id = None - self._show_roster_handler_id = None - # click somewhere else does not popdown menu. workaround this. - self.added_hide_menuitem = False + EventHelper.__init__(self) self._ui = get_builder('systray_context_menu.ui') - self.systray_context_menu = self._ui.systray_context_menu self._ui.connect_signals(self) - self.popup_menus = [] - self.status_icon = None + + self._popup_menus = [] + self._hide_menuitem_added = False + self._status_change_item = None + self._status_icon = None + + self._ui.sounds_mute_menuitem.set_active( + not app.settings.get('sounds_on')) + self._add_status_menu() + + self.register_events([ + ('our-show', ged.GUI1, self._on_our_show), + ('account-connected', ged.CORE, self._on_account_state), + ('account-disconnected', ged.CORE, self._on_account_state), + ]) + + def _on_our_show(self, _event): + self.update_icon() + + def _on_account_state(self, _event): + account_connected = bool(app.get_number_of_connected_accounts() > 0) + self._ui.start_chat_menuitem.set_sensitive(account_connected) + self._status_change_item.set_sensitive(account_connected) def show_icon(self): - if not self.status_icon: - self.status_icon = Gtk.StatusIcon() - self.status_icon.connect('activate', self._on_activate) - self.status_icon.connect('popup-menu', self._on_popup_menu) - self.status_icon.connect('size-changed', self.update_icon) + if not self._status_icon: + if HAS_INDICATOR: + self._status_icon = appindicator.Indicator.new( + 'Gajim', + 'dcraven-online', + appindicator.IndicatorCategory.COMMUNICATIONS) + self._status_icon.set_icon_theme_path( + str(configpaths.get('ICONS'))) + self._status_icon.set_attention_icon_full( + 'mail-unread', 'New Message') + self._status_icon.set_status( + appindicator.IndicatorStatus.ACTIVE) + self._status_icon.set_menu(self._ui.systray_context_menu) + self._status_icon.set_secondary_activate_target( + self._ui.toggle_window_menuitem) + else: + self._status_icon = Gtk.StatusIcon() + self._status_icon.connect( + 'activate', self._on_activate) + self._status_icon.connect( + 'popup-menu', self._on_popup_menu) + self._status_icon.connect( + 'size-changed', self.update_icon) self.update_icon() self._subscribe_events() def hide_icon(self): - self.status_icon.set_visible(False) + if HAS_INDICATOR: + self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) + else: + self._status_icon.set_visible(False) self._unsubscribe_events() def update_icon(self, *args): if not app.interface.systray_enabled: return if app.settings.get('trayicon') == 'always': - self.status_icon.set_visible(True) + if HAS_INDICATOR: + self._status_icon.set_status( + appindicator.IndicatorStatus.ACTIVE) + else: + self._status_icon.set_visible(True) if app.events.get_nb_systray_events(): - self.status_icon.set_visible(True) - icon_name = get_icon_name('event') - self.status_icon.set_from_icon_name(icon_name) + if HAS_INDICATOR: + self._status_icon.set_icon_full(icon_name, _('Pending Event')) + self._status_icon.set_status( + appindicator.IndicatorStatus.ATTENTION) + else: + self._status_icon.set_visible(True) + self._status_icon.set_from_icon_name(icon_name) return if app.settings.get('trayicon') == 'on_event': - self.status_icon.set_visible(False) - - icon_name = get_icon_name(get_global_show()) - self.status_icon.set_from_icon_name(icon_name) + if HAS_INDICATOR: + self._status_icon.set_status( + appindicator.IndicatorStatus.PASSIVE) + else: + self._status_icon.set_visible(False) + + show = get_global_show() + icon_name = get_icon_name(show) + if HAS_INDICATOR: + self._status_icon.set_icon_full(icon_name, show) + self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) + else: + self._status_icon.set_from_icon_name(icon_name) def _subscribe_events(self): - """ - Register listeners to the events class - """ app.events.event_added_subscribe(self._on_event_added) app.events.event_removed_subscribe(self._on_event_removed) def _unsubscribe_events(self): - """ - Unregister listeners to the events class - """ app.events.event_added_unsubscribe(self._on_event_added) app.events.event_removed_unsubscribe(self._on_event_removed) def _on_event_added(self, event): - """ - Called when an event is added to the event list - """ if event.show_in_systray: self.update_icon() def _on_event_removed(self, _event_list): - """ - Called when one or more events are removed from the event list - """ self.update_icon() def _on_popup_menu(self, _status_icon, button, activate_time): if button == 1: - self._on_left_click() + self._on_activate() elif button == 2: - self._on_middle_click() + self._on_toggle_window() elif button == 3: - self._make_menu(button, activate_time) - - def _on_activate(self, _status_icon): - self._on_left_click() + self._build_menu(activate_time) - @staticmethod - def _on_single_message(_widget, account): - open_window('SingleMessageWindow', account=account) + def _build_menu(self, event_time): + for menu in self._popup_menus: + menu.destroy() - @staticmethod - def _on_new_chat(_widget): - app.app.activate_action('start-chat', GLib.Variant('s', '')) + self._add_status_menu() - def _make_menu(self, _event_button, event_time): - """ - Create chat with and new message (sub) menus/menuitems - """ - for menu in self.popup_menus: - menu.destroy() + self._ui.sounds_mute_menuitem.set_active( + not app.settings.get('sounds_on')) - start_chat_menuitem = self._ui.start_chat_menuitem - single_message_menuitem = self._ui.single_message_menuitem - status_menuitem = self._ui.status_menu - sounds_mute_menuitem = self._ui.sounds_mute_menuitem - show_roster_menuitem = self._ui.show_roster_menuitem + if os.name == 'nt': + # Workaround for popup menu on Windows + if not self._hide_menuitem_added: + self._ui.systray_context_menu.prepend( + Gtk.SeparatorMenuItem.new()) + item = Gtk.MenuItem.new_with_label( + _('Hide this menu')) + self._ui.systray_context_menu.prepend(item) + self._hide_menuitem_added = True - if self._single_message_handler_id: - single_message_menuitem.handler_disconnect( - self._single_message_handler_id) - self._single_message_handler_id = None + self._ui.systray_context_menu.show_all() + self._ui.systray_context_menu.popup( + None, None, None, None, 0, event_time) + def _add_status_menu(self): sub_menu = Gtk.Menu() - self.popup_menus.append(sub_menu) - status_menuitem.set_submenu(sub_menu) for show in ('online', 'away', 'xa', 'dnd'): uf_show = get_uf_show(show, use_mnemonic=True) @@ -158,91 +205,29 @@ def _make_menu(self, _event_button, event_time): sub_menu.append(item) item.connect('activate', self._on_show, show) - item = Gtk.SeparatorMenuItem.new() - sub_menu.append(item) - - item = Gtk.MenuItem.new_with_mnemonic(_('_Change Status Message…')) - sub_menu.append(item) - item.connect('activate', self._on_change_status) + sub_menu.append(Gtk.SeparatorMenuItem()) - connected_accounts = app.get_number_of_connected_accounts() - if connected_accounts < 1: - item.set_sensitive(False) + self._status_change_item = Gtk.MenuItem.new_with_mnemonic( + _('_Change Status Message…')) + sub_menu.append(self._status_change_item) + self._status_change_item.connect( + 'activate', self._on_change_status) - item = Gtk.SeparatorMenuItem.new() - sub_menu.append(item) + sub_menu.append(Gtk.SeparatorMenuItem()) uf_show = get_uf_show('offline', use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) item.connect('activate', self._on_show, 'offline') - is_zeroconf = connected_accounts == 1 and app.zeroconf_is_connected() - iskey = connected_accounts > 0 and not is_zeroconf - start_chat_menuitem.set_sensitive(iskey) - single_message_menuitem.set_sensitive(iskey) - - accounts_list = sorted(app.settings.get_active_accounts()) - - # menu items that don't apply to zeroconf connections - if connected_accounts == 1 or (connected_accounts == 2 and \ - app.zeroconf_is_connected()): - # only one 'real' (non-zeroconf) account is connected, don't need - # submenus - for account in app.connections: - if app.account_is_available(account) and \ - not app.settings.get_account_setting(account, 'is_zeroconf'): - # for single message - single_message_menuitem.set_submenu(None) - self._single_message_handler_id = single_message_menuitem.\ - connect('activate', - self._on_single_message, account) - break # No other account connected - else: - # 2 or more 'real' accounts are connected, make submenus - account_menu_for_single_message = Gtk.Menu() - single_message_menuitem.set_submenu( - account_menu_for_single_message) - self.popup_menus.append(account_menu_for_single_message) - - for account in accounts_list: - account_label = app.get_account_label(account) - if app.connections[account].is_zeroconf or \ - not app.account_is_available(account): - continue - # for single message - item = Gtk.MenuItem.new_with_label( - _('using account %s') % account_label) - item.connect('activate', - self._on_single_message, account) - account_menu_for_single_message.append(item) - - sounds_mute_menuitem.set_active(not app.settings.get('sounds_on')) - - if self._show_roster_handler_id: - show_roster_menuitem.handler_disconnect( - self._show_roster_handler_id) - if app.window.get_property('has-toplevel-focus'): - show_roster_menuitem.get_children()[0].set_label( - _('Hide _Window')) - self._show_roster_handler_id = show_roster_menuitem.connect( - 'activate', self._on_hide_roster) - else: - show_roster_menuitem.get_children()[0].set_label( - _('Show _Window')) - self._show_roster_handler_id = show_roster_menuitem.connect( - 'activate', self._on_show_roster) + sub_menu.show_all() - if os.name == 'nt': - if not self.added_hide_menuitem: - self.systray_context_menu.prepend(Gtk.SeparatorMenuItem.new()) - item = Gtk.MenuItem.new_with_label( - _('Hide this menu')) - self.systray_context_menu.prepend(item) - self.added_hide_menuitem = True + self._popup_menus.append(sub_menu) + self._ui.status_menu.set_submenu(sub_menu) - self.systray_context_menu.show_all() - self.systray_context_menu.popup(None, None, None, None, 0, event_time) + @staticmethod + def _on_new_chat(_widget): + app.app.activate_action('start-chat', GLib.Variant('s', '')) @staticmethod def _on_show_all_events(_widget): @@ -256,13 +241,17 @@ def _on_show_all_events(_widget): def _on_sounds_mute(widget): app.settings.set('sounds_on', not widget.get_active()) - @staticmethod - def _on_show_roster(_widget): - app.window.present() + def _on_toggle_window(self, *args): + # When using Gtk.StatusIcon, app.window will never return True for + # 'has-toplevel-focus' while clicking the menu item + GLib.idle_add(self._toggle_window) @staticmethod - def _on_hide_roster(_widget): - app.window.hide() + def _toggle_window(): + if app.window.get_property('has-toplevel-focus'): + app.window.hide() + else: + app.window.present() @staticmethod def _on_preferences(_widget): @@ -272,25 +261,24 @@ def _on_preferences(_widget): def _on_quit(_widget): app.window.quit() - def _on_left_click(self): - win = app.window + def _on_activate(self, *args): if app.events.get_systray_events(): self._handle_first_event() return - if win.get_property('has-toplevel-focus'): - save_roster_position(win) - win.hide() + if app.window.get_property('has-toplevel-focus'): + save_roster_position(app.window) + app.window.hide() return - win.show_all() - if not win.get_property('visible'): + app.window.show_all() + if not app.window.get_property('visible'): # Window was minimized - restore_roster_position(win) + restore_roster_position(app.window) if not app.settings.get('roster_window_skip_taskbar'): - win.set_property('skip-taskbar-hint', False) - win.present_with_time(Gtk.get_current_event_time()) + app.window.set_property('skip-taskbar-hint', False) + app.window.present_with_time(Gtk.get_current_event_time()) @staticmethod def _handle_first_event(): @@ -303,18 +291,6 @@ def _handle_first_event(): restore_roster_position(win) app.interface.handle_event(account, jid, event.type_) - @staticmethod - def _on_middle_click(): - """ - Middle click raises window to have complete focus (fe. get kbd events) - but if already raised, it hides it - """ - win = app.window - if win.is_active(): - win.hide() - else: - win.present() - @staticmethod def _on_show(_widget, show): app.interface.change_status(status=show) ===================================== gajim/gui_interface.py ===================================== @@ -184,8 +184,8 @@ def __init__(self): self.systray_enabled = False if not app.is_display(Display.WAYLAND): - from gajim.gui import statusicon - self.systray = statusicon.StatusIcon() + from gajim.gui.status_icon import StatusIcon + self.systray = StatusIcon() if sys.platform in ('win32', 'darwin'): from gajim.gui.emoji_chooser import emoji_chooser View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2024af1b20601e8164aa9f3fa8a31e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d2024af1b20601e8164aa9f3fa8a31e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] GroupchatState: Fix content color for dark/light theme
by Daniel Brötzmann 22 May '21

22 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f354e111 by wurstsalat at 2021-05-22T10:55:12+02:00 GroupchatState: Fix content color for dark/light theme - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -614,10 +614,10 @@ infobar.error > revealer > box { border-radius: 6px; } .groupchat-state box > label { - color: @theme_text_color; + color: rgb(230, 230, 230); } .groupchat-state box > spinner { - color: @theme_text_color; + color: rgb(230, 230, 230); } /* Popover Treeview */ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f354e111c734c6a59acc12b3cdce3ee2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f354e111c734c6a59acc12b3cdce3ee2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StatusIcon: Update icon on show
by Daniel Brötzmann 22 May '21

22 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a9e1352a by wurstsalat at 2021-05-22T10:36:51+02:00 StatusIcon: Update icon on show - - - - - 2 changed files: - gajim/gtk/main.py - gajim/gtk/statusicon.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -97,6 +97,7 @@ def _on_account_disabled(self, event): @staticmethod def _on_our_show(event): + app.interface.systray.update_icon() if event.show == 'offline': app.app.set_account_actions_state(event.account) app.app.update_app_actions_state() ===================================== gajim/gtk/statusicon.py ===================================== @@ -25,8 +25,9 @@ from gi.repository import GLib from gajim.common import app -from gajim.common import helpers from gajim.common.i18n import _ +from gajim.common.helpers import get_global_show +from gajim.common.helpers import get_uf_show from gajim.common.helpers import save_roster_position from .util import get_builder @@ -39,42 +40,49 @@ class StatusIcon: """ Class for the notification area icon """ - def __init__(self): self._single_message_handler_id = None self._show_roster_handler_id = None # click somewhere else does not popdown menu. workaround this. self.added_hide_menuitem = False - self.status = 'offline' + self._ui = get_builder('systray_context_menu.ui') self.systray_context_menu = self._ui.systray_context_menu self._ui.connect_signals(self) self.popup_menus = [] self.status_icon = None - self._icon_size = '16' def show_icon(self): if not self.status_icon: self.status_icon = Gtk.StatusIcon() self.status_icon.connect('activate', self._on_activate) self.status_icon.connect('popup-menu', self._on_popup_menu) - self.status_icon.connect('size-changed', self.set_img) + self.status_icon.connect('size-changed', self.update_icon) - self.set_img() + self.update_icon() self._subscribe_events() def hide_icon(self): self.status_icon.set_visible(False) self._unsubscribe_events() - def change_status(self, global_status): - """ - Set tray image to 'global_status' - """ - # change image and status, only if it is different - if global_status is not None and self.status != global_status: - self.status = global_status - self.set_img() + def update_icon(self, *args): + if not app.interface.systray_enabled: + return + if app.settings.get('trayicon') == 'always': + self.status_icon.set_visible(True) + if app.events.get_nb_systray_events(): + self.status_icon.set_visible(True) + + icon_name = get_icon_name('event') + self.status_icon.set_from_icon_name(icon_name) + return + + if app.settings.get('trayicon') == 'on_event': + self.status_icon.set_visible(False) + + icon_name = get_icon_name(get_global_show()) + self.status_icon.set_from_icon_name(icon_name) def _subscribe_events(self): """ @@ -95,13 +103,13 @@ def _on_event_added(self, event): Called when an event is added to the event list """ if event.show_in_systray: - self.set_img() + self.update_icon() def _on_event_removed(self, _event_list): """ Called when one or more events are removed from the event list """ - self.set_img() + self.update_icon() def _on_popup_menu(self, _status_icon, button, activate_time): if button == 1: @@ -114,27 +122,6 @@ def _on_popup_menu(self, _status_icon, button, activate_time): def _on_activate(self, _status_icon): self._on_left_click() - def set_img(self, *args): - """ - Update image - """ - if not app.interface.systray_enabled: - return - if app.settings.get('trayicon') == 'always': - self.status_icon.set_visible(True) - if app.events.get_nb_systray_events(): - self.status_icon.set_visible(True) - - icon_name = get_icon_name('event') - self.status_icon.set_from_icon_name(icon_name) - return - - if app.settings.get('trayicon') == 'on_event': - self.status_icon.set_visible(False) - - icon_name = get_icon_name(self.status) - self.status_icon.set_from_icon_name(icon_name) - @staticmethod def _on_single_message(_widget, account): open_window('SingleMessageWindow', account=account) @@ -166,7 +153,7 @@ def _make_menu(self, _event_button, event_time): status_menuitem.set_submenu(sub_menu) for show in ('online', 'away', 'xa', 'dnd'): - uf_show = helpers.get_uf_show(show, use_mnemonic=True) + uf_show = get_uf_show(show, use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) item.connect('activate', self._on_show, show) @@ -185,7 +172,7 @@ def _make_menu(self, _event_button, event_time): item = Gtk.SeparatorMenuItem.new() sub_menu.append(item) - uf_show = helpers.get_uf_show('offline', use_mnemonic=True) + uf_show = get_uf_show('offline', use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) item.connect('activate', self._on_show, 'offline') @@ -247,7 +234,7 @@ def _make_menu(self, _event_button, event_time): 'activate', self._on_show_roster) if os.name == 'nt': - if self.added_hide_menuitem is False: + if not self.added_hide_menuitem: self.systray_context_menu.prepend(Gtk.SeparatorMenuItem.new()) item = Gtk.MenuItem.new_with_label( _('Hide this menu')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9e1352a4fc608c668989705ebfe34bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9e1352a4fc608c668989705ebfe34bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StatusSelector: Add account parameter
by Daniel Brötzmann 22 May '21

22 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a1ef719a by wurstsalat at 2021-05-22T09:32:25+02:00 StatusSelector: Add account parameter - - - - - 4 changed files: - gajim/gtk/account_page.py - gajim/gtk/app_page.py - gajim/gtk/status_selector.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/account_page.py ===================================== @@ -45,7 +45,7 @@ def __init__(self, account): self._ui = get_builder('account_page.ui') self.add(self._ui.paned) - self._status_selector = StatusSelector() + self._status_selector = StatusSelector(account=account) self._status_selector.set_halign(Gtk.Align.CENTER) self._ui.account_action_box.add(self._status_selector) ===================================== gajim/gtk/app_page.py ===================================== @@ -19,6 +19,7 @@ from gajim.common.helpers import open_uri from gajim.common.i18n import _ +from .status_selector import StatusSelector from .util import get_builder @@ -33,13 +34,24 @@ class AppPage(Gtk.Box): def __init__(self): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, - spacing=12) + spacing=6) self.get_style_context().add_class('app-page') - self._unread_count = 0 + gajim_label = Gtk.Label(label=_('Status')) + gajim_label.get_style_context().add_class('large-header') + self.add(gajim_label) + status_label = Gtk.Label(label=_('Status for all accounts')) + status_label.get_style_context().add_class('dim-label') + self.add(status_label) + + self._status_selector = StatusSelector() + self._status_selector.set_halign(Gtk.Align.CENTER) + self.add(self._status_selector) + update_label = Gtk.Label(label=_('Updates')) update_label.get_style_context().add_class('large-header') + update_label.get_style_context().add_class('margin-top12') self.add(update_label) self._app_message_listbox = AppMessageListBox() ===================================== gajim/gtk/status_selector.py ===================================== @@ -27,9 +27,10 @@ class StatusSelector(Gtk.MenuButton): - def __init__(self, compact=False): + def __init__(self, account=None, compact=False): Gtk.MenuButton.__init__(self) self.set_direction(Gtk.ArrowType.UP) + self._account = account self._compact = compact self._create_popover() @@ -112,7 +113,7 @@ def _on_change_status(self, button): new_status = button.get_name() if new_status == 'change_status_message': new_status = None - app.interface.change_status(status=new_status) + app.interface.change_status(status=new_status, account=self._account) self.update() def update(self, *args, **kwargs): @@ -121,7 +122,11 @@ def update(self, *args, **kwargs): # return # self.show() - show = get_global_show() + if self._account is not None: + client = app.get_client(self._account) + show = client.status + else: + show = get_global_show() uf_show = get_uf_show(show) surface = get_show_circle( ===================================== gajim/gui_interface.py ===================================== @@ -1496,7 +1496,7 @@ def autoconnect(self): app.connections[account].change_status(status, status_message) - def change_status(self, status): + def change_status(self, status, account=None): ask = ask_for_status_message(status) if status is None: @@ -1506,6 +1506,10 @@ def change_status(self, status): open_window('StatusChange', status=status) return + if account is not None: + self._change_status(account, status) + return + for account in app.connections: if not app.settings.get_account_setting(account, 'sync_with_global_status'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1ef719a3395f60cbd0be09aec3b6b15… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1ef719a3395f60cbd0be09aec3b6b15… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AppSideBar: Add background for icon
by Daniel Brötzmann 22 May '21

22 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9347cc56 by wurstsalat at 2021-05-22T09:03:54+02:00 AppSideBar: Add background for icon - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/app_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -144,6 +144,10 @@ background: @theme_bg_color; } +.app-sidebar-image { + background: @unfocused_borders; + padding: 4px; +} .app-page-box { margin-top: 6px; } ===================================== gajim/gtk/app_side_bar.py ===================================== @@ -55,8 +55,9 @@ def __init__(self): self._unread_label.set_halign(Gtk.Align.END) self._unread_label.set_valign(Gtk.Align.START) - surface = load_icon('org.gajim.Gajim', self, 40) + surface = load_icon('org.gajim.Gajim', self, 32) image = Gtk.Image.new_from_surface(surface) + image.get_style_context().add_class('app-sidebar-image') selection_bar = Gtk.Box() selection_bar.set_size_request(6, -1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9347cc56f67856444e1b4c5a30645e61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9347cc56f67856444e1b4c5a30645e61… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] GroupchatRoster: Don’t fail showing menu
by Philipp Hörist 19 May '21

19 May '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: bea60842 by lovetox at 2021-05-19T23:58:55+02:00 GroupchatRoster: Don’t fail showing menu - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -298,7 +298,7 @@ def _on_roster_button_press_event(self, treeview, event): return nick = self._store[iter_][Column.NICK_OR_GROUP] - if self._control.nick == nick: + if self._group_chat_contact.nickname == nick: return if event.button == 3: # right click @@ -308,7 +308,7 @@ def _on_roster_button_press_event(self, treeview, event): self.emit('row-activated', nick) def _show_contact_menu(self, nick): - self_contact = self._group_chat_contact.get_resource(self._control.nick) + self_contact = self._group_chat_contact.get_self() contact = self._group_chat_contact.get_resource(nick) menu = get_groupchat_roster_menu(self._account, self._control_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bea60842a4619e3625ea3226fae2bae7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bea60842a4619e3625ea3226fae2bae7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix choosing a different nick on second join
by Philipp Hörist 19 May '21

19 May '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 717a6b52 by lovetox at 2021-05-19T23:50:12+02:00 Fix choosing a different nick on second join - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -210,6 +210,12 @@ def join(self, jid, nick=None, password=None, config=None): self._mucs[jid] = muc_data self._push_muc_added_event(jid) + elif nick is not None: + # Currently MUCData is never discarded so if it exists it contains + # the nickname of a previous join. The user may chose now on a new + # join a different nickname, so update MUCData here. + muc_data.nick = nick + if not muc_data.state.is_not_joined: self._log.warning('Can’t join MUC %s, state: %s', jid, muc_data.state) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/717a6b52dd10ce53dabff6c73b12e2cc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/717a6b52dd10ce53dabff6c73b12e2cc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André 19 May '21

19 May '21

André pushed to branch master at gajim / gajim Commits: ce89463e by André Apitzsch at 2021-05-19T22:28:41+02:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -43,6 +43,10 @@ add-extensions: no-autodownload: true autodelete: true +build-options: + env: + PIP_PREFIX: /app + cleanup: - /include - /lib/debug @@ -56,73 +60,86 @@ modules: - name: python3-pyparsing buildsystem: simple build-commands: - - pip3 install --prefix=/app pyparsing-2.4.7-py2.py3-none-any.whl + - pip3 install pyparsing-2.4.7-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/8a/bb/488841f56197b13700afd5658fc27… + url: https://files.pythonhosted.org/packages/py2.py3/p/pyparsing/pyparsing-2.4.7… sha256: ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b - name: python3-packaging buildsystem: simple build-commands: - - pip3 install --prefix=/app packaging-20.9-py2.py3-none-any.whl + - pip3 install packaging-20.9-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/3e/89/7ea760b4daa42653ece2380531c90… + url: https://files.pythonhosted.org/packages/py2.py3/p/packaging/packaging-20.9-… sha256: 67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a - name: python3-pycparser buildsystem: simple build-commands: - - pip3 install --prefix=/app pycparser-2.20-py2.py3-none-any.whl + - pip3 install pycparser-2.20-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/ae/e7/d9c3a176ca4b02024debf82342dab… + url: https://files.pythonhosted.org/packages/py2.py3/p/pycparser/pycparser-2.20-… sha256: 7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 - name: python3-cffi buildsystem: simple build-commands: - - pip3 install --prefix=/app . + - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/a8/20/025f59f929bbcaa579704f443a438… + url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.14.5.tar.gz sha256: fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c - name: python3-asn1crypto buildsystem: simple build-commands: - - pip3 install --prefix=/app asn1crypto-1.4.0-py2.py3-none-any.whl + - pip3 install asn1crypto-1.4.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/b5/a8/56be92dcd4a5bf1998705a9b40282… + url: https://files.pythonhosted.org/packages/py2.py3/a/asn1crypto/asn1crypto-1.4… sha256: 4bcdf33c861c7d40bdcd74d8e4dd7661aac320fcdf40b9a3f95b4ee12fde2fa8 - name: python3-idna buildsystem: simple build-commands: - - pip3 install --prefix=/app idna-3.1-py3-none-any.whl + - pip3 install idna-3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/29/88/c52aae187d3b128a0f13f36a6c987… + url: https://files.pythonhosted.org/packages/py3/i/idna/idna-3.1-py3-none-any.whl sha256: 5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16 - name: python3-cryptography buildsystem: simple + only-arches: + - aarch64 build-commands: - - python3 setup.py install --prefix=/app + - pip3 install cryptography-3.4.7-cp36-abi3-manylinux2014_aarch64.whl sources: - - type: archive - url: https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d5598… - sha256: 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed + - type: file + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-3.… + sha256: 240f5c21aef0b73f40bb9f78d2caff73186700bf1bc6b94285699aff98cc16c6 + + - name: python3-cryptography + buildsystem: simple + only-arches: + - x86_64 + build-commands: + - pip3 install cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-3.… + sha256: 1e056c28420c072c5e3cb36e2b23ee55e260cb04eee08f702e0edfec3fb51959 - name: python3-pyopenssl buildsystem: simple build-commands: - - pip3 install --prefix=/app pyOpenSSL-20.0.1-py2.py3-none-any.whl + - pip3 install pyOpenSSL-20.0.1-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/b2/5e/06351ede29fd4899782ad335c2e02… + url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-20.0.… sha256: 818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b - name: python3-dbus-python @@ -131,77 +148,96 @@ modules: PYTHON_VERSION: '3' sources: - type: archive - url: https://files.pythonhosted.org/packages/62/7e/d4fb56a1695fa65da0c8d3071855f… + url: https://files.pythonhosted.org/packages/source/d/dbus-python/dbus-python-1.… sha256: 11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4 - name: python3-jeepney buildsystem: simple build-commands: - - pip3 install --prefix=/app jeepney-0.6.0-py3-none-any.whl + - pip3 install jeepney-0.6.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/51/b0/a6ea72741aaac3f37fb96d195e4ee… + url: https://files.pythonhosted.org/packages/py3/j/jeepney/jeepney-0.6.0-py3-non… sha256: aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae - name: python3-secretstorage buildsystem: simple build-commands: - - pip3 install --prefix=/app SecretStorage-3.3.1-py3-none-any.whl + - pip3 install SecretStorage-3.3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/d9/1e/29cd69fdac7391aa51510dfd42aa7… + url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… sha256: 422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f - name: python3-zipp buildsystem: simple build-commands: - - pip3 install --prefix=/app zipp-3.4.1-py3-none-any.whl + - pip3 install zipp-3.4.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7d… + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.4.1-py3-none-any.… sha256: 51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install --prefix=/app importlib_metadata-3.9.0-py3-none-any.whl + - pip3 install importlib_metadata-4.0.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/d9/10/191b97506cd4cceb4b860fb5c75b2… - sha256: 6fd684b4c6c7bb36d57e93d57fc244b5ffc08faa1c298bcda3dfbbbf19d7550a + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: d7eb1dea6d6a6086f8be21784cc9e3bcfa55872b52309bc5fad53a8ea444465d - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-23.0.1-py3-none-any.whl + - pip3 install keyring-23.0.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/26/f9/41230ac47f738f1ba66676dc8d3b3… + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.0.1-py3-no… sha256: 8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - name: python3-css-parser buildsystem: simple build-commands: - - pip3 install --prefix=/app css_parser-1.0.6-py2.py3-none-any.whl + - pip3 install css_parser-1.0.6-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/64/7a/5ea4d019d36e07026ac194817104e… + url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… sha256: 6fc4f8f0a4b62c77f043765e375cc64971c54ff9a0502fec7e8f1fb28bb96082 - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install --prefix=/app precis_i18n-1.0.3-py3-none-any.whl + - pip3 install precis_i18n-1.0.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/c1/28/0df691ebe7e28a68b839887ce81be… + url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.3… sha256: b9a4ff1f2f8c4a762393cb1b80bf4cadfbe861ec299f752068cc42f281322d45 + # gssapi dependency + - name: python3-decorator + buildsystem: simple + build-commands: + - pip3 install decorator-5.0.9-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/d/decorator/decorator-5.0.9-py3… + sha256: 6e5c199c16f7a9f0e3a61a4a54b3d27e7dad0dbdde92b944426cb20914376323 + + - name: python3-gssapi + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.6.12.tar.gz + sha256: 16ed3b5d7fc37683be27f34a2a65062cb11d815d019bb2e89ffeb395576e51c8 + # GSound dependency - name: libcanberra sources: @@ -239,7 +275,7 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install --prefix=/app . + - pip3 install . sources: - type: git url: https://dev.gajim.org/gajim/python-nbxmpp.git @@ -247,7 +283,7 @@ modules: - name: gajim buildsystem: simple build-commands: - - pip3 install --prefix=/app . + - pip3 install . - touch /app/share/run-as-flatpak - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel - chmod 755 /app/bin/gajim-devel View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce89463ee6016b8239e5a99e953c4779… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce89463ee6016b8239e5a99e953c4779… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: StatusIcon: Fix roster references
by Daniel Brötzmann 19 May '21

19 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: d738a655 by wurstsalat at 2021-05-19T22:00:04+02:00 StatusIcon: Fix roster references - - - - - 4cb999df by wurstsalat at 2021-05-19T22:00:08+02:00 StatusIcon: Remove unused method - - - - - 1 changed file: - gajim/gtk/statusicon.py Changes: ===================================== gajim/gtk/statusicon.py ===================================== @@ -104,28 +104,16 @@ def _on_event_removed(self, _event_list): self.set_img() def _on_popup_menu(self, _status_icon, button, activate_time): - if button == 1: # Left click + if button == 1: self._on_left_click() - elif button == 2: # middle click + elif button == 2: self._on_middle_click() - elif button == 3: # right click + elif button == 3: self._make_menu(button, activate_time) def _on_activate(self, _status_icon): self._on_left_click() - def on_status_icon_size_changed(self, _statusicon, size): - if size > 31: - self._icon_size = '32' - elif size > 23: - self._icon_size = '24' - else: - self._icon_size = '16' - if os.environ.get('KDE_FULL_SESSION') == 'true': - # detect KDE session. see #5476 - self._icon_size = '32' - self.set_img() - def set_img(self, *args): """ Update image @@ -217,13 +205,12 @@ def _make_menu(self, _event_button, event_time): for account in app.connections: if app.account_is_available(account) and \ not app.settings.get_account_setting(account, 'is_zeroconf'): - # for single message single_message_menuitem.set_submenu(None) self._single_message_handler_id = single_message_menuitem.\ connect('activate', self._on_single_message, account) - break # No other account connected + break # No other account connected else: # 2 or more 'real' accounts are connected, make submenus account_menu_for_single_message = Gtk.Menu() @@ -245,18 +232,17 @@ def _make_menu(self, _event_button, event_time): sounds_mute_menuitem.set_active(not app.settings.get('sounds_on')) - win = app.interface.roster.window if self._show_roster_handler_id: show_roster_menuitem.handler_disconnect( self._show_roster_handler_id) - if win.get_property('has-toplevel-focus'): + if app.window.get_property('has-toplevel-focus'): show_roster_menuitem.get_children()[0].set_label( - _('Hide _Contact List')) + _('Hide _Window')) self._show_roster_handler_id = show_roster_menuitem.connect( 'activate', self._on_hide_roster) else: show_roster_menuitem.get_children()[0].set_label( - _('Show _Contact List')) + _('Show _Window')) self._show_roster_handler_id = show_roster_menuitem.connect( 'activate', self._on_show_roster) @@ -285,13 +271,11 @@ def _on_sounds_mute(widget): @staticmethod def _on_show_roster(_widget): - win = app.interface.roster.window - win.present() + app.window.present() @staticmethod def _on_hide_roster(_widget): - win = app.interface.roster.window - win.hide() + app.window.hide() @staticmethod def _on_preferences(_widget): @@ -299,10 +283,10 @@ def _on_preferences(_widget): @staticmethod def _on_quit(_widget): - app.interface.roster.on_quit_request() + app.window.quit() def _on_left_click(self): - win = app.interface.roster.window + win = app.window if app.events.get_systray_events(): self._handle_first_event() return @@ -312,9 +296,8 @@ def _on_left_click(self): win.hide() return - visible = win.get_property('visible') win.show_all() - if not visible: + if not win.get_property('visible'): # Window was minimized restore_roster_position(win) @@ -327,8 +310,8 @@ def _handle_first_event(): account, jid, event = app.events.get_first_systray_event() if not event: return - win = app.interface.roster.window - if not win.get_property('visible'): + win = app.window + if not app.window.get_property('visible'): # Needed if we are in one window mode restore_roster_position(win) app.interface.handle_event(account, jid, event.type_) @@ -339,7 +322,7 @@ def _on_middle_click(): Middle click raises window to have complete focus (fe. get kbd events) but if already raised, it hides it """ - win = app.interface.roster.window + win = app.window if win.is_active(): win.hide() else: @@ -351,4 +334,4 @@ def _on_show(_widget, show): @staticmethod def _on_change_status(_widget): - app.interface.change_status() + app.interface.change_status(status=None) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/dd1451d50b394e4a94abd1c9afaa943… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/dd1451d50b394e4a94abd1c9afaa943… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add AppSideBar and AppPage
by Daniel Brötzmann 17 May '21

17 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: dd1451d5 by wurstsalat at 2021-05-17T21:33:03+02:00 Add AppSideBar and AppPage - - - - - 8 changed files: - + gajim/data/gui/app_page.ui - gajim/data/gui/main.ui - gajim/data/style/gajim.css - + gajim/gtk/app_page.py - + gajim/gtk/app_side_bar.py - gajim/gtk/main.py - gajim/gtk/main_stack.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/app_page.ui ===================================== @@ -0,0 +1,206 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkBox" id="gajim_update"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Dismiss</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_dismiss_update_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Website</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_visit_website_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </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> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Gajim Update</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="update_message"> + <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">30</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </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">2</property> + </packing> + </child> + <style> + <class name="padding-6"/> + </style> + </object> + <object class="GtkBox" id="gajim_update_check"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Dismiss</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_dismiss_check_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Yes</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_check_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </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> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Update Check</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Search for Gajim updates periodically?</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </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">2</property> + </packing> + </child> + <style> + <class name="padding-6"/> + </style> + </object> +</interface> ===================================== gajim/data/gui/main.ui ===================================== @@ -67,21 +67,13 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkBox" id="app_box"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkImage" id="app_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> <child> <object class="GtkSeparator"> @@ -91,11 +83,12 @@ <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="app-image-box"/> + <class name="app-page-box"/> </style> </object> <packing> ===================================== gajim/data/style/gajim.css ===================================== @@ -144,9 +144,19 @@ background: @theme_bg_color; } -.app-image-box { margin: 12px 12px 0px 12px; } -.app-image-box > separator { +.app-page-box { + margin-top: 6px; +} +.app-page-box > separator { background-color: darker(@theme_bg_color); + margin-left: 12px; + margin-right: 12px; +} +.app-page { + padding: 18px; +} +.app-message-listbox row { + border: 1px solid @borders; } /* Workspace sidebar */ ===================================== gajim/gtk/app_page.py ===================================== @@ -0,0 +1,117 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GObject +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.helpers import open_uri +from gajim.common.i18n import _ + +from .util import get_builder + + +class AppPage(Gtk.Box): + + __gsignals__ = { + 'unread-count-changed': (GObject.SignalFlags.RUN_LAST, + None, + (int, )), + } + + def __init__(self): + Gtk.Box.__init__(self, + orientation=Gtk.Orientation.VERTICAL, + spacing=12) + self.get_style_context().add_class('app-page') + + self._unread_count = 0 + + update_label = Gtk.Label(label=_('Updates')) + update_label.get_style_context().add_class('large-header') + self.add(update_label) + + self._app_message_listbox = AppMessageListBox() + self.add(self._app_message_listbox) + + self.show_all() + + def add_app_message(self, category, message): + self._app_message_listbox.add_app_message(category, message) + + self._unread_count += 1 + self.emit('unread-count-changed', self._unread_count) + + def remove_app_message(self): + self._unread_count -= 1 + self.emit('unread-count-changed', self._unread_count) + + def process_event(self, event): + pass + + +class AppMessageListBox(Gtk.ListBox): + def __init__(self): + Gtk.ListBox.__init__(self) + self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_halign(Gtk.Align.CENTER) + self.set_size_request(400, -1) + self.get_style_context().add_class('app-message-listbox') + + placeholder = Gtk.Label(label=_('No updates available')) + placeholder.get_style_context().add_class('dim-label') + placeholder.show() + self.set_placeholder(placeholder) + + self.show_all() + + def add_app_message(self, category, message): + row = AppMessageRow(category, message) + self.add(row) + + def remove_app_message(self, row): + self.remove(row) + self.get_parent().remove_app_message() + + +class AppMessageRow(Gtk.ListBoxRow): + def __init__(self, category, message=None): + Gtk.ListBoxRow.__init__(self) + self._ui = get_builder('app_page.ui') + + if category == 'gajim-update-check': + self.add(self._ui.gajim_update_check) + + if category == 'gajim-update': + self.add(self._ui.gajim_update) + text = _('Version %s is available') % message + self._ui.update_message.set_text(text) + + self._ui.connect_signals(self) + self.show_all() + + def _on_check_clicked(self, _button): + app.interface.get_latest_release() + self.get_parent().remove_app_message(self) + + def _on_dismiss_check_clicked(self, _button): + app.settings.set('check_for_update', False) + self.get_parent().remove_app_message(self) + + def _on_visit_website_clicked(self, _button): + open_uri('https://gajim.org/download') + self.get_parent().remove_app_message(self) + + def _on_dismiss_update_clicked(self, _button): + self.get_parent().remove_app_message(self) ===================================== gajim/gtk/app_side_bar.py ===================================== @@ -0,0 +1,81 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from gajim.common import app + +from gajim.gui.util import load_icon + + +class AppSideBar(Gtk.ListBox): + def __init__(self, app_page): + Gtk.ListBox.__init__(self) + self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_valign(Gtk.Align.START) + self.get_style_context().add_class('workspace-sidebar') + + self.connect('row-activated', self._on_app_row_activated) + + app_page.connect('unread-count-changed', self._on_unread_count_changed) + + self._app_row = AppRow() + self.add(self._app_row) + + self.show_all() + + @staticmethod + def _on_app_row_activated(_listbox, _row): + app.window.show_app_page() + + def _on_unread_count_changed(self, _app_page, count): + self._app_row.set_unread_count(count) + + +class AppRow(Gtk.ListBoxRow): + def __init__(self): + Gtk.ListBoxRow.__init__(self) + self.get_style_context().add_class('workspace-sidebar-item') + + self._unread_label = Gtk.Label() + self._unread_label.get_style_context().add_class( + 'unread-counter') + self._unread_label.set_no_show_all(True) + self._unread_label.set_halign(Gtk.Align.END) + self._unread_label.set_valign(Gtk.Align.START) + + surface = load_icon('org.gajim.Gajim', self, 40) + image = Gtk.Image.new_from_surface(surface) + + selection_bar = Gtk.Box() + selection_bar.set_size_request(6, -1) + selection_bar.get_style_context().add_class('selection-bar') + + item_box = Gtk.Box() + item_box.add(selection_bar) + item_box.add(image) + + overlay = Gtk.Overlay() + overlay.add(item_box) + overlay.add_overlay(self._unread_label) + + self.add(overlay) + self.show_all() + + def set_unread_count(self, count): + if count < 1000: + self._unread_label.set_text(str(count)) + else: + self._unread_label.set_text('999+') + self._unread_label.set_visible(bool(count)) ===================================== gajim/gtk/main.py ===================================== @@ -13,12 +13,12 @@ from gajim.gui.adhoc import AdHocCommand from gajim.gui.account_side_bar import AccountSideBar +from gajim.gui.app_side_bar import AppSideBar from gajim.gui.workspace_side_bar import WorkspaceSideBar from gajim.gui.main_stack import MainStack from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.util import get_builder -from gajim.gui.util import load_icon from .util import open_window @@ -42,14 +42,15 @@ def __init__(self): self.add(self._ui.main_grid) - surface = load_icon('org.gajim.Gajim', self, 40) - self._ui.app_image.set_from_surface(surface) - self._main_stack = MainStack() self._ui.main_grid.add(self._main_stack) self._chat_page = self._main_stack.get_chat_page() + self._app_page = self._main_stack.get_app_page() + self._app_side_bar = AppSideBar(self._app_page) + self._ui.app_box.add(self._app_side_bar) + self._workspace_side_bar = WorkspaceSideBar(self._chat_page) self._ui.workspace_scrolled.add(self._workspace_side_bar) @@ -334,6 +335,12 @@ def _add_to_roster(_action, param): _workspace, account, jid = param.unpack() open_window('AddContact', account=account, jid=jid) + def show_app_page(self): + self._main_stack.show_app_page() + + def add_app_message(self, category, message=None): + self._app_page.add_app_message(category, message) + def get_control(self, *args, **kwargs): return self._chat_page.get_control(*args, **kwargs) ===================================== gajim/gtk/main_stack.py ===================================== @@ -16,6 +16,7 @@ from gajim.common import app +from .app_page import AppPage from .chat_page import ChatPage from .account_page import AccountPage @@ -26,6 +27,9 @@ def __init__(self): self.add_named(Gtk.Box(), 'empty') + self._app_page = AppPage() + self.add_named(self._app_page, 'app') + self._chat_page = ChatPage() self._chat_page.connect('chat-selected', self._on_chat_selected) self.add_named(self._chat_page, 'chats') @@ -44,6 +48,12 @@ def remove_account_page(self, account): def remove_chats_for_account(self, account): self._chat_page.remove_chats_for_account(account) + def show_app_page(self): + self.set_visible_child_name('app') + + def get_app_page(self): + return self.get_child_by_name('app') + def show_chats(self, workspace_id): self._chat_page.show_workspace_chats(workspace_id) self.set_visible_child_name('chats') ===================================== gajim/gui_interface.py ===================================== @@ -91,7 +91,6 @@ from gajim.gui.dialogs import WarningDialog from gajim.gui.dialogs import InformationDialog from gajim.gui.dialogs import ConfirmationDialog -from gajim.gui.dialogs import ConfirmationCheckDialog from gajim.gui.dialogs import InputDialog from gajim.gui.dialogs import PassphraseDialog from gajim.gui.filechoosers import FileChooserDialog @@ -1710,35 +1709,21 @@ def check_for_updates(self): now = datetime.now() last_check = app.settings.get('last_update_check') if not last_check: - def _on_cancel(): - app.settings.set('check_for_update', False) - - def _on_check(): - self._get_latest_release() - - ConfirmationDialog( - _('Update Check'), - _('Gajim Update Check'), - _('Search for Gajim updates periodically?'), - [DialogButton.make('Cancel', - text=_('_No'), - callback=_on_cancel), - DialogButton.make('Accept', - text=_('_Search Periodically'), - callback=_on_check)]).show() + app.window.add_app_message('gajim-update-check') return last_check_time = datetime.strptime(last_check, '%Y-%m-%d %H:%M') if (now - last_check_time).days < 7: return - self._get_latest_release() + self.get_latest_release() - def _get_latest_release(self): + def get_latest_release(self): log.info('Checking for Gajim updates') session = Soup.Session() session.props.user_agent = 'Gajim %s' % app.version - message = Soup.Message.new('GET', 'https://gajim.org/current-version.json') + message = Soup.Message.new( + 'GET', 'https://gajim.org/current-version.json') session.queue_message(message, self._on_update_checked) def _on_update_checked(self, _session, message): @@ -1754,27 +1739,7 @@ def _on_update_checked(self, _session, message): latest_version = data['current_version'] if V(latest_version) > V(app.version): - def _on_cancel(is_checked): - if is_checked: - app.settings.set('check_for_update', False) - - def _on_update(is_checked): - if is_checked: - app.settings.set('check_for_update', False) - helpers.open_uri('https://gajim.org/download') - - ConfirmationCheckDialog( - _('Update Available'), - _('Gajim Update Available'), - _('There is an update available for Gajim ' - '(latest version: %s)') % str(latest_version), - _('_Do not show again'), - [DialogButton.make('Cancel', - text=_('_Later'), - callback=_on_cancel), - DialogButton.make('Accept', - text=_('_Update Now'), - callback=_on_update)]).show() + app.window.add_app_message('gajim-update', latest_version) else: log.info('Gajim is up to date') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd1451d50b394e4a94abd1c9afaa9435… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd1451d50b394e4a94abd1c9afaa9435… 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 May 2021