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/dd1451d50b394e4a94abd1c9afaa94353e642fef...4cb999df9206ce7ab8936ff575a15499184d50ef
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/dd1451d50b394e4a94abd1c9afaa94353e642fef...4cb999df9206ce7ab8936ff575a15499184d50ef
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
