Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] TCP: Set input/output closed on finalize()
by Philipp Hörist 14 Aug '20

14 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bbf21b95 by lovetox at 2020-08-14T13:35:39+02:00 TCP: Set input/output closed on finalize() Hopefully Fixes #108 - - - - - 2 changed files: - nbxmpp/tcp.py - nbxmpp/websocket.py Changes: ===================================== nbxmpp/tcp.py ===================================== @@ -365,6 +365,8 @@ class TCPConnection(Connection): self._con.get_socket().shutdown(True, True) except GLib.Error as error: self._log.info(error) + self._input_closed = True + self._output_closed = True self.state = TCPState.DISCONNECTED self.notify(signal_name) self.destroy() ===================================== nbxmpp/websocket.py ===================================== @@ -169,6 +169,8 @@ class WebsocketConnection(Connection): self._output_closed = True def _finalize(self, signal_name): + self._input_closed = True + self._output_closed = True self.state = TCPState.DISCONNECTED self.notify(signal_name) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bbf21b95905839b644a10335… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/bbf21b95905839b644a10335… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] TCP: Catch Runtime error
by Philipp Hörist 14 Aug '20

14 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: efd79065 by lovetox at 2020-08-14T12:47:43+02:00 TCP: Catch Runtime error Fixes #101 - - - - - 1 changed file: - nbxmpp/tcp.py Changes: ===================================== nbxmpp/tcp.py ===================================== @@ -286,6 +286,13 @@ class TCPConnection(Connection): self._log.error('Write Error: %s', error) return + except RuntimeError as error: + # PyGObject raises a RuntimeError when it failed to for some reason + # to convert the GError. Why it failed to convert is printed by + # PyGObject + self._log.error(error) + return + data = data.decode() self._log_stanza(data, received=False) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/efd790652de1ae4bde35dfae… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/efd790652de1ae4bde35dfae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Don’t fail when dropping text on control
by Philipp Hörist 14 Aug '20

14 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b740f57 by wurstsalat at 2020-08-14T09:35:44+02:00 ChatControl: Don’t fail when dropping text on control - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1180,7 +1180,10 @@ class ChatControl(ChatControlBase): treeview = app.interface.roster.tree model = treeview.get_model() data = selection.get_data().decode() - path = treeview.get_selection().get_selected_rows()[1][0] + tree_selection = treeview.get_selection() + if tree_selection.count_selected_rows() == 0: + return + path = tree_selection.get_selected_rows()[1][0] iter_ = model.get_iter(path) type_ = model[iter_][2] if type_ != 'contact': # Source is not a contact View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b740f57b1b310ecab3e476d9d713bb8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b740f57b1b310ecab3e476d9d713bb8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusSelector: Hide when there are no accounts
by Philipp Hörist 14 Aug '20

14 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e9abf7b6 by lovetox at 2020-08-14T09:32:31+02:00 StatusSelector: Hide when there are no accounts - - - - - 3 changed files: - gajim/gtk/status_selector.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/gtk/status_selector.py ===================================== @@ -30,6 +30,7 @@ class StatusSelector(Gtk.MenuButton): self.set_direction(Gtk.ArrowType.UP) self._compact = compact self._create_popover() + self.set_no_show_all(True) self._current_show_icon = Gtk.Image() self._current_show_icon.set_from_icon_name( @@ -43,6 +44,7 @@ class StatusSelector(Gtk.MenuButton): self._current_show_label.set_halign(Gtk.Align.START) self._current_show_label.set_xalign(0) box.add(self._current_show_label) + box.show_all() self.add(box) def _create_popover(self): @@ -106,6 +108,11 @@ class StatusSelector(Gtk.MenuButton): app.interface.change_status(status=new_status) def update(self): + if not app.connections: + self.hide() + return + + self.show() show = get_global_show() uf_show = get_uf_show(show) self._current_show_icon.set_from_icon_name( ===================================== gajim/gui_interface.py ===================================== @@ -1638,6 +1638,7 @@ class Interface: app.config.set_per( 'accounts', account, 'roster_version', '') self.roster.setup_and_draw_roster() + self.roster.update_status_selector() gui_menu_builder.build_accounts_menu() app.config.set_per('accounts', account, 'active', False) app.app.update_app_actions_state() ===================================== gajim/roster_window.py ===================================== @@ -1446,6 +1446,8 @@ class RosterWindow: # Recalculate column width for ellipsizing self.tree.columns_autosize() + def update_status_selector(self): + self._status_selector.update() def select_contact(self, jid, account): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9abf7b6093c743854cde1e9a4f13628… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9abf7b6093c743854cde1e9a4f13628… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Refactor publishing Mood/Activity
by Philipp Hörist 13 Aug '20

13 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf07c0ba by lovetox at 2020-08-14T00:22:48+02:00 Refactor publishing Mood/Activity - Move publish code to Interface module - - - - - 0d880cb1 by lovetox at 2020-08-14T00:23:31+02:00 Refactor TimeoutWindow - Remove source when timeout is stopped - Adapt StatusChange dialog - - - - - b2d52ad5 by lovetox at 2020-08-14T00:23:38+02:00 Refactor auto connect - - - - - 03ffeab9 by lovetox at 2020-08-14T00:23:38+02:00 Refactor changing status - Move code out of Roster module - Simplify code - Preferences: Add new setting which makes Gajim show the status change dialog on all status changes - - - - - 18 changed files: - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/helpers.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_tune.py - gajim/data/gui/preferences_window.ui - gajim/data/gui/status_change_window.ui - gajim/gtk/dialogs.py - gajim/gtk/preferences.py - gajim/gtk/status_change.py - gajim/gtk/status_selector.py - gajim/gtk/statusicon.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/app.py ===================================== @@ -378,6 +378,19 @@ def get_number_of_connected_accounts(accounts_list=None): connected_accounts = connected_accounts + 1 return connected_accounts +def get_available_clients(account=None): + clients = [] + if account is not None: + client = connections.get(account) + if client is None or not client.state.is_available: + return [] + return [client] + + for client in connections.values(): + if client.state.is_available: + clients.append(client) + return clients + def get_connected_accounts(exclude_local=False): """ Returns a list of CONNECTED accounts ===================================== gajim/common/client.py ===================================== @@ -102,6 +102,10 @@ class Client(ConnectionHandlers): def state(self): return self._state + @property + def account(self): + return self._account + @property def status(self): return self._status @@ -384,6 +388,10 @@ class Client(ConnectionHandlers): # We are connected if show == 'offline': + self.set_user_activity(None) + self.set_user_mood(None) + self.set_user_tune(None) + self.set_user_location(None) presence = self.get_module('Presence').get_presence( typ='unavailable', status=message, @@ -409,6 +417,18 @@ class Client(ConnectionHandlers): if include_muc: self.get_module('MUC').update_presence() + def set_user_activity(self, activity): + self.get_module('UserActivity').set_activity(activity) + + def set_user_mood(self, mood): + self.get_module('UserMood').set_mood(mood) + + def set_user_tune(self, tune): + self.get_module('UserTune').set_tune(tune) + + def set_user_location(self, location): + self.get_module('UserLocation').set_location(location) + def get_module(self, name): return modules.get(self._account, name) ===================================== gajim/common/config.py ===================================== @@ -246,6 +246,7 @@ class Config: 'show_help_start_chat': [opt_bool, True, _('Shows an info bar with helpful hints in the Start / Join Chat dialog')], 'check_for_update': [opt_bool, True, _('Check for Gajim updates periodically')], 'last_update_check': [opt_str, '', _('Date of the last update check')], + 'always_ask_for_status_message': [opt_bool, True], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { @@ -269,7 +270,6 @@ class Config: 'autopriority_xa': [opt_int, 30], 'autopriority_dnd': [opt_int, 20], 'autoconnect': [opt_bool, False, '', True], - 'autoconnect_as': [opt_str, 'online', _('Status to be used automatically when connecting. Can be \'online\', \'chat\', \'away\', \'xa\' or \'dnd\'. NOTE: This option is used only if \'restore_last_status\' is disabled.'), True], 'restore_last_status': [opt_bool, False, _('If enabled, the last status will be restored.')], 'autoauth': [opt_bool, False, _('If enabled, contacts requesting authorization will be accepted automatically.')], 'active': [opt_bool, True, _('If disabled, this account will be disabled and will not appear in the contact list window.'), True], ===================================== gajim/common/helpers.py ===================================== @@ -1428,3 +1428,17 @@ def should_log(account, jid): no_log_for = no_log_for.split() return (account not in no_log_for) and (jid not in no_log_for) + + +def ask_for_status_message(status, signin=False): + if status is None: + # We try to change the message + return True + + if signin: + return app.config.get('ask_online_status') + + if status == 'offline': + return app.config.get('ask_offline_status') + + return app.config.get('always_ask_for_status_message') ===================================== gajim/common/modules/user_activity.py ===================================== @@ -18,12 +18,12 @@ from typing import Any from typing import Tuple from nbxmpp.namespaces import Namespace +from nbxmpp.structs import ActivityData from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node -from gajim.common.modules.util import store_publish from gajim.common.const import PEPEventType @@ -38,6 +38,11 @@ class UserActivity(BaseModule): BaseModule.__init__(self, con) self._register_pubsub_handler(self._activity_received) + self._current_activity = None + + def get_current_activity(self): + return self._current_activity + @event_node(Namespace.ACTIVITY) def _activity_received(self, _con, _stanza, properties): if properties.pubsub_event.retracted: @@ -56,6 +61,7 @@ class UserActivity(BaseModule): self._con.pep[PEPEventType.ACTIVITY] = data else: self._con.pep.pop(PEPEventType.ACTIVITY, None) + self._current_activity = data app.nec.push_incoming_event( NetworkEvent('activity-received', @@ -64,9 +70,20 @@ class UserActivity(BaseModule): activity=data, is_self_message=properties.is_self_message)) - @store_publish def set_activity(self, activity): - self._log.info('Send %s', activity) + if activity is not None: + activity = ActivityData(*activity, None) + + if activity == self._current_activity: + return + + self._current_activity = activity + + if activity is None: + self._log.info('Remove user activity') + else: + self._log.info('Set %s', activity) + self._nbxmpp('Activity').set_activity(activity) ===================================== gajim/common/modules/user_location.py ===================================== @@ -35,6 +35,11 @@ class UserLocation(BaseModule): BaseModule.__init__(self, con) self._register_pubsub_handler(self._location_received) + self._current_location = None + + def get_current_location(self): + return self._current_location + @event_node(Namespace.LOCATION) def _location_received(self, _con, _stanza, properties): if properties.pubsub_event.retracted: @@ -53,6 +58,7 @@ class UserLocation(BaseModule): self._con.pep[PEPEventType.LOCATION] = data else: self._con.pep.pop(PEPEventType.LOCATION, None) + self._current_location = data app.nec.push_incoming_event( NetworkEvent('location-received', @@ -63,6 +69,7 @@ class UserLocation(BaseModule): @store_publish def set_location(self, location): + self._current_location = location self._log.info('Send %s', location) self._nbxmpp('Location').set_location(location) ===================================== gajim/common/modules/user_mood.py ===================================== @@ -18,12 +18,12 @@ from typing import Any from typing import Tuple from nbxmpp.namespaces import Namespace +from nbxmpp.structs import MoodData from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node -from gajim.common.modules.util import store_publish from gajim.common.const import PEPEventType @@ -38,6 +38,11 @@ class UserMood(BaseModule): BaseModule.__init__(self, con) self._register_pubsub_handler(self._mood_received) + self._current_mood = None + + def get_current_mood(self): + return self._current_mood + @event_node(Namespace.MOOD) def _mood_received(self, _con, _stanza, properties): if properties.pubsub_event.retracted: @@ -56,6 +61,7 @@ class UserMood(BaseModule): self._con.pep[PEPEventType.MOOD] = data else: self._con.pep.pop(PEPEventType.MOOD, None) + self._current_mood = data app.nec.push_incoming_event( NetworkEvent('mood-received', @@ -64,9 +70,20 @@ class UserMood(BaseModule): mood=data, is_self_message=properties.is_self_message)) - @store_publish def set_mood(self, mood): - self._log.info('Send %s', mood) + if mood is not None: + mood = MoodData(mood, None) + + if mood == self._current_mood: + return + + self._current_mood = mood + + if mood is None: + self._log.info('Remove user mood') + else: + self._log.info('Set %s', mood) + self._nbxmpp('Mood').set_mood(mood) ===================================== gajim/common/modules/user_tune.py ===================================== @@ -47,6 +47,9 @@ class UserTune(BaseModule): ('signed-in', ged.CORE, self._on_signed_in), ]) + def get_current_tune(self): + return self._tune_data + @event_node(Namespace.TUNE) def _tune_received(self, _con, _stanza, properties): if properties.pubsub_event.retracted: @@ -65,6 +68,7 @@ class UserTune(BaseModule): self._con.pep[PEPEventType.TUNE] = data else: self._con.pep.pop(PEPEventType.TUNE, None) + self._tune_data = data app.nec.push_incoming_event( NetworkEvent('tune-received', @@ -82,6 +86,12 @@ class UserTune(BaseModule): self._account, 'publish_tune'): return + + if tune == self._tune_data: + return + + self._tune_data = tune + self._log.info('Send %s', tune) self._nbxmpp('Tune').set_tune(tune) @@ -110,7 +120,7 @@ class UserTune(BaseModule): def _on_music_track_changed(self, event): if self._tune_data == event.info: return - self._tune_data = event.info + self.set_tune(event.info) ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -827,14 +827,14 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="status_change_checkbutton"> + <object class="GtkCheckButton" id="show_status_change_checkbutton"> <property name="label" translatable="yes">Show status changes (Default)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If status change messages are shown in the group chat. This setting can be overridden in the group chat menu.</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="_on_status_change_toggled" swapped="no"/> + <signal name="toggled" handler="_on_show_status_change_toggled" swapped="no"/> </object> <packing> <property name="left_attach">0</property> @@ -1276,6 +1276,146 @@ <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <child> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="restore_last_status_checkbutton"> + <property name="label" translatable="yes">_Remember last status</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, the status and status message used in the last session will be restored</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_restore_last_status_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">General</property> + <property name="use_markup">True</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="sign_in_status_checkbutton"> + <property name="label" translatable="yes">Sign _In</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Show the status change dialog on Sign In</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sign_in_status_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="sign_out_status_checkbutton"> + <property name="label" translatable="yes">Sign _Out</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Show the status change dialog on Sign Out</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sign_out_status_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="status_change_checkbutton"> + <property name="label" translatable="yes">_Status Change</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Show the status change dialog on all status changes</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_status_change_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Ask for Status Message on …</property> + <style> + <class name="bold"/> + <class name="margin-top6"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkFrame"> <property name="visible">True</property> @@ -1389,6 +1529,7 @@ $T will be replaced by auto-not-available timeout.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Minutes</property> + <property name="xalign">0</property> <style> <class name="dim-label"/> </style> @@ -1403,6 +1544,7 @@ $T will be replaced by auto-not-available timeout.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Message</property> + <property name="xalign">0</property> <style> <class name="dim-label"/> </style> @@ -1417,6 +1559,7 @@ $T will be replaced by auto-not-available timeout.</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Status</property> + <property name="xalign">0</property> <style> <class name="dim-label"/> </style> @@ -1444,139 +1587,9 @@ $T will be replaced by auto-not-available timeout.</property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">start</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="valign">start</property> - <property name="margin_top">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="restore_last_status_checkbutton"> - <property name="label" translatable="yes">_Remember and restore status of the last session</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, the status and status message used in the last session will be restored</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_restore_last_status_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Ask for status message when I</property> - <property name="justify">right</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkCheckButton" id="prompt_online_status_message_checkbutton"> - <property name="label" translatable="yes">Sign _in</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_prompt_online_status_message_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="prompt_offline_status_message_checkbutton"> - <property name="label" translatable="yes">Sign _out</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_prompt_offline_status_message_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Status Messages</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="margin-top6"/> - </style> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="name">status</property> ===================================== gajim/data/gui/status_change_window.ui ===================================== @@ -48,7 +48,7 @@ <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="popover">preset_popover</property> - <signal name="toggled" handler="_stop_timeout" swapped="no"/> + <signal name="toggled" handler="stop_timeout" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> ===================================== gajim/gtk/dialogs.py ===================================== @@ -524,14 +524,21 @@ class TimeoutWindow: Derived windows close automatically after reaching the timeout """ def __init__(self, timeout): - self.countdown_left = timeout - self.countdown_enabled = True self.title_text = '' + self._countdown_left = timeout + self._timeout_source_id = None - def run_timeout(self): - if self.countdown_left > 0: + def start_timeout(self): + if self._countdown_left > 0: self.countdown() - GLib.timeout_add_seconds(1, self.countdown) + self._timeout_source_id = GLib.timeout_add_seconds( + 1, self.countdown) + + def stop_timeout(self, *args, **kwargs): + if self._timeout_source_id is not None: + GLib.source_remove(self._timeout_source_id) + self._timeout_source_id = None + self.set_title(self.title_text) def on_timeout(self): """ @@ -539,17 +546,15 @@ class TimeoutWindow: """ def countdown(self): - if self.countdown_enabled: - if self.countdown_left <= 0: - self.on_timeout() - return False - self.set_title('%s [%s]' % ( - self.title_text, str(self.countdown_left))) - self.countdown_left -= 1 - return True + if self._countdown_left <= 0: + self._timeout_source_id = None + self.on_timeout() + return False - self.set_title(self.title_text) - return False + self.set_title('%s [%s]' % ( + self.title_text, str(self._countdown_left))) + self._countdown_left -= 1 + return True class ShortcutsWindow: ===================================== gajim/gtk/preferences.py ===================================== @@ -168,7 +168,7 @@ class Preferences(Gtk.ApplicationWindow): self._ui.join_leave_checkbutton.set_active(st) st = app.config.get('print_status_muc_default') - self._ui.status_change_checkbutton.set_active(st) + self._ui.show_status_change_checkbutton.set_active(st) # Displayed chat state notifications st = app.config.get('show_chatstate_in_tabs') @@ -266,9 +266,11 @@ class Preferences(Gtk.ApplicationWindow): # Ask for status when online/offline st = app.config.get('ask_online_status') - self._ui.prompt_online_status_message_checkbutton.set_active(st) + self._ui.sign_in_status_checkbutton.set_active(st) st = app.config.get('ask_offline_status') - self._ui.prompt_offline_status_message_checkbutton.set_active(st) + self._ui.sign_out_status_checkbutton.set_active(st) + st = app.config.get('always_ask_for_status_message') + self._ui.status_change_checkbutton.set_active(st) ### Style tab ### # Themes @@ -568,7 +570,7 @@ class Preferences(Gtk.ApplicationWindow): for control in self._get_all_muc_controls(): control.update_actions() - def _on_status_change_toggled(self, widget): + def _on_show_status_change_toggled(self, widget): self.on_checkbutton_toggled(widget, 'print_status_muc_default') for control in self._get_all_muc_controls(): control.update_actions() @@ -665,12 +667,15 @@ class Preferences(Gtk.ApplicationWindow): widget.set_inconsistent(False) self.on_per_account_checkbutton_toggled(widget, 'restore_last_status') - def on_prompt_online_status_message_checkbutton_toggled(self, widget): + def on_sign_in_status_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ask_online_status') - def on_prompt_offline_status_message_checkbutton_toggled(self, widget): + def on_sign_out_status_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ask_offline_status') + def on_status_change_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'always_ask_for_status_message') + ### Style ### @staticmethod def on_theme_combobox_changed(combobox): ===================================== gajim/gtk/status_change.py ===================================== @@ -50,7 +50,7 @@ ACTIVITY_PAGELIST = [ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): - def __init__(self, callback, account=None, show=None, show_pep=True): + def __init__(self, callback=None, account=None, status=None, show_pep=True): Gtk.ApplicationWindow.__init__(self) countdown_time = app.config.get('change_status_window_timeout') TimeoutWindow.__init__(self, countdown_time) @@ -64,7 +64,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self.account = account self._callback = callback - self._show = show + self._status = status self._show_pep = show_pep self._ui = get_builder('status_change_window.ui') @@ -80,7 +80,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._preset_messages_dict = {} self._get_presets() - if self._show: + if self._status: self._ui.activity_switch.set_active(self._pep_dict['activity']) self._ui.activity_page_button.set_sensitive( self._pep_dict['activity']) @@ -100,21 +100,18 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._ui.pep_grid.set_no_show_all(True) self._ui.pep_grid.hide() - self._message_buffer.connect('changed', self._stop_timeout) + self._message_buffer.connect('changed', self.stop_timeout) self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) self.show_all() - self.run_timeout() + self.start_timeout() def on_timeout(self): self._change_status() - def _stop_timeout(self, *args): - self.countdown_enabled = False - def _on_key_press(self, _widget, event): - self.countdown_enabled = False + self.stop_timeout() if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter): if event.get_state() & Gdk.ModifierType.CONTROL_MASK: self._change_status() @@ -374,7 +371,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._ui.mood_button_label.set_text(_('No mood')) def _on_preset_select(self, widget): - self.countdown_enabled = False + self.stop_timeout() self._ui.preset_popover.popdown() name = widget.get_name() self._message_buffer.set_text(self._preset_messages_dict[name][0]) @@ -390,13 +387,13 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._ui.mood_page_button.set_sensitive(self._pep_dict['mood']) def _on_preset_remove(self, widget): - self.countdown_enabled = False + self.stop_timeout() name = widget.get_name() app.config.del_per('statusmsg', name) self._get_presets() def _on_save_as_preset_clicked(self, _widget): - self.countdown_enabled = False + self.stop_timeout() start_iter, finish_iter = self._message_buffer.get_bounds() message_text = self._message_buffer.get_text( start_iter, finish_iter, True) @@ -452,7 +449,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): transient_for=self).show() def _on_activity_page_clicked(self, _widget): - self.countdown_enabled = False + self.stop_timeout() self._ui.status_stack.set_visible_child_full( 'activity-page', Gtk.StackTransitionType.SLIDE_LEFT) @@ -467,7 +464,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._pep_dict['subactivity'] = '' def _on_mood_page_clicked(self, _widget): - self.countdown_enabled = False + self.stop_timeout() self._ui.status_stack.set_visible_child_full( 'mood-page', Gtk.StackTransitionType.SLIDE_LEFT) @@ -487,24 +484,62 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._draw_mood() def _on_activity_switch(self, switch, *args): - self.countdown_enabled = False + self.stop_timeout() self._ui.activity_page_button.set_sensitive(switch.get_active()) def _on_mood_switch(self, switch, *args): - self.countdown_enabled = False + self.stop_timeout() self._ui.mood_page_button.set_sensitive(switch.get_active()) + def _send_user_mood(self): + mood = None + if self._ui.mood_switch.get_active(): + mood = self._pep_dict['mood'] + + for client in app.get_available_clients(self.account): + if not app.config.get_per('accounts', client.account, + 'sync_with_global_status'): + continue + client.set_user_mood(mood) + + def _send_user_activity(self): + activity = None + if self._ui.activity_switch.get_active(): + activity = (self._pep_dict['activity'], + self._pep_dict['subactivity']) + + for client in app.get_available_clients(self.account): + if not app.config.get_per('accounts', client.account, + 'sync_with_global_status'): + continue + client.set_user_activity(activity) + + def _send_status_and_message(self, message): + if self.account is not None: + app.interface.roster.send_status(self.account, + self._status, + message) + return + + for account in app.connections: + if not app.config.get_per('accounts', account, + 'sync_with_global_status'): + continue + + app.interface.roster.send_status(account, self._status, message) + def _change_status(self, *args): + self.stop_timeout() beg, end = self._message_buffer.get_bounds() message = self._message_buffer.get_text(beg, end, True).strip() message = remove_invalid_xml_chars(message) - if not self._ui.activity_switch.get_active(): - self._pep_dict['activity'] = '' - self._pep_dict['subactivity'] = '' + if self._show_pep: + self._send_user_activity() + self._send_user_mood() - if not self._ui.mood_switch.get_active(): - self._pep_dict['mood'] = '' - - self._callback(message, self._pep_dict) + if self._callback is not None: + self._callback(message) + else: + self._send_status_and_message(message) self.destroy() ===================================== gajim/gtk/status_selector.py ===================================== @@ -22,7 +22,6 @@ from gajim.common.helpers import statuses_unified from gajim.common.i18n import _ from gajim.gtk.util import get_icon_name -from gajim.gtk.util import open_window class StatusSelector(Gtk.MenuButton): @@ -100,25 +99,11 @@ class StatusSelector(Gtk.MenuButton): self.set_popover(self._status_popover) def _on_change_status(self, button): - def _on_response(message, pep_dict): - if message is None: # None if user canceled - return - for account in app.contacts.get_accounts(): - sync_account = app.config.get_per( - 'accounts', account, 'sync_with_global_status') - if not sync_account: - continue - app.interface.roster.send_status(account, new_show, message) - app.interface.roster.send_pep(account, pep_dict) - self._status_popover.popdown() - new_show = button.get_name() - if new_show == 'change_status_message': - new_show = get_global_show() - open_window('StatusChange', callback=_on_response, show=new_show) - return - - app.interface.roster.get_status_message(new_show, _on_response) + new_status = button.get_name() + if new_status == 'change_status_message': + new_status = None + app.interface.change_status(status=new_status) def update(self): show = get_global_show() ===================================== gajim/gtk/statusicon.py ===================================== @@ -24,8 +24,6 @@ import os from gi.repository import Gtk from gi.repository import GLib -from gajim import dialogs - from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -354,35 +352,8 @@ class StatusIcon: @staticmethod def _on_show(_widget, show): - # we all add some fake (we cannot select those nor have them as show) - # but this helps to align with roster's status_combobox index positions - status = ['online', 'chat', 'away', 'xa', 'dnd', - 'SEPARATOR', 'CHANGE_STATUS_MSG_MENUITEM', 'SEPARATOR', - 'offline'] - index = status.index(show) - if not helpers.statuses_unified(): - app.interface.roster.status_combobox.set_active(index + 2) - return - current = app.interface.roster.status_combobox.get_active() - if index != current: - app.interface.roster.status_combobox.set_active(index) + app.interface.change_status(status=show) @staticmethod def _on_change_status(_widget): - model = app.interface.roster.status_combobox.get_model() - active = app.interface.roster.status_combobox.get_active() - status = model[active][2] - def on_response(message, pep_dict): - if message is None: # None if user press Cancel - return - accounts = app.connections.keys() - for acct in accounts: - if not app.config.get_per('accounts', - acct, - 'sync_with_global_status'): - continue - show = app.connections[acct].status - app.interface.roster.send_status(acct, show, message) - app.interface.roster.send_pep(acct, pep_dict) - dlg = dialogs.ChangeStatusMessageDialog(on_response, status) - dlg.dialog.present() + app.interface.change_status() ===================================== gajim/gtk/util.py ===================================== @@ -545,6 +545,12 @@ def format_mood(mood, text): return markuptext +def get_account_mood_icon_name(account): + client = app.get_client(account) + mood = client.get_module('UserMood').get_current_mood() + return f'mood-{mood.mood}' if mood is not None else mood + + def format_activity(activity, subactivity, text): if activity is None: return None @@ -569,6 +575,14 @@ def get_activity_icon_name(activity, subactivity=None): return icon_name +def get_account_activity_icon_name(account): + client = app.get_client(account) + activity = client.get_module('UserActivity').get_current_activity() + if activity is None: + return None + return get_activity_icon_name(activity.activity, activity.subactivity) + + def format_tune(artist, _length, _rating, source, title, _track, _uri): if artist is None and title is None and source is None: return None @@ -583,6 +597,12 @@ def format_tune(artist, _length, _rating, source, title, _track, _uri): return tune_string +def get_account_tune_icon_name(account): + client = app.get_client(account) + tune = client.get_module('UserTune').get_current_tune() + return None if tune is None else 'audio-x-generic' + + def format_location(location): location = location._asdict() location_string = '' @@ -600,6 +620,12 @@ def format_location(location): return location_string.strip() +def get_account_location_icon_name(account): + client = app.get_client(account) + location = client.get_module('UserLocation').get_current_location() + return None if location is None else 'applications-internet' + + def format_fingerprint(fingerprint): fplen = len(fingerprint) wordsize = fplen // 8 ===================================== gajim/gui_interface.py ===================================== @@ -75,6 +75,7 @@ from gajim.common import socks5 from gajim.common import helpers from gajim.common import passwords from gajim.common import logging_helpers +from gajim.common.helpers import ask_for_status_message from gajim.common.structs import MUCData from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ @@ -809,6 +810,9 @@ class Interface: app.config.get_per('accounts', account, 'publish_location')): location.enable() + if ask_for_status_message(obj.conn.status, signin=True): + open_window('StatusChange', status=obj.conn.status) + @staticmethod def show_httpupload_progress(transfer): FileTransferProgress(transfer) @@ -1657,31 +1661,58 @@ class Interface: """ Auto connect at startup """ - # dict of account that want to connect sorted by status - shows = {} - for a in app.connections: - if app.config.get_per('accounts', a, 'autoconnect'): - if app.config.get_per('accounts', a, 'restore_last_status'): - self.roster.send_status(a, app.config.get_per('accounts', - a, 'last_status'), helpers.from_one_line( - app.config.get_per('accounts', a, 'last_status_msg'))) - continue - show = app.config.get_per('accounts', a, 'autoconnect_as') - if show not in ['online', 'chat', 'away', 'xa', 'dnd']: - continue - if show not in shows: - shows[show] = [a] - else: - shows[show].append(a) - def on_message(message, pep_dict): - if message is None: - return - for a in shows[show]: - self.roster.send_status(a, show, message) - self.roster.send_pep(a, pep_dict) - for show in shows: - self.roster.get_status_message(show, on_message) - return False + + for account in app.connections: + if not app.config.get_per('accounts', account, 'autoconnect'): + continue + + status = 'online' + status_message = '' + + if app.config.get_per('accounts', account, 'restore_last_status'): + status = app.config.get_per('accounts', account, 'last_status') + status_message = app.config.get_per('accounts', + account, + 'last_status_msg') + status_message = helpers.from_one_line(status_message) + + self.roster.send_status(account, status, status_message) + + def change_status(self, status=None): + # status=None means we want to change the message only + + ask = ask_for_status_message(status) + + if status is None: + status = helpers.get_global_show() + + if ask: + open_window('StatusChange', status=status) + return + + for account in app.connections: + if not app.config.get_per('accounts', account, + 'sync_with_global_status'): + continue + + message = app.get_client(account).status_message + self.roster.send_status(account, status, message) + + def change_account_status(self, account, status=None): + # status=None means we want to change the message only + + ask = ask_for_status_message(status) + + client = app.get_client(account) + if status is None: + status = client.status + + if ask: + open_window('StatusChange', status=status, account=account) + return + + message = client.status_message + self.roster.send_status(account, status, message) def show_systray(self): if not app.is_display(Display.WAYLAND): ===================================== gajim/roster_window.py ===================================== @@ -42,8 +42,6 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio from nbxmpp.namespaces import Namespace -from nbxmpp.structs import MoodData -from nbxmpp.structs import ActivityData from gajim import dialogs from gajim import vcard @@ -55,6 +53,7 @@ from gajim.common import helpers from gajim.common.exceptions import GajimGeneralException from gajim.common import i18n from gajim.common.helpers import save_roster_position +from gajim.common.helpers import ask_for_status_message from gajim.common.i18n import _ from gajim.common.const import PEPEventType, AvatarSize, StyleAttr from gajim.common.dbus import location @@ -84,6 +83,10 @@ from gajim.gtk.util import get_metacontact_surface from gajim.gtk.util import get_builder from gajim.gtk.util import set_urgency_hint from gajim.gtk.util import get_activity_icon_name +from gajim.gtk.util import get_account_activity_icon_name +from gajim.gtk.util import get_account_mood_icon_name +from gajim.gtk.util import get_account_tune_icon_name +from gajim.gtk.util import get_account_location_icon_name from gajim.gtk.util import open_window @@ -1006,29 +1009,17 @@ class RosterWindow: self.model[child_iter][Column.NAME] = GLib.markup_escape_text(account_name) - pep_dict = app.connections[account].pep - if app.config.get('show_mood_in_roster') and PEPEventType.MOOD in pep_dict: - self.model[child_iter][Column.MOOD_PIXBUF] = 'mood-%s' % pep_dict[PEPEventType.MOOD].mood - else: - self.model[child_iter][Column.MOOD_PIXBUF] = None + mood_icon_name = get_account_mood_icon_name(account) + self.model[child_iter][Column.MOOD_PIXBUF] = mood_icon_name - if app.config.get('show_activity_in_roster') and PEPEventType.ACTIVITY in pep_dict: - activity = pep_dict[PEPEventType.ACTIVITY].activity - subactivity = pep_dict[PEPEventType.ACTIVITY].subactivity - icon_name = get_activity_icon_name(activity, subactivity) - self.model[child_iter][Column.ACTIVITY_PIXBUF] = icon_name - else: - self.model[child_iter][Column.ACTIVITY_PIXBUF] = None + activity_icon_name = get_account_activity_icon_name(account) + self.model[child_iter][Column.ACTIVITY_PIXBUF] = activity_icon_name - if app.config.get('show_tunes_in_roster') and PEPEventType.TUNE in pep_dict: - self.model[child_iter][Column.TUNE_ICON] = 'audio-x-generic' - else: - self.model[child_iter][Column.TUNE_ICON] = None + tune_icon_name = get_account_tune_icon_name(account) + self.model[child_iter][Column.TUNE_ICON] = tune_icon_name - if app.config.get('show_location_in_roster') and PEPEventType.LOCATION in pep_dict: - self.model[child_iter][Column.LOCATION_ICON] = 'applications-internet' - else: - self.model[child_iter][Column.LOCATION_ICON] = None + location_icon_name = get_account_location_icon_name(account) + self.model[child_iter][Column.LOCATION_ICON] = location_icon_name def _really_draw_accounts(self): for acct in self.accounts_to_draw: @@ -2024,27 +2015,11 @@ class RosterWindow: if not app.account_is_available(account): self.set_connecting_state(account) - self.send_status_continue(account, status, txt) - - def send_pep(self, account, pep_dict): - connection = app.connections[account] - if 'activity' in pep_dict: - activity = pep_dict['activity'] - subactivity = pep_dict.get('subactivity', None) - activity_text = pep_dict.get('activity_text', None) - connection.get_module('UserActivity').set_activity(ActivityData( - activity, subactivity, activity_text)) - else: - connection.get_module('UserActivity').set_activity(None) - - if 'mood' in pep_dict: - mood = pep_dict['mood'] - mood_text = pep_dict.get('mood_text', None) - connection.get_module('UserMood').set_mood(MoodData(mood, mood_text)) - else: - connection.get_module('UserMood').set_mood(None) + if status == 'offline': + self.delete_pep(app.get_jid_from_account(account), account) - connection.get_module('UserTune').set_tune(None) + app.connections[account].change_status(status, txt) + self._status_selector.update() def delete_pep(self, jid, account): if jid == app.get_jid_from_account(account): @@ -2059,13 +2034,6 @@ class RosterWindow: if ctrl: ctrl.update_all_pep_types() - def send_status_continue(self, account, status, txt): - if status == 'offline': - self.delete_pep(app.get_jid_from_account(account), account) - - app.connections[account].change_status(status, txt) - self._status_selector.update() - def chg_contact_status(self, contact, show, status_message, account): """ When a contact changes their status @@ -2159,36 +2127,8 @@ class RosterWindow: app.interface.systray.change_status(show) self._status_selector.update() - def get_status_message(self, show, callback, show_pep=True, - always_ask=False): - """ - Get the status message by: - - asking to user if needed depending on ask_on(ff)line_status and - always_ask - show_pep can be False to hide pep things from status message or True - """ - empty_pep = {'activity': '', - 'subactivity': '', - 'activity_text': '', - 'mood': '', - 'mood_text': ''} - if not always_ask and ((show == 'online' and not app.config.get( - 'ask_online_status')) or (show == 'offline' and not - app.config.get('ask_offline_status'))): - callback('', empty_pep) - return - - open_window('StatusChange', callback=callback, show=show, - show_pep=show_pep) - - def change_status(self, widget, account, status): - def _on_response(message, pep_dict): - if message is None: # None if user canceled - return - self.send_status(account, status, message) - self.send_pep(account, pep_dict) - self.get_status_message(status, _on_response) + def change_status(self, _widget, account, status): + app.interface.change_account_status(account, status=status) def get_show(self, lcontact): prio = lcontact[0].priority @@ -2311,7 +2251,7 @@ class RosterWindow: get_msg = True break - def on_continue3(message, pep_dict): + def on_continue3(message): self.quit_on_next_offline = 0 accounts_to_disconnect = [] for acct in accounts: @@ -2326,11 +2266,10 @@ class RosterWindow: for acct in accounts_to_disconnect: self.send_status(acct, 'offline', message) - self.send_pep(acct, pep_dict) - def on_continue2(message, pep_dict): + def on_continue2(message): if 'file_transfers' not in app.interface.instances: - on_continue3(message, pep_dict) + on_continue3(message) return # check if there is an active file transfer from gajim.common.modules.bytestream import is_transfer_active @@ -2354,12 +2293,11 @@ class RosterWindow: DialogButton.make('Remove', text=_('_Quit'), callback=on_continue3, - args=[message, - pep_dict])]).show() + args=[message])]).show() return - on_continue3(message, pep_dict) + on_continue3(message) - def on_continue(message, pep_dict): + def on_continue(message): if message is None: # user pressed Cancel to change status message dialog return @@ -2396,15 +2334,17 @@ class RosterWindow: DialogButton.make('Remove', text=_('_Quit'), callback=on_continue2, - args=[message, - pep_dict])]).show() + args=[message])]).show() return - on_continue2(message, pep_dict) + on_continue2(message) - if get_msg: - self.get_status_message('offline', on_continue, show_pep=False) + if get_msg and ask_for_status_message('offline'): + open_window('StatusChange', + status='offline', + callback=on_continue, + show_pep=False) else: - on_continue('', None) + on_continue('') def _nec_presence_received(self, obj): account = obj.conn.name @@ -2925,15 +2865,8 @@ class RosterWindow: input_str=name, transient_for=self.window).show() - def on_change_status_message_activate(self, widget, account): - show = app.connections[account].status - def _on_response(message, pep_dict): - if message is None: # None if user canceled - return - self.send_status(account, show, message) - self.send_pep(account, pep_dict) - open_window('StatusChange', account=account, callback=_on_response, - show=show) + def on_change_status_message_activate(self, _widget, account): + app.interface.change_account_status(account) def on_add_to_roster(self, widget, contact, account): AddNewContactWindow(account, contact.jid, contact.name) @@ -3029,17 +2962,7 @@ class RosterWindow: # CTRL mask if modifier & Gdk.ModifierType.CONTROL_MASK: if keyval == Gdk.KEY_s: # CTRL + s - show = helpers.get_global_show() - def _on_response(message, pep_dict): - if message is not None: # None if user canceled - for account in app.contacts.get_accounts(): - sync_account = app.config.get_per( - 'accounts', account, 'sync_with_global_status') - if not sync_account: - continue - self.send_status(account, show, message) - self.send_pep(account, pep_dict) - open_window('StatusChange', callback=_on_response, show=show) + app.interface.change_status() return True if keyval == Gdk.KEY_k: # CTRL + k self.enable_rfilter('') @@ -3079,22 +3002,13 @@ class RosterWindow: account = model[path][Column.ACCOUNT] if account != 'all': if app.account_is_available(account): - self.on_change_status_message_activate(widget, account) + app.interface.change_account_status(account) return True + show = helpers.get_global_show() if show == 'offline': return True - def _on_response(message, pep_dict): - if message is None: # None if user canceled - return True - for acct in app.connections: - if not app.config.get_per('accounts', acct, - 'sync_with_global_status'): - continue - current_show = app.connections[acct].status - self.send_status(acct, current_show, message) - self.send_pep(acct, pep_dict) - open_window('StatusChange', callback=_on_response, show=show) + app.interface.change_status() return True if event.button == 1: # Left click @@ -3218,17 +3132,20 @@ class RosterWindow: def on_publish_tune_toggled(self, widget, account): active = widget.get_active() - app.connections[account].get_module('UserTune').set_enabled(active) + client = app.get_client(account) + client.get_module('UserTune').set_enabled(active) def on_publish_location_toggled(self, widget, account): active = widget.get_active() + client = app.get_client(account) app.config.set_per('accounts', account, 'publish_location', active) if active: location.enable() else: - app.connections[account].get_module('UserLocation').set_location(None) + client = app.get_client(account) + client.set_user_location(None) - app.connections[account].get_module('Caps').update_caps() + client.get_module('Caps').update_caps() def on_add_new_contact(self, widget, account): AddNewContactWindow(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/facb3faf4460da57ddbf65fdb835546… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/facb3faf4460da57ddbf65fdb835546… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Show own status message correctly on self contact
by Philipp Hörist 12 Aug '20

12 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: facb3faf by lovetox at 2020-08-12T18:29:39+02:00 Roster: Show own status message correctly on self contact Rename the variable for less confusion - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -2066,13 +2066,13 @@ class RosterWindow: app.connections[account].change_status(status, txt) self._status_selector.update() - def chg_contact_status(self, contact, show, status, account): + def chg_contact_status(self, contact, show, status_message, account): """ When a contact changes their status """ contact_instances = app.contacts.get_contacts(account, contact.jid) contact.show = show - contact.status = status + contact.status = status_message # name is to show in conversation window name = contact.get_shown_name() fjid = contact.get_full_jid() @@ -2105,12 +2105,12 @@ class RosterWindow: if ctrl and not ctrl.is_groupchat: ctrl.contact = app.contacts.get_contact_with_highest_priority( account, contact.jid) - ctrl.update_status_display(name, uf_show, status) + ctrl.update_status_display(name, uf_show, status_message) if contact.resource: ctrl = app.interface.msg_win_mgr.get_control(fjid, account) if ctrl: - ctrl.update_status_display(name, uf_show, status) + ctrl.update_status_display(name, uf_show, status_message) # Delete pep if needed keep_pep = any(c.show not in ('error', 'offline') for c in @@ -2134,8 +2134,8 @@ class RosterWindow: self_contact = app.contacts.get_contact(account, app.get_jid_from_account(account), resource=self_resource) if self_contact: - status = app.connections[account].status - self.chg_contact_status(self_contact, show, status, account) + status_message = app.connections[account].status_message + self.chg_contact_status(self_contact, show, status_message, account) self.set_account_status_icon(account) if show == 'offline': if self.quit_on_next_offline > -1: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/facb3faf4460da57ddbf65fdb8355465… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/facb3faf4460da57ddbf65fdb8355465… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Preferences: Remove status message settings
by Philipp Hörist 12 Aug '20

12 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 746c4987 by lovetox at 2020-08-12T17:31:01+02:00 Preferences: Remove status message settings Adding/Removing presets is now in the status change dialog available - - - - - 2f57f62d by lovetox at 2020-08-12T17:34:15+02:00 Config: Remove obsolete default values - - - - - d9b60f8e by lovetox at 2020-08-12T18:11:49+02:00 StatusChange: Show dialog correctly on sign-in/out Also fix some layout issues - - - - - 5 changed files: - gajim/common/config.py - gajim/data/gui/preferences_window.ui - gajim/data/gui/status_change_window.ui - gajim/gtk/preferences.py - gajim/gtk/status_change.py Changes: ===================================== gajim/common/config.py ===================================== @@ -370,12 +370,6 @@ class Config: _('Working'): [_('I\'m working.'), 'working', 'other', '', '', ''], _('Phone'): [_('I\'m on the phone.'), 'talking', 'on_the_phone', '', '', ''], _('Out'): [_('I\'m out enjoying life.'), 'relaxing', 'going_out', '', '', ''], - '_last_online': ['', '', '', '', '', ''], - '_last_chat': ['', '', '', '', '', ''], - '_last_away': ['', '', '', '', '', ''], - '_last_xa': ['', '', '', '', '', ''], - '_last_dnd': ['', '', '', '', '', ''], - '_last_offline': ['', '', '', '', '', ''], } soundevents_default = { ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1575,148 +1575,7 @@ $T will be replaced by auto-not-available timeout.</property> </packing> </child> <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="height_request">250</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="msg_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">status_message_liststore</property> - <property name="headers_visible">False</property> - <property name="search_column">0</property> - <signal name="cursor-changed" handler="on_msg_treeview_cursor_changed" swapped="no"/> - <signal name="key-press-event" handler="on_msg_treeview_key_press_event" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="msg_textview"> - <property name="height_request">21</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="new_msg_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="on_new_msg_button_clicked" swapped="no"/> - <child> - <object class="GtkImage" id="status-message-add"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="delete_msg_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <signal name="clicked" handler="on_delete_msg_button_clicked" swapped="no"/> - <child> - <object class="GtkImage" id="status-message-remove"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Preset Status Messages</property> - <property name="use_markup">True</property> - <style> - <class name="bold"/> - <class name="margin-top6"/> - </style> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/data/gui/status_change_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkPopover" id="preset_popover"> @@ -116,7 +116,7 @@ </packing> </child> <child> - <object class="GtkGrid"> + <object class="GtkGrid" id="pep_grid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">center</property> ===================================== gajim/gtk/preferences.py ===================================== @@ -270,17 +270,6 @@ class Preferences(Gtk.ApplicationWindow): st = app.config.get('ask_offline_status') self._ui.prompt_offline_status_message_checkbutton.set_active(st) - # Status messages - renderer = Gtk.CellRendererText() - renderer.connect('edited', self.on_msg_cell_edited) - renderer.set_property('editable', True) - col = Gtk.TreeViewColumn('name', renderer, text=0) - self._ui.msg_treeview.append_column(col) - self.fill_msg_treeview() - - buf = self._ui.msg_textview.get_buffer() - buf.connect('end-user-action', self.on_msg_textview_changed) - ### Style tab ### # Themes self.changed_id = self._ui.theme_combobox.connect( @@ -427,11 +416,6 @@ class Preferences(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) - self._ui.msg_treeview.get_model().connect('row-changed', - self.on_msg_treemodel_row_changed) - self._ui.msg_treeview.get_model().connect('row-deleted', - self.on_msg_treemodel_row_deleted) - self.sounds_preferences = None self.theme_preferences = None @@ -687,111 +671,6 @@ class Preferences(Gtk.ApplicationWindow): def on_prompt_offline_status_message_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ask_offline_status') - def save_status_messages(self, model): - for msg in app.config.get_per('statusmsg'): - app.config.del_per('statusmsg', msg) - iter_ = model.get_iter_first() - while iter_: - val = model[iter_][0] - if model[iter_][1]: # We have a preset message - if not val: # No title, use message text for title - val = model[iter_][1] - app.config.add_per('statusmsg', val) - msg = helpers.to_one_line(model[iter_][1]) - app.config.set_per('statusmsg', val, 'message', msg) - i = 2 - # Store mood / activity - for subname in ('activity', 'subactivity', 'activity_text', - 'mood', 'mood_text'): - val2 = model[iter_][i] - if not val2: - val2 = '' - app.config.set_per('statusmsg', val, subname, val2) - i += 1 - iter_ = model.iter_next(iter_) - - def on_msg_treemodel_row_changed(self, model, path, iter_): - self.save_status_messages(model) - - def on_msg_treemodel_row_deleted(self, model, path): - self.save_status_messages(model) - - def fill_msg_treeview(self): - self._ui.delete_msg_button.set_sensitive(False) - model = self._ui.msg_treeview.get_model() - model.clear() - preset_status = [] - for msg_name in app.config.get_per('statusmsg'): - if msg_name.startswith('_last_'): - continue - preset_status.append(msg_name) - preset_status.sort() - for msg_name in preset_status: - msg_text = app.config.get_per('statusmsg', msg_name, 'message') - msg_text = helpers.from_one_line(msg_text) - activity = app.config.get_per('statusmsg', msg_name, 'activity') - subactivity = app.config.get_per('statusmsg', msg_name, - 'subactivity') - activity_text = app.config.get_per('statusmsg', msg_name, - 'activity_text') - mood = app.config.get_per('statusmsg', msg_name, 'mood') - mood_text = app.config.get_per('statusmsg', msg_name, 'mood_text') - iter_ = model.append() - model.set(iter_, 0, msg_name, 1, msg_text, 2, activity, 3, - subactivity, 4, activity_text, 5, mood, 6, mood_text) - - def on_msg_cell_edited(self, cell, row, new_text): - model = self._ui.msg_treeview.get_model() - iter_ = model.get_iter_from_string(row) - model.set_value(iter_, 0, new_text) - - def on_msg_treeview_cursor_changed(self, widget, data=None): - sel = self._ui.msg_treeview.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - self._ui.delete_msg_button.set_sensitive(True) - buf = self._ui.msg_textview.get_buffer() - msg = model[iter_][1] - buf.set_text(msg) - - def on_new_msg_button_clicked(self, widget, data=None): - model = self._ui.msg_treeview.get_model() - iter_ = model.append() - model.set( - iter_, 0, _('status message title'), 1, - _('status message text')) - self._ui.msg_treeview.set_cursor(model.get_path(iter_)) - - def on_delete_msg_button_clicked(self, widget, data=None): - sel = self._ui.msg_treeview.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - buf = self._ui.msg_textview.get_buffer() - model.remove(iter_) - buf.set_text('') - self._ui.delete_msg_button.set_sensitive(False) - - def on_msg_textview_changed(self, widget, data=None): - sel = self._ui.msg_treeview.get_selection() - if not sel: - return - (model, iter_) = sel.get_selected() - if not iter_: - return - buf = self._ui.msg_textview.get_buffer() - first_iter, end_iter = buf.get_bounds() - model.set_value(iter_, 1, buf.get_text(first_iter, end_iter, True)) - - def on_msg_treeview_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Delete: - self.on_delete_msg_button_clicked(widget) - ### Style ### @staticmethod def on_theme_combobox_changed(combobox): ===================================== gajim/gtk/status_change.py ===================================== @@ -57,6 +57,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self.set_name('StatusChange') self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) + self.set_default_size(400, 350) self.set_show_menubar(False) self.set_transient_for(app.interface.roster.window) self.title_text = _('Status Message') # TimeoutWindow @@ -96,14 +97,8 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): self._draw_mood() self._init_moods() else: - self._ui.activity_label.set_no_show_all(True) - self._ui.activity_button.set_no_show_all(True) - self._ui.mood_label.set_no_show_all(True) - self._ui.mood_button.set_no_show_all(True) - self._ui.activity_label.hide() - self._ui.activity_button.hide() - self._ui.mood_label.hide() - self._ui.mood_button.hide() + self._ui.pep_grid.set_no_show_all(True) + self._ui.pep_grid.hide() self._message_buffer.connect('changed', self._stop_timeout) self.connect('key-press-event', self._on_key_press) @@ -161,7 +156,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): activities = [] subactivities = [] moods = [] - for account in app.get_connected_accounts(): + for account in app.connections: status_messages.append(app.connections[account].status_message) activity_data = app.connections[account].pep.get( PEPEventType.ACTIVITY) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3069253637125bcafa4fefc58390ec0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3069253637125bcafa4fefc58390ec0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusChange: Rework status change window
by Philipp Hörist 12 Aug '20

12 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 30692536 by wurstsalat at 2020-08-12T16:55:44+02:00 StatusChange: Rework status change window - - - - - 9 changed files: - − gajim/data/gui/change_mood_dialog.ui - − gajim/data/gui/change_status_message_dialog.ui - gajim/data/gui/change_activity_dialog.ui → gajim/data/gui/status_change_window.ui - gajim/dialogs.py - gajim/gtk/const.py - gajim/gtk/dialogs.py - + gajim/gtk/status_change.py - gajim/gtk/status_selector.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/change_mood_dialog.ui deleted ===================================== @@ -1,359 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="change_mood_dialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="default_width">270</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Mood:</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Message:</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="mood_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">None</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="description_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="mood_icons_table"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child> - <object class="GtkRadioButton" id="no_mood_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="relief">none</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">False</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">ok_button</action-widget> - </action-widgets> - </object> -</interface> ===================================== gajim/data/gui/change_status_message_dialog.ui deleted ===================================== @@ -1,338 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.18"/> - <object class="GtkDialog" id="change_status_message_dialog"> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="default_width">270</property> - <property name="default_height">330</property> - <property name="type_hint">dialog</property> - <signal name="key-press-event" handler="on_change_status_message_dialog_key_press_event" swapped="no"/> - <child> - <placeholder/> - </child> - <child internal-child="vbox"> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="top_margin">6</property> - <property name="bottom_margin">6</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="save_as_preset_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Save this message as a preset</property> - <signal name="clicked" handler="on_save_as_preset_button_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-save-as</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="under_table"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="margin_top">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Preset _messages</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">message_combobox</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="activity_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">6</property> - <property name="label" translatable="yes">Ac_tivity</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">activity_button</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="mood_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">M_ood</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">mood_button</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="message_combobox"> - <property name="width_request">200</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <signal name="changed" handler="on_message_combobox_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="activity_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_top">6</property> - <signal name="clicked" handler="on_activity_button_clicked" swapped="no"/> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="activity_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="activity_button_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="mood_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="on_mood_button_clicked" swapped="no"/> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="mood_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="mood_button_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Type your new status message</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">message_textview</property> - <style> - <class name="dim-label"/> - <class name="bold"/> - </style> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">ok_button</action-widget> - </action-widgets> - </object> -</interface> ===================================== gajim/data/gui/change_activity_dialog.ui → gajim/data/gui/status_change_window.ui ===================================== @@ -1,98 +1,370 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="change_activity_dialog"> + <requires lib="gtk+" version="3.22"/> + <object class="GtkPopover" id="preset_popover"> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Set Activity</property> - <property name="default_width">270</property> - <property name="type_hint">dialog</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox5"> + <child> + <placeholder/> + </child> + </object> + <object class="GtkStack" id="status_stack"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="transition_duration">150</property> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area"> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes">Change Status</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="halign">center</property> + <property name="spacing">12</property> <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <object class="GtkMenuButton" id="preset_list_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="popover">preset_popover</property> + <signal name="toggled" handler="_stop_timeout" swapped="no"/> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Status Presets…</property> + </object> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> + <object class="GtkButton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> + <property name="tooltip_text" translatable="yes">Save this message as a preset</property> + <signal name="clicked" handler="_on_save_as_preset_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">document-save-as-symbolic</property> + </object> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Ac_tivity</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">M_ood</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="activity_page_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_activity_page_clicked" swapped="no"/> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="activity_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> + </child> + <child> + <object class="GtkLabel" id="activity_button_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="mood_page_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_mood_page_clicked" swapped="no"/> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="mood_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> + </child> + <child> + <object class="GtkLabel" id="mood_button_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="activity_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <signal name="notify::active" handler="_on_activity_switch" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="mood_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <signal name="notify::active" handler="_on_mood_switch" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Change Status</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="margin_top">12</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_change_status" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="name">status-page</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes">Activity</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="enable_checkbutton"> - <property name="label" translatable="yes">Set an activity</property> + <object class="GtkRadioButton" id="no_activity_button"> + <property name="label" translatable="yes">_No Activity</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="xalign">0.5</property> + <property name="halign">center</property> + <property name="use_underline">True</property> + <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_enable_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="_on_no_activity_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="activity_notebook"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> + <property name="scrollable">True</property> <child> - <object class="GtkBox" id="doing_chores_vbox"> + <object class="GtkBox" id="doing_chores_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> <child type="tab"> <object class="GtkImage" id="doing_chores_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -100,10 +372,20 @@ </packing> </child> <child> - <object class="GtkBox" id="drinking_vbox"> + <object class="GtkBox" id="drinking_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">1</property> @@ -113,7 +395,6 @@ <object class="GtkImage" id="drinking_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -122,10 +403,20 @@ </packing> </child> <child> - <object class="GtkBox" id="eating_vbox"> + <object class="GtkBox" id="eating_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">2</property> @@ -135,7 +426,6 @@ <object class="GtkImage" id="eating_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -144,10 +434,20 @@ </packing> </child> <child> - <object class="GtkBox" id="exercising_vbox"> + <object class="GtkBox" id="exercising_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">3</property> @@ -157,7 +457,6 @@ <object class="GtkImage" id="exercising_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -166,10 +465,20 @@ </packing> </child> <child> - <object class="GtkBox" id="grooming_vbox"> + <object class="GtkBox" id="grooming_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">4</property> @@ -179,7 +488,6 @@ <object class="GtkImage" id="grooming_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -188,10 +496,20 @@ </packing> </child> <child> - <object class="GtkBox" id="having_appointment_vbox"> + <object class="GtkBox" id="having_appointment_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">5</property> @@ -201,7 +519,6 @@ <object class="GtkImage" id="having_appointment_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -210,10 +527,20 @@ </packing> </child> <child> - <object class="GtkBox" id="inactive_vbox"> + <object class="GtkBox" id="inactive_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">6</property> @@ -223,7 +550,6 @@ <object class="GtkImage" id="inactive_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -232,10 +558,20 @@ </packing> </child> <child> - <object class="GtkBox" id="relaxing_vbox"> + <object class="GtkBox" id="relaxing_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">7</property> @@ -245,7 +581,6 @@ <object class="GtkImage" id="relaxing_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -254,10 +589,20 @@ </packing> </child> <child> - <object class="GtkBox" id="talking_vbox"> + <object class="GtkBox" id="talking_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">8</property> @@ -267,7 +612,6 @@ <object class="GtkImage" id="talking_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -276,10 +620,20 @@ </packing> </child> <child> - <object class="GtkBox" id="traveling_vbox"> + <object class="GtkBox" id="traveling_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">9</property> @@ -289,7 +643,6 @@ <object class="GtkImage" id="traveling_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -298,10 +651,20 @@ </packing> </child> <child> - <object class="GtkBox" id="working_vbox"> + <object class="GtkBox" id="working_box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">10</property> @@ -311,7 +674,6 @@ <object class="GtkImage" id="working_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> </object> <packing> @@ -320,53 +682,133 @@ </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Back</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="margin_top">12</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">3</property> </packing> </child> + </object> + <packing> + <property name="name">activity-page</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="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="hbox1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes">Mood</property> + <style> + <class name="large-header"/> + </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="mood_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="moods_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Message:</b> </property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="description_entry"> + <object class="GtkRadioButton" id="no_mood_button"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="relief">none</property> + <property name="active">True</property> + <property name="draw_indicator">False</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_size">1</property> + </object> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Back</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">center</property> + <property name="margin_top">12</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_back_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="fill">True</property> + <property name="position">5</property> </packing> </child> </object> + <packing> + <property name="name">mood-page</property> + <property name="position">2</property> + </packing> </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">ok_button</action-widget> - </action-widgets> </object> </interface> ===================================== gajim/dialogs.py ===================================== @@ -34,30 +34,19 @@ import logging from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GLib from gajim.common.i18n import _ -from gajim.common.const import ACTIVITIES -from gajim.common.const import MOODS from gajim.common import app from gajim.common import helpers from gajim.common.exceptions import GajimGeneralException -from gajim.gtk.dialogs import DialogButton -from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.dialogs import InputDialog from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder -from gajim.gtk.util import get_activity_icon_name from gajim.gtk.util import get_app_window from gajim.gtk import gstreamer -if app.is_installed('GSPELL'): - from gi.repository import Gspell # pylint: disable=ungrouped-imports - - log = logging.getLogger('gajim.dialogs') @@ -216,533 +205,6 @@ class EditGroupsDialog: column.add_attribute(renderer, 'inconsistent', 2) -class ChangeActivityDialog: - PAGELIST = [ - 'doing_chores', 'drinking', 'eating', 'exercising', 'grooming', - 'having_appointment', 'inactive', 'relaxing', 'talking', 'traveling', - 'working'] - - def __init__(self, on_response, activity_=None, subactivity_=None, text=''): - self.on_response = on_response - self.activity = activity_ - self.subactivity = subactivity_ - self.text = text - self.xml = get_builder('change_activity_dialog.ui') - self.window = self.xml.get_object('change_activity_dialog') - self.window.set_transient_for(app.interface.roster.window) - - self.checkbutton = self.xml.get_object('enable_checkbutton') - self.notebook = self.xml.get_object('notebook') - self.entry = self.xml.get_object('description_entry') - - rbtns = {} - group = None - - for category in ACTIVITIES: - icon_name = get_activity_icon_name(category) - item = self.xml.get_object(category + '_image') - item.set_from_icon_name(icon_name, Gtk.IconSize.MENU) - item.set_tooltip_text(ACTIVITIES[category]['category']) - - vbox = self.xml.get_object(category + '_vbox') - vbox.set_border_width(5) - - # Other - act = category + '_other' - - if group: - rbtns[act] = Gtk.RadioButton() - rbtns[act].join_group(group) - else: - rbtns[act] = group = Gtk.RadioButton() - - icon = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU) - hbox = Gtk.HBox(homogeneous=False, spacing=5) - hbox.pack_start(icon, False, False, 0) - lbl = Gtk.Label( - label='<b>%s</b>' % ACTIVITIES[category]['category']) - lbl.set_use_markup(True) - hbox.pack_start(lbl, False, False, 0) - rbtns[act].add(hbox) - rbtns[act].connect( - 'toggled', self.on_rbtn_toggled, [category, 'other']) - vbox.pack_start(rbtns[act], False, False, 0) - - activities = list(ACTIVITIES[category].keys()) - activities.sort() - for activity in activities: - if activity == 'category': - continue - - act = category + '_' + activity - - if group: - rbtns[act] = Gtk.RadioButton() - rbtns[act].join_group(group) - else: - rbtns[act] = group = Gtk.RadioButton() - - icon_name = get_activity_icon_name(category, activity) - icon = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU) - label = Gtk.Label(label=ACTIVITIES[category][activity]) - hbox = Gtk.HBox(homogeneous=False, spacing=5) - hbox.pack_start(icon, False, False, 0) - hbox.pack_start(label, False, False, 0) - rbtns[act].connect( - 'toggled', self.on_rbtn_toggled, [category, activity]) - rbtns[act].add(hbox) - vbox.pack_start(rbtns[act], False, False, 0) - - - self.default_radio = rbtns['doing_chores_other'] - - if self.activity in ACTIVITIES: - if not self.subactivity in ACTIVITIES[self.activity]: - self.subactivity = 'other' - - rbtns[self.activity + '_' + self.subactivity].set_active(True) - - self.checkbutton.set_active(True) - self.notebook.set_sensitive(True) - self.entry.set_sensitive(True) - - self.notebook.set_current_page( - self.PAGELIST.index(self.activity)) - self.entry.set_text(text) - - else: - self.checkbutton.set_active(False) - - self.xml.connect_signals(self) - self.window.set_position(Gtk.WindowPosition.CENTER_ON_PARENT) - self.window.show_all() - - def on_enable_checkbutton_toggled(self, widget): - self.notebook.set_sensitive(widget.get_active()) - self.entry.set_sensitive(widget.get_active()) - if not self.activity: - self.default_radio.set_active(True) - - def on_rbtn_toggled(self, widget, data): - if widget.get_active(): - self.activity = data[0] - self.subactivity = data[1] - - def on_ok_button_clicked(self, widget): - """ - Return activity and message (None if no activity selected) - """ - if self.checkbutton.get_active(): - self.on_response( - self.activity, self.subactivity, self.entry.get_text()) - else: - self.on_response(None, None, '') - self.window.destroy() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - -class ChangeMoodDialog: - COLS = 11 - - def __init__(self, on_response, mood_=None, text=''): - self.on_response = on_response - self.mood = mood_ - self.text = text - self.xml = get_builder('change_mood_dialog.ui') - - self.window = self.xml.get_object('change_mood_dialog') - self.window.set_transient_for(app.interface.roster.window) - self.window.set_title(_('Set Mood')) - - table = self.xml.get_object('mood_icons_table') - self.label = self.xml.get_object('mood_label') - self.entry = self.xml.get_object('description_entry') - - no_mood_button = self.xml.get_object('no_mood_button') - no_mood_button.set_mode(False) - no_mood_button.connect('clicked', - self.on_mood_button_clicked, None) - - x = 1 - y = 0 - self.mood_buttons = {} - - # Order them first - self.MOODS = [] - for mood in MOODS: - self.MOODS.append(mood) - self.MOODS.sort() - - for mood in self.MOODS: - image = Gtk.Image.new_from_icon_name( - 'mood-%s' % mood, Gtk.IconSize.MENU) - self.mood_buttons[mood] = Gtk.RadioButton() - self.mood_buttons[mood].join_group(no_mood_button) - self.mood_buttons[mood].set_mode(False) - self.mood_buttons[mood].add(image) - self.mood_buttons[mood].set_relief(Gtk.ReliefStyle.NONE) - self.mood_buttons[mood].set_tooltip_text(MOODS[mood]) - self.mood_buttons[mood].connect('clicked', - self.on_mood_button_clicked, mood) - table.attach(self.mood_buttons[mood], x, y, 1, 1) - - # Calculate the next position - x += 1 - if x >= self.COLS: - x = 0 - y += 1 - - if self.mood in MOODS: - self.mood_buttons[self.mood].set_active(True) - self.label.set_text(MOODS[self.mood]) - self.entry.set_sensitive(True) - if self.text: - self.entry.set_text(self.text) - else: - self.label.set_text(_('None')) - self.entry.set_text('') - self.entry.set_sensitive(False) - - self.xml.connect_signals(self) - self.window.set_position(Gtk.WindowPosition.CENTER_ON_PARENT) - self.window.show_all() - - def on_mood_button_clicked(self, widget, data): - if data: - self.label.set_text(MOODS[data]) - self.entry.set_sensitive(True) - else: - self.label.set_text(_('None')) - self.entry.set_text('') - self.entry.set_sensitive(False) - self.mood = data - - def on_ok_button_clicked(self, widget): - '''Return mood and message (None if no mood selected)''' - message = self.entry.get_text() - self.on_response(self.mood, message) - self.window.destroy() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - -class TimeoutDialog: - """ - Class designed to be derivated to create timeout'd dialogs (dialogs that - closes automatically after a timeout) - """ - def __init__(self, timeout): - self.countdown_left = timeout - self.countdown_enabled = True - self.title_text = '' - - def run_timeout(self): - if self.countdown_left > 0: - self.countdown() - GLib.timeout_add_seconds(1, self.countdown) - - def on_timeout(self): - """ - To be implemented in derivated classes - """ - - def countdown(self): - if self.countdown_enabled: - if self.countdown_left <= 0: - self.on_timeout() - return False - self.dialog.set_title('%s [%s]' % ( - self.title_text, str(self.countdown_left))) - self.countdown_left -= 1 - return True - - self.dialog.set_title(self.title_text) - return False - -class ChangeStatusMessageDialog(TimeoutDialog): - def __init__(self, on_response, show=None, show_pep=True): - countdown_time = app.config.get('change_status_window_timeout') - TimeoutDialog.__init__(self, countdown_time) - self.show = show - self.pep_dict = {} - self.show_pep = show_pep - self.on_response = on_response - self.xml = get_builder('change_status_message_dialog.ui') - self.dialog = self.xml.get_object('change_status_message_dialog') - self.dialog.set_transient_for(app.interface.roster.window) - msg = None - if show: - uf_show = helpers.get_uf_show(show) - self.title_text = _('%s Status Message') % uf_show - msg = app.config.get_per('statusmsg', '_last_' + self.show, - 'message') - self.pep_dict['activity'] = app.config.get_per('statusmsg', - '_last_' + self.show, 'activity') - self.pep_dict['subactivity'] = app.config.get_per('statusmsg', - '_last_' + self.show, 'subactivity') - self.pep_dict['activity_text'] = app.config.get_per('statusmsg', - '_last_' + self.show, 'activity_text') - self.pep_dict['mood'] = app.config.get_per('statusmsg', - '_last_' + self.show, 'mood') - self.pep_dict['mood_text'] = app.config.get_per('statusmsg', - '_last_' + self.show, 'mood_text') - else: - self.title_text = _('Status Message') - self.dialog.set_title(self.title_text) - - message_textview = self.xml.get_object('message_textview') - self.message_buffer = message_textview.get_buffer() - - if app.config.get('use_speller') and app.is_installed('GSPELL'): - lang = app.config.get('speller_language') - gspell_lang = Gspell.language_lookup(lang) - if gspell_lang is None: - gspell_lang = Gspell.language_get_default() - spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( - self.message_buffer) - spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) - spell_view = Gspell.TextView.get_from_gtk_text_view( - message_textview) - spell_view.set_inline_spell_checking(True) - spell_view.set_enable_language_menu(True) - - self.message_buffer.connect('changed', self.on_message_buffer_changed) - if not msg: - msg = '' - msg = helpers.from_one_line(msg) - self.message_buffer.set_text(msg) - - # have an empty string selectable, so user can clear msg - self.preset_messages_dict = {'': ['', '', '', '', '', '']} - for msg_name in app.config.get_per('statusmsg'): - if msg_name.startswith('_last_'): - continue - opts = [] - for opt in ['message', 'activity', 'subactivity', 'activity_text', - 'mood', 'mood_text']: - opts.append(app.config.get_per('statusmsg', msg_name, opt)) - opts[0] = helpers.from_one_line(opts[0]) - self.preset_messages_dict[msg_name] = opts - sorted_keys_list = helpers.get_sorted_keys(self.preset_messages_dict) - - self.message_liststore = Gtk.ListStore(str) # msg_name - self.message_combobox = self.xml.get_object('message_combobox') - self.message_combobox.set_model(self.message_liststore) - cellrenderertext = Gtk.CellRendererText() - self.message_combobox.pack_start(cellrenderertext, True) - self.message_combobox.add_attribute(cellrenderertext, 'text', 0) - for msg_name in sorted_keys_list: - self.message_liststore.append((msg_name,)) - - if show_pep: - self.draw_activity() - self.draw_mood() - else: - # remove acvtivity / mood lines - self.xml.get_object('activity_label').set_no_show_all(True) - self.xml.get_object('activity_button').set_no_show_all(True) - self.xml.get_object('mood_label').set_no_show_all(True) - self.xml.get_object('mood_button').set_no_show_all(True) - self.xml.get_object('activity_label').hide() - self.xml.get_object('activity_button').hide() - self.xml.get_object('mood_label').hide() - self.xml.get_object('mood_button').hide() - - self.xml.connect_signals(self) - self.run_timeout() - self.dialog.connect('response', self.on_dialog_response) - self.dialog.set_position(Gtk.WindowPosition.CENTER_ON_PARENT) - self.dialog.show_all() - - def draw_activity(self): - """ - Set activity button - """ - img = self.xml.get_object('activity_image') - label = self.xml.get_object('activity_button_label') - if 'activity' in self.pep_dict and self.pep_dict['activity'] in \ - ACTIVITIES: - if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] \ - in ACTIVITIES[self.pep_dict['activity']]: - icon_name = get_activity_icon_name(self.pep_dict['activity'], - self.pep_dict['subactivity']) - img.set_from_icon_name(icon_name, Gtk.IconSize.MENU) - else: - icon_name = get_activity_icon_name(self.pep_dict['activity']) - img.set_from_icon_name(icon_name, Gtk.IconSize.MENU) - if self.pep_dict['activity_text']: - label.set_text(self.pep_dict['activity_text']) - else: - label.set_text('') - else: - img.set_from_pixbuf(None) - label.set_text('') - - def draw_mood(self): - """ - Set mood button - """ - img = self.xml.get_object('mood_image') - label = self.xml.get_object('mood_button_label') - if 'mood' in self.pep_dict and self.pep_dict['mood'] in MOODS: - img.set_from_icon_name('mood-%s' % self.pep_dict['mood'], - Gtk.IconSize.MENU) - if self.pep_dict['mood_text']: - label.set_text(self.pep_dict['mood_text']) - else: - label.set_text('') - else: - img.set_from_pixbuf(None) - label.set_text('') - - def on_timeout(self): - # Prevent GUI freeze when the combobox menu is opened on close - self.message_combobox.popdown() - self.dialog.response(Gtk.ResponseType.OK) - - def on_dialog_response(self, dialog, response): - if response == Gtk.ResponseType.OK: - beg, end = self.message_buffer.get_bounds() - message = self.message_buffer.get_text(beg, end, True).strip() - message = helpers.remove_invalid_xml_chars(message) - msg = helpers.to_one_line(message) - if self.show: - app.config.set_per('statusmsg', '_last_' + self.show, - 'message', msg) - if self.show_pep: - app.config.set_per('statusmsg', '_last_' + self.show, - 'activity', self.pep_dict['activity']) - app.config.set_per('statusmsg', '_last_' + self.show, - 'subactivity', self.pep_dict['subactivity']) - app.config.set_per('statusmsg', '_last_' + self.show, - 'activity_text', self.pep_dict['activity_text']) - app.config.set_per('statusmsg', '_last_' + self.show, - 'mood', self.pep_dict['mood']) - app.config.set_per('statusmsg', '_last_' + self.show, - 'mood_text', self.pep_dict['mood_text']) - else: - message = None # user pressed Cancel button or X wm button - self.dialog.destroy() - self.on_response(message, self.pep_dict) - - def on_message_combobox_changed(self, widget): - self.countdown_enabled = False - model = widget.get_model() - active = widget.get_active() - if active < 0: - return None - name = model[active][0] - self.message_buffer.set_text(self.preset_messages_dict[name][0]) - self.pep_dict['activity'] = self.preset_messages_dict[name][1] - self.pep_dict['subactivity'] = self.preset_messages_dict[name][2] - self.pep_dict['activity_text'] = self.preset_messages_dict[name][3] - self.pep_dict['mood'] = self.preset_messages_dict[name][4] - self.pep_dict['mood_text'] = self.preset_messages_dict[name][5] - self.draw_activity() - self.draw_mood() - - def on_change_status_message_dialog_key_press_event(self, widget, event): - self.countdown_enabled = False - if event.keyval == Gdk.KEY_Return or \ - event.keyval == Gdk.KEY_KP_Enter: # catch CTRL+ENTER - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: - self.dialog.response(Gtk.ResponseType.OK) - # Stop the event - return True - - def on_message_buffer_changed(self, widget): - self.countdown_enabled = False - self.toggle_sensitiviy_of_save_as_preset() - - def toggle_sensitiviy_of_save_as_preset(self): - btn = self.xml.get_object('save_as_preset_button') - if self.message_buffer.get_char_count() == 0: - btn.set_sensitive(False) - else: - btn.set_sensitive(True) - - def on_save_as_preset_button_clicked(self, widget): - self.countdown_enabled = False - start_iter, finish_iter = self.message_buffer.get_bounds() - status_message_to_save_as_preset = self.message_buffer.get_text( - start_iter, finish_iter, True) - - def _on_save_preset(msg_name): - msg_text = status_message_to_save_as_preset - msg_text_1l = helpers.to_one_line(msg_text) - if not msg_name: # msg_name was '' - msg_name = msg_text_1l - - def _on_overwrite_preset(): - self.preset_messages_dict[msg_name] = [ - msg_text, self.pep_dict.get('activity'), - self.pep_dict.get('subactivity'), - self.pep_dict.get('activity_text'), - self.pep_dict.get('mood'), self.pep_dict.get('mood_text')] - app.config.set_per('statusmsg', msg_name, 'message', - msg_text_1l) - app.config.set_per('statusmsg', msg_name, 'activity', - self.pep_dict.get('activity')) - app.config.set_per('statusmsg', msg_name, 'subactivity', - self.pep_dict.get('subactivity')) - app.config.set_per('statusmsg', msg_name, 'activity_text', - self.pep_dict.get('activity_text')) - app.config.set_per('statusmsg', msg_name, 'mood', - self.pep_dict.get('mood')) - app.config.set_per('statusmsg', msg_name, 'mood_text', - self.pep_dict.get('mood_text')) - - if msg_name in self.preset_messages_dict: - NewConfirmationDialog( - _('Overwrite'), - _('Overwrite Status Message?'), - _('This name is already in use. Do you want to ' - 'overwrite this preset?'), - [DialogButton.make('Cancel'), - DialogButton.make('Remove', - text=_('_Overwrite'), - callback=_on_overwrite_preset)], - transient_for=self.dialog).show() - return - - app.config.add_per('statusmsg', msg_name) - _on_overwrite_preset() - iter_ = self.message_liststore.append((msg_name,)) - # Select the one we just saved in combobox - self.message_combobox.set_active_iter(iter_) - - InputDialog( - _('Status Preset'), - _('Save status as preset'), - _('Please assign a name to this status message preset'), - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Save'), - callback=_on_save_preset)], - input_str=_('New Status'), - transient_for=self.dialog).show() - - def on_activity_button_clicked(self, widget): - self.countdown_enabled = False - def on_response(activity, subactivity, text): - self.pep_dict['activity'] = activity or '' - self.pep_dict['subactivity'] = subactivity or '' - self.pep_dict['activity_text'] = text - self.draw_activity() - ChangeActivityDialog(on_response, self.pep_dict['activity'], - self.pep_dict['subactivity'], self.pep_dict['activity_text']) - - def on_mood_button_clicked(self, widget): - self.countdown_enabled = False - def on_response(mood, text): - self.pep_dict['mood'] = mood or '' - self.pep_dict['mood_text'] = text - self.draw_mood() - ChangeMoodDialog(on_response, self.pep_dict['mood'], - self.pep_dict['mood_text']) - - class SynchroniseSelectAccountDialog: def __init__(self, account): # 'account' can be None if we are about to create our first one ===================================== gajim/gtk/const.py ===================================== @@ -121,4 +121,5 @@ WINDOW_MODULES = { 'ChangePassword': 'gajim.gtk.change_password', 'PluginsWindow': 'gajim.plugins.gui', 'Features': 'gajim.gtk.features', + 'StatusChange': 'gajim.gtk.status_change', } ===================================== gajim/gtk/dialogs.py ===================================== @@ -518,6 +518,40 @@ class InputDialog(NewConfirmationDialog): super()._on_response(_dialog, response) +class TimeoutWindow: + """ + Class designed to be derivated by other windows + Derived windows close automatically after reaching the timeout + """ + def __init__(self, timeout): + self.countdown_left = timeout + self.countdown_enabled = True + self.title_text = '' + + def run_timeout(self): + if self.countdown_left > 0: + self.countdown() + GLib.timeout_add_seconds(1, self.countdown) + + def on_timeout(self): + """ + To be implemented by derivated classes + """ + + def countdown(self): + if self.countdown_enabled: + if self.countdown_left <= 0: + self.on_timeout() + return False + self.set_title('%s [%s]' % ( + self.title_text, str(self.countdown_left))) + self.countdown_left -= 1 + return True + + self.set_title(self.title_text) + return False + + class ShortcutsWindow: def __init__(self): transient = app.app.get_active_window() ===================================== gajim/gtk/status_change.py ===================================== @@ -0,0 +1,515 @@ +# 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 Gdk +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.const import ACTIVITIES +from gajim.common.const import MOODS +from gajim.common.const import PEPEventType +from gajim.common.helpers import from_one_line +from gajim.common.helpers import to_one_line +from gajim.common.helpers import remove_invalid_xml_chars +from gajim.common.i18n import _ + +from gajim.gtk.dialogs import TimeoutWindow +from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import NewConfirmationDialog +from gajim.gtk.dialogs import InputDialog +from gajim.gtk.util import get_builder +from gajim.gtk.util import get_activity_icon_name + +if app.is_installed('GSPELL'): + from gi.repository import Gspell # pylint: disable=ungrouped-imports + +ACTIVITY_PAGELIST = [ + 'doing_chores', + 'drinking', + 'eating', + 'exercising', + 'grooming', + 'having_appointment', + 'inactive', + 'relaxing', + 'talking', + 'traveling', + 'working', +] + + +class StatusChange(Gtk.ApplicationWindow, TimeoutWindow): + def __init__(self, callback, account=None, show=None, show_pep=True): + Gtk.ApplicationWindow.__init__(self) + countdown_time = app.config.get('change_status_window_timeout') + TimeoutWindow.__init__(self, countdown_time) + self.set_name('StatusChange') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_transient_for(app.interface.roster.window) + self.title_text = _('Status Message') # TimeoutWindow + + self.account = account + self._callback = callback + self._show = show + self._show_pep = show_pep + + self._ui = get_builder('status_change_window.ui') + self.add(self._ui.status_stack) + + self._status_message = '' + self._pep_dict = { + 'activity': '', + 'subactivity': '', + 'mood': '', + } + self._get_current_status_data() + self._preset_messages_dict = {} + self._get_presets() + + if self._show: + self._ui.activity_switch.set_active(self._pep_dict['activity']) + self._ui.activity_page_button.set_sensitive( + self._pep_dict['activity']) + self._ui.mood_switch.set_active(self._pep_dict['mood']) + self._ui.mood_page_button.set_sensitive(self._pep_dict['mood']) + + self._message_buffer = self._ui.message_textview.get_buffer() + self._apply_speller() + self._message_buffer.set_text(from_one_line(self._status_message)) + + if show_pep: + self._draw_activity() + self._init_activities() + self._draw_mood() + self._init_moods() + else: + self._ui.activity_label.set_no_show_all(True) + self._ui.activity_button.set_no_show_all(True) + self._ui.mood_label.set_no_show_all(True) + self._ui.mood_button.set_no_show_all(True) + self._ui.activity_label.hide() + self._ui.activity_button.hide() + self._ui.mood_label.hide() + self._ui.mood_button.hide() + + self._message_buffer.connect('changed', self._stop_timeout) + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) + + self.show_all() + self.run_timeout() + + def on_timeout(self): + self._change_status() + + def _stop_timeout(self, *args): + self.countdown_enabled = False + + def _on_key_press(self, _widget, event): + self.countdown_enabled = False + if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter): + if event.get_state() & Gdk.ModifierType.CONTROL_MASK: + self._change_status() + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _apply_speller(self): + if app.config.get('use_speller') and app.is_installed('GSPELL'): + lang = app.config.get('speller_language') + gspell_lang = Gspell.language_lookup(lang) + if gspell_lang is None: + gspell_lang = Gspell.language_get_default() + spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( + self._message_buffer) + spell_buffer.set_spell_checker(Gspell.Checker.new(gspell_lang)) + spell_view = Gspell.TextView.get_from_gtk_text_view( + self._ui.message_textview) + spell_view.set_inline_spell_checking(True) + spell_view.set_enable_language_menu(True) + + def _get_current_status_data(self): + ''' + Gathers status/pep data for a given account or checks if all accounts + are synchronized. If not, no status message/pep data will be displayed. + ''' + if self.account: + self._status_message = app.connections[self.account].status_message + activity_data = app.connections[self.account].pep.get( + PEPEventType.ACTIVITY) + mood_data = app.connections[self.account].pep.get( + PEPEventType.MOOD) + if activity_data: + self._pep_dict['activity'] = activity_data.activity + self._pep_dict['subactivity'] = activity_data.subactivity + if mood_data: + self._pep_dict['mood'] = mood_data.mood + else: + status_messages = [] + activities = [] + subactivities = [] + moods = [] + for account in app.get_connected_accounts(): + status_messages.append(app.connections[account].status_message) + activity_data = app.connections[account].pep.get( + PEPEventType.ACTIVITY) + mood_data = app.connections[account].pep.get(PEPEventType.MOOD) + if activity_data: + activities.append(activity_data.activity) + subactivities.append(activity_data.subactivity) + if mood_data: + moods.append(mood_data.mood) + equal_messages = all(x == status_messages[0] for x in + status_messages) + equal_activities = all(x == activities[0] for x in activities) + equal_subactivities = all(x == subactivities[0] for x in + subactivities) + equal_moods = all(x == moods[0] for x in moods) + if equal_messages: + self._status_message = status_messages[0] + if activities and equal_activities: + self._pep_dict['activity'] = activities[0] + if subactivities and equal_subactivities: + self._pep_dict['subactivity'] = subactivities[0] + if moods and equal_moods: + self._pep_dict['mood'] = moods[0] + + def _get_presets(self): + self._preset_messages_dict = {} + for msg_name in app.config.get_per('statusmsg'): + if msg_name.startswith('_last_'): + continue + opts = [] + for opt in ['message', 'activity', 'subactivity', 'mood']: + opts.append(app.config.get_per('statusmsg', msg_name, opt)) + opts[0] = from_one_line(opts[0]) + self._preset_messages_dict[msg_name] = opts + self._build_preset_popover() + + def _build_preset_popover(self): + child = self._ui.preset_popover.get_children() + if child: + self._ui.preset_popover.remove(child[0]) + + preset_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + preset_box.get_style_context().add_class('margin-3') + self._ui.preset_popover.add(preset_box) + + for preset in self._preset_messages_dict: + button_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) + + preset_button = Gtk.Button() + preset_button.set_name(preset) + preset_button.set_relief(Gtk.ReliefStyle.NONE) + preset_button.set_hexpand(True) + preset_button.add(Gtk.Label(label=preset, halign=Gtk.Align.START)) + preset_button.connect('clicked', self._on_preset_select) + button_box.add(preset_button) + + remove_button = Gtk.Button() + remove_button.set_name(preset) + remove_button.set_relief(Gtk.ReliefStyle.NONE) + remove_button.set_halign(Gtk.Align.END) + remove_button.add(Gtk.Image.new_from_icon_name( + 'edit-delete-symbolic', Gtk.IconSize.MENU)) + remove_button.connect('clicked', self._on_preset_remove) + button_box.add(remove_button) + preset_box.add(button_box) + preset_box.show_all() + + def _init_activities(self): + radio_btns = {} + group = None + + for category in ACTIVITIES: + icon_name = get_activity_icon_name(category) + item = self._ui.get_object(category + '_image') + item.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + item.set_tooltip_text(ACTIVITIES[category]['category']) + + category_box = self._ui.get_object(category + '_box') + + # Other + act = category + '_other' + if group: + radio_btns[act] = Gtk.RadioButton() + radio_btns[act].join_group(group) + else: + radio_btns[act] = group = Gtk.RadioButton() + + icon = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU) + icon_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, + spacing=6) + icon_box.pack_start(icon, False, False, 0) + label = Gtk.Label( + label='<b>%s</b>' % ACTIVITIES[category]['category']) + label.set_use_markup(True) + icon_box.pack_start(label, False, False, 0) + radio_btns[act].add(icon_box) + radio_btns[act].join_group(self._ui.no_activity_button) + radio_btns[act].connect( + 'toggled', self._on_activity_toggled, [category, 'other']) + category_box.pack_start(radio_btns[act], False, False, 0) + + activities = list(ACTIVITIES[category].keys()) + activities.sort() + for activity in activities: + if activity == 'category': + continue + + act = category + '_' + activity + + if group: + radio_btns[act] = Gtk.RadioButton() + radio_btns[act].join_group(group) + else: + radio_btns[act] = group = Gtk.RadioButton() + + icon_name = get_activity_icon_name(category, activity) + icon = Gtk.Image.new_from_icon_name( + icon_name, Gtk.IconSize.MENU) + label = Gtk.Label(label=ACTIVITIES[category][activity]) + icon_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, + spacing=6) + icon_box.pack_start(icon, False, False, 0) + icon_box.pack_start(label, False, False, 0) + radio_btns[act].join_group(self._ui.no_activity_button) + radio_btns[act].connect('toggled', self._on_activity_toggled, + [category, activity]) + radio_btns[act].add(icon_box) + category_box.pack_start(radio_btns[act], False, False, 0) + + if not self._pep_dict['activity']: + self._ui.no_activity_button.set_active(True) + + if self._pep_dict['activity'] in ACTIVITIES: + if self._pep_dict['subactivity'] not in ACTIVITIES[ + self._pep_dict['activity']]: + self._pep_dict['subactivity'] = 'other' + + radio_btns[self._pep_dict['activity'] + '_' + self._pep_dict[ + 'subactivity']].set_active(True) + + self._ui.activity_notebook.set_current_page( + ACTIVITY_PAGELIST.index(self._pep_dict['activity'])) + + def _draw_activity(self): + if self._pep_dict['activity'] in ACTIVITIES: + if (self._pep_dict['subactivity'] in + ACTIVITIES[self._pep_dict['activity']]): + icon_name = get_activity_icon_name( + self._pep_dict['activity'], + self._pep_dict['subactivity']) + self._ui.activity_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) + self._ui.activity_button_label.set_text( + ACTIVITIES[self._pep_dict['activity']][ + self._pep_dict['subactivity']]) + else: + icon_name = get_activity_icon_name(self._pep_dict['activity']) + self._ui.activity_image.set_from_icon_name( + icon_name, Gtk.IconSize.MENU) + self._ui.activity_button_label.set_text( + ACTIVITIES[self._pep_dict['activity']]['category']) + else: + self._ui.activity_image.set_from_pixbuf(None) + self._ui.activity_button_label.set_text(_('No activity')) + + def _init_moods(self): + self._ui.no_mood_button.set_mode(False) + self._ui.no_mood_button.connect( + 'clicked', self._on_mood_button_clicked, None) + + x_position = 1 + y_position = 0 + mood_buttons = {} + + # Order them first + moods = [] + for mood in MOODS: + moods.append(mood) + moods.sort() + + for mood in moods: + image = Gtk.Image.new_from_icon_name( + 'mood-%s' % mood, Gtk.IconSize.MENU) + mood_buttons[mood] = Gtk.RadioButton() + mood_buttons[mood].join_group(self._ui.no_mood_button) + mood_buttons[mood].set_mode(False) + mood_buttons[mood].add(image) + mood_buttons[mood].set_relief(Gtk.ReliefStyle.NONE) + mood_buttons[mood].set_tooltip_text(MOODS[mood]) + mood_buttons[mood].connect( + 'clicked', self._on_mood_button_clicked, mood) + self._ui.moods_grid.attach( + mood_buttons[mood], x_position, y_position, 1, 1) + + # Calculate the next position + x_position += 1 + if x_position >= 11: + x_position = 0 + y_position += 1 + + if self._pep_dict['mood'] in MOODS: + mood_buttons[self._pep_dict['mood']].set_active(True) + self._ui.mood_label.set_text(MOODS[self._pep_dict['mood']]) + else: + self._ui.mood_label.set_text(_('No mood selected')) + + def _draw_mood(self): + if self._pep_dict['mood'] in MOODS: + self._ui.mood_image.set_from_icon_name( + 'mood-%s' % self._pep_dict['mood'], Gtk.IconSize.MENU) + self._ui.mood_button_label.set_text( + MOODS[self._pep_dict['mood']]) + else: + self._ui.mood_image.set_from_pixbuf(None) + self._ui.mood_button_label.set_text(_('No mood')) + + def _on_preset_select(self, widget): + self.countdown_enabled = False + self._ui.preset_popover.popdown() + name = widget.get_name() + self._message_buffer.set_text(self._preset_messages_dict[name][0]) + self._pep_dict['activity'] = self._preset_messages_dict[name][1] + self._pep_dict['subactivity'] = self._preset_messages_dict[name][2] + self._pep_dict['mood'] = self._preset_messages_dict[name][3] + self._draw_activity() + self._draw_mood() + + self._ui.activity_switch.set_active(self._pep_dict['activity']) + self._ui.activity_page_button.set_sensitive(self._pep_dict['activity']) + self._ui.mood_switch.set_active(self._pep_dict['mood']) + self._ui.mood_page_button.set_sensitive(self._pep_dict['mood']) + + def _on_preset_remove(self, widget): + self.countdown_enabled = False + name = widget.get_name() + app.config.del_per('statusmsg', name) + self._get_presets() + + def _on_save_as_preset_clicked(self, _widget): + self.countdown_enabled = False + start_iter, finish_iter = self._message_buffer.get_bounds() + message_text = self._message_buffer.get_text( + start_iter, finish_iter, True) + + def _on_save_preset(preset_name): + msg_text_one_line = to_one_line(message_text) + if not preset_name: + preset_name = msg_text_one_line + + def _on_set_config(): + activity = '' + subactivity = '' + mood = '' + if self._ui.activity_switch.get_active(): + activity = self._pep_dict['activity'] + subactivity = self._pep_dict['subactivity'] + if self._ui.mood_switch.get_active(): + mood = self._pep_dict['mood'] + app.config.set_per('statusmsg', preset_name, 'message', + msg_text_one_line) + app.config.set_per('statusmsg', preset_name, 'activity', + activity) + app.config.set_per('statusmsg', preset_name, 'subactivity', + subactivity) + app.config.set_per('statusmsg', preset_name, 'mood', mood) + self._get_presets() + + if preset_name in self._preset_messages_dict: + NewConfirmationDialog( + _('Overwrite'), + _('Overwrite Status Message?'), + _('This name is already in use. Do you want to ' + 'overwrite this preset?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Overwrite'), + callback=_on_set_config)], + transient_for=self).show() + return + + app.config.add_per('statusmsg', preset_name) + _on_set_config() + + InputDialog( + _('Status Preset'), + _('Save status as preset'), + _('Please assign a name to this status message preset'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Save'), + callback=_on_save_preset)], + input_str=_('New Status'), + transient_for=self).show() + + def _on_activity_page_clicked(self, _widget): + self.countdown_enabled = False + self._ui.status_stack.set_visible_child_full( + 'activity-page', + Gtk.StackTransitionType.SLIDE_LEFT) + + def _on_activity_toggled(self, widget, data): + if widget.get_active(): + self._pep_dict['activity'] = data[0] + self._pep_dict['subactivity'] = data[1] + + def _on_no_activity_toggled(self, _widget): + self._pep_dict['activity'] = '' + self._pep_dict['subactivity'] = '' + + def _on_mood_page_clicked(self, _widget): + self.countdown_enabled = False + self._ui.status_stack.set_visible_child_full( + 'mood-page', + Gtk.StackTransitionType.SLIDE_LEFT) + + def _on_mood_button_clicked(self, _widget, data): + if data: + self._ui.mood_label.set_text(MOODS[data]) + else: + self._ui.mood_label.set_text(_('No mood selected')) + self._pep_dict['mood'] = data + + def _on_back_clicked(self, _widget): + self._ui.status_stack.set_visible_child_full( + 'status-page', + Gtk.StackTransitionType.SLIDE_RIGHT) + self._draw_activity() + self._draw_mood() + + def _on_activity_switch(self, switch, *args): + self.countdown_enabled = False + self._ui.activity_page_button.set_sensitive(switch.get_active()) + + def _on_mood_switch(self, switch, *args): + self.countdown_enabled = False + self._ui.mood_page_button.set_sensitive(switch.get_active()) + + def _change_status(self, *args): + beg, end = self._message_buffer.get_bounds() + message = self._message_buffer.get_text(beg, end, True).strip() + message = remove_invalid_xml_chars(message) + + if not self._ui.activity_switch.get_active(): + self._pep_dict['activity'] = '' + self._pep_dict['subactivity'] = '' + + if not self._ui.mood_switch.get_active(): + self._pep_dict['mood'] = '' + + self._callback(message, self._pep_dict) + self.destroy() ===================================== gajim/gtk/status_selector.py ===================================== @@ -20,9 +20,9 @@ from gajim.common.helpers import get_uf_show from gajim.common.helpers import get_global_show from gajim.common.helpers import statuses_unified from gajim.common.i18n import _ -from gajim.dialogs import ChangeStatusMessageDialog from gajim.gtk.util import get_icon_name +from gajim.gtk.util import open_window class StatusSelector(Gtk.MenuButton): @@ -101,7 +101,7 @@ class StatusSelector(Gtk.MenuButton): def _on_change_status(self, button): def _on_response(message, pep_dict): - if message is None: # None if user pressed Cancel + if message is None: # None if user canceled return for account in app.contacts.get_accounts(): sync_account = app.config.get_per( @@ -115,7 +115,7 @@ class StatusSelector(Gtk.MenuButton): new_show = button.get_name() if new_show == 'change_status_message': new_show = get_global_show() - ChangeStatusMessageDialog(_on_response, new_show) + open_window('StatusChange', callback=_on_response, show=new_show) return app.interface.roster.get_status_message(new_show, _on_response) ===================================== gajim/roster_window.py ===================================== @@ -2159,7 +2159,7 @@ class RosterWindow: app.interface.systray.change_status(show) self._status_selector.update() - def get_status_message(self, show, on_response, show_pep=True, + def get_status_message(self, show, callback, show_pep=True, always_ask=False): """ Get the status message by: @@ -2174,22 +2174,21 @@ class RosterWindow: 'mood': '', 'mood_text': ''} if not always_ask and ((show == 'online' and not app.config.get( - 'ask_online_status')) or (show == 'offline' and not \ - app.config.get('ask_offline_status'))): - on_response('', empty_pep) + 'ask_online_status')) or (show == 'offline' and not + app.config.get('ask_offline_status'))): + callback('', empty_pep) return - dlg = dialogs.ChangeStatusMessageDialog(on_response, show, show_pep) - dlg.dialog.present() # show it on current workspace + open_window('StatusChange', callback=callback, show=show, + show_pep=show_pep) def change_status(self, widget, account, status): - def on_response(message, pep_dict): - if message is None: - # user pressed Cancel to change status message dialog + def _on_response(message, pep_dict): + if message is None: # None if user canceled return self.send_status(account, status, message) self.send_pep(account, pep_dict) - self.get_status_message(status, on_response) + self.get_status_message(status, _on_response) def get_show(self, lcontact): prio = lcontact[0].priority @@ -2928,12 +2927,13 @@ class RosterWindow: def on_change_status_message_activate(self, widget, account): show = app.connections[account].status - def on_response(message, pep_dict): - if message is None: # None is if user pressed Cancel + def _on_response(message, pep_dict): + if message is None: # None if user canceled return self.send_status(account, show, message) self.send_pep(account, pep_dict) - dialogs.ChangeStatusMessageDialog(on_response, show) + open_window('StatusChange', account=account, callback=_on_response, + show=show) def on_add_to_roster(self, widget, contact, account): AddNewContactWindow(account, contact.jid, contact.name) @@ -3031,7 +3031,7 @@ class RosterWindow: if keyval == Gdk.KEY_s: # CTRL + s show = helpers.get_global_show() def _on_response(message, pep_dict): - if message is not None: # None if user pressed Cancel + if message is not None: # None if user canceled for account in app.contacts.get_accounts(): sync_account = app.config.get_per( 'accounts', account, 'sync_with_global_status') @@ -3039,9 +3039,9 @@ class RosterWindow: continue self.send_status(account, show, message) self.send_pep(account, pep_dict) - dialogs.ChangeStatusMessageDialog(_on_response, show) + open_window('StatusChange', callback=_on_response, show=show) return True - if keyval == Gdk.KEY_k: # CTRL + k + if keyval == Gdk.KEY_k: # CTRL + k self.enable_rfilter('') def on_roster_treeview_button_press_event(self, widget, event): @@ -3084,17 +3084,17 @@ class RosterWindow: show = helpers.get_global_show() if show == 'offline': return True - def on_response(message, pep_dict): - if message is None: + def _on_response(message, pep_dict): + if message is None: # None if user canceled return True for acct in app.connections: if not app.config.get_per('accounts', acct, - 'sync_with_global_status'): + 'sync_with_global_status'): continue current_show = app.connections[acct].status self.send_status(acct, current_show, message) self.send_pep(acct, pep_dict) - dialogs.ChangeStatusMessageDialog(on_response, show) + open_window('StatusChange', callback=_on_response, show=show) return True if event.button == 1: # Left click View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3069253637125bcafa4fefc58390ec04… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3069253637125bcafa4fefc58390ec04… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Show more information about the connection
by Philipp Hörist 12 Aug '20

12 Aug '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0d5cca1e by lovetox at 2020-08-12T15:17:59+02:00 ServerInfo: Show more information about the connection - - - - - 2 changed files: - gajim/data/gui/server_info.ui - gajim/gtk/server_info.py Changes: ===================================== gajim/data/gui/server_info.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkNotebook" id="server_info_notebook"> @@ -166,7 +166,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -181,7 +181,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -194,18 +194,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="connection_protocol"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">5</property> </packing> </child> <child> @@ -221,7 +210,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">8</property> <property name="width">2</property> </packing> </child> @@ -237,7 +226,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="top_attach">6</property> </packing> </child> <child> @@ -250,7 +239,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="top_attach">6</property> </packing> </child> <child> @@ -265,15 +254,30 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="domain_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Protocol</property> + <property name="label">Domain</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="dns_label"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="label">DNS</property> <style> <class name="dim-label"/> </style> @@ -283,6 +287,90 @@ <property name="top_attach">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="ip_port_label"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="label">IP / Port</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="websocket_label"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">end</property> + <property name="label">WebSocket URL</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="domain"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="dns"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="ip_port"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="websocket"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> <class name="margin-18"/> </style> ===================================== gajim/gtk/server_info.py ===================================== @@ -91,25 +91,38 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): def _add_connection_info(self): # Connection type - client = app.connections[self.account].connection - con_type = client.current_connection_type - self._ui.connection_type.set_text(con_type.value) - if con_type.is_plain: - self._ui.conection_type.get_style_context().add_class( - 'error-color') + nbxmpp_client = app.connections[self.account].connection + address = nbxmpp_client.current_address - is_websocket = app.connections[self.account].connection.is_websocket - protocol = 'WebSocket' if is_websocket else 'TCP' - self._ui.connection_protocol.set_text(protocol) + self._ui.connection_type.set_text(address.type.value) + if address.type.is_plain: + self._ui.conection_type.get_style_context().add_class('error-color') # Connection proxy - proxy = client.proxy + proxy = address.proxy if proxy is not None: self._ui.proxy_type.set_text(proxy.type) self._ui.proxy_host.set_text(proxy.host) self._ui.cert_button.set_sensitive(self.cert) + self._ui.domain.set_text(address.domain) + + visible = address.service is not None + self._ui.dns_label.set_visible(visible) + self._ui.dns.set_visible(visible) + self._ui.dns.set_text(address.service or '') + + visible = nbxmpp_client.remote_address is not None + self._ui.ip_port_label.set_visible(visible) + self._ui.ip_port.set_visible(visible) + self._ui.ip_port.set_text(nbxmpp_client.remote_address or '') + + visible = address.uri is not None + self._ui.websocket_label.set_visible(visible) + self._ui.websocket.set_visible(visible) + self._ui.websocket.set_text(address.uri or '') + def _on_cert_button_clicked(self, _button): open_window('CertificateDialog', account=self.account, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d5cca1e93b8cefaf861b21458b99d72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d5cca1e93b8cefaf861b21458b99d72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Expose more information about the connection
by Philipp Hörist 12 Aug '20

12 Aug '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 387445a1 by lovetox at 2020-08-12T15:18:38+02:00 Client: Expose more information about the connection - - - - - 3 changed files: - nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/tcp.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -115,6 +115,7 @@ class Client(Observable): self._con = None self._local_address = None + self._remote_address = None self._mode = Mode.CLIENT self._ping_source_id = None @@ -208,6 +209,10 @@ class Client(Observable): def peer_certificate(self): return self._peer_certificate, self._peer_certificate_errors + @property + def current_address(self): + return self._current_address + @property def current_connection_type(self): return self._current_address.type @@ -246,6 +251,10 @@ class Client(Observable): def local_address(self): return self._local_address + @property + def remote_address(self): + return self._remote_address + @property def connection_types(self): if self._custom_host is not None: @@ -434,6 +443,7 @@ class Client(Observable): def _on_connected(self, connection, _signal_name): self.set_state(StreamState.CONNECTED) self._local_address = connection.local_address + self._remote_address = connection.remote_address def _on_disconnected(self, _connection, _signal_name): self.state = StreamState.DISCONNECTED ===================================== nbxmpp/connection.py ===================================== @@ -54,6 +54,7 @@ class Connection(Observable): self._client_cert = client_cert self._address = address self._local_address = None + self._remote_address = None self._state = None self._state = TCPState.DISCONNECTED @@ -68,6 +69,10 @@ class Connection(Observable): def local_address(self): return self._local_address + @property + def remote_address(self): + return self._remote_address + @property def peer_certificate(self): return (self._peer_certificate, self._peer_certificate_errors) ===================================== nbxmpp/tcp.py ===================================== @@ -83,12 +83,12 @@ class TCPConnection(Connection): def _on_event(self, _socket_client, event, _connectable, connection): if event == Gio.SocketClientEvent.CONNECTING: - remote_address = connection.get_remote_address() + self._remote_address = connection.get_remote_address().to_string() use_proxy = self._address.proxy is not None target = 'proxy' if use_proxy else self._address.domain self._log.info('Connecting to %s (%s)', target, - remote_address.to_string()) + self._remote_address) def _check_certificate(self, _connection, certificate, errors): self._peer_certificate = certificate View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/387445a1ae3c7827f178be59… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/387445a1ae3c7827f178be59… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits