Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Remove StatusChange window
by Daniel Brötzmann 24 May '21

24 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 02861286 by wurstsalat at 2021-05-24T18:11:22+02:00 Remove StatusChange window - - - - - 8 changed files: - gajim/common/setting_values.py - − gajim/data/gui/status_change_window.ui - gajim/gtk/const.py - gajim/gtk/main.py - − gajim/gtk/status_change.py - gajim/gtk/status_icon.py - gajim/gtk/status_selector.py - gajim/gui_interface.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -118,7 +118,6 @@ class _ACCOUNT_DEFAULT: 'confirm_block': '', 'enable_negative_priority': False, 'show_contacts_number': True, - 'change_status_window_timeout': 15, 'max_conversation_lines': 500, 'shell_like_completion': False, 'audio_input_device': 'autoaudiosrc ! volume name=gajim_vol', @@ -425,7 +424,6 @@ class _ACCOUNT_DEFAULT: 'confirm_block': _('Show a confirmation dialog to block a contact? Empty string means never show the dialog.'), 'enable_negative_priority': _('If enabled, you will be able to set a negative priority to your account in the Accounts window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.'), 'show_contacts_number': _('If enabled, Gajim will show both the number of online and total contacts in account rows as well as in group rows.'), - 'change_status_window_timeout': _('Time of inactivity needed before the change status window closes down.'), 'max_conversation_lines': _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.'), 'shell_like_completion': _('If enabled, completion in group chats will be like a shell auto-completion.'), 'use_stun_server': _('If enabled, Gajim will try to use a STUN server when using Jingle. The one in \'stun_server\' option, or the one given by the XMPP server.'), ===================================== gajim/data/gui/status_change_window.ui deleted ===================================== @@ -1,814 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkPopover" id="preset_popover"> - <property name="can_focus">False</property> - <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> - <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="halign">center</property> - <property name="spacing">12</property> - <child> - <object class="GtkMenuButton" id="preset_list_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="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">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <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="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">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" id="pep_grid"> - <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">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="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="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_no_activity_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkNotebook" id="activity_notebook"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="scrollable">True</property> - <child> - <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="icon_size">1</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="drinking_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="eating_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="exercising_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="grooming_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">4</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="having_appointment_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">5</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="inactive_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">6</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="relaxing_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">7</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="talking_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">8</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="traveling_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">9</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <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> - </packing> - </child> - <child type="tab"> - <object class="GtkImage" id="working_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_size">1</property> - </object> - <packing> - <property name="position">10</property> - <property name="tab_fill">False</property> - </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="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="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="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="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">True</property> - <property name="position">5</property> - </packing> - </child> - </object> - <packing> - <property name="name">mood-page</property> - <property name="position">2</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/gtk/const.py ===================================== @@ -131,7 +131,6 @@ def __str__(self): 'ChangePassword': 'gajim.gui.change_password', 'PluginsWindow': 'gajim.plugins.gui', 'Features': 'gajim.gui.features', - 'StatusChange': 'gajim.gui.status_change', 'GroupChatInvitation': 'gajim.gui.groupchat_invitation', 'ContactInfo': 'gajim.gui.contact_info', 'WorkspaceDialog': 'gajim.gui.workspace_dialog', ===================================== gajim/gtk/main.py ===================================== @@ -512,9 +512,7 @@ def on_continue(message): on_continue2(message) if get_msg and ask_for_status_message('offline'): - open_window('StatusChange', - status='offline', - callback=on_continue, - show_pep=False) + print('TODO: Let user choose status message') + on_continue('') # status message here else: on_continue('') ===================================== gajim/gtk/status_change.py deleted ===================================== @@ -1,568 +0,0 @@ -# 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.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 .dialogs import TimeoutWindow -from .dialogs import DialogButton -from .dialogs import ConfirmationDialog -from .dialogs import InputDialog -from .util import get_builder -from .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=None, account=None, status=None, show_pep=True): - Gtk.ApplicationWindow.__init__(self) - countdown_time = app.settings.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_default_size(400, 350) - self.set_show_menubar(False) - self.set_transient_for(app.window) - self.title_text = _('Status Message') # TimeoutWindow - - self.account = account - self._callback = callback - self._status = status - 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._presets = {} - self._get_presets() - - if self._status: - 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)) - - self._activity_btns = {} - self._mood_btns = {} - if show_pep: - self._init_activities() - self._draw_activity() - self._init_moods() - self._draw_mood() - else: - 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) - self.connect('destroy', self._on_destroy) - self._ui.connect_signals(self) - - self.show_all() - self.start_timeout() - - def _on_destroy(self, *args): - self.stop_timeout() - - def on_timeout(self): - self._change_status() - - def _on_key_press(self, _widget, event): - 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() - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - def _apply_speller(self): - if app.settings.get('use_speller') and app.is_installed('GSPELL'): - lang = app.settings.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: - client = app.get_client(self.account) - self._status_message = client.status_message - activity_data = client.get_module( - 'UserActivity').get_current_activity() - mood_data = client.get_module('UserMood').get_current_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.connections: - client = app.get_client(account) - if not app.settings.get_account_setting( - client.account, 'sync_with_global_status'): - continue - - status_messages.append(client.status_message) - activity_data = client.get_module( - 'UserActivity').get_current_activity() - mood_data = client.get_module('UserMood').get_current_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 status_messages and 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._presets = {} - for preset_name in app.settings.get_status_presets(): - preset = app.settings.get_status_preset_settings(preset_name) - opts = list(preset.values()) - opts[0] = from_one_line(opts[0]) - self._presets[preset_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._presets: - 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): - 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: - self._activity_btns[act] = Gtk.RadioButton() - self._activity_btns[act].join_group(group) - else: - self._activity_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) - self._activity_btns[act].add(icon_box) - self._activity_btns[act].join_group(self._ui.no_activity_button) - self._activity_btns[act].connect( - 'toggled', self._on_activity_toggled, [category, 'other']) - category_box.pack_start(self._activity_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: - self._activity_btns[act] = Gtk.RadioButton() - self._activity_btns[act].join_group(group) - else: - self._activity_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) - self._activity_btns[act].join_group( - self._ui.no_activity_button) - self._activity_btns[act].connect( - 'toggled', self._on_activity_toggled, [category, activity]) - self._activity_btns[act].add(icon_box) - category_box.pack_start( - self._activity_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' - - self._activity_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']]) - self._activity_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'])) - 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 - - # 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) - self._mood_btns[mood] = Gtk.RadioButton() - self._mood_btns[mood].join_group(self._ui.no_mood_button) - self._mood_btns[mood].set_mode(False) - self._mood_btns[mood].add(image) - self._mood_btns[mood].set_relief(Gtk.ReliefStyle.NONE) - self._mood_btns[mood].set_tooltip_text(MOODS[mood]) - self._mood_btns[mood].connect( - 'clicked', self._on_mood_button_clicked, mood) - self._ui.moods_grid.attach( - self._mood_btns[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: - self._mood_btns[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']]) - self._mood_btns[self._pep_dict['mood']].set_active(True) - self._ui.mood_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')) - self._ui.mood_label.set_text(_('No mood selected')) - - def _on_preset_select(self, widget): - self.stop_timeout() - self._ui.preset_popover.popdown() - name = widget.get_name() - self._message_buffer.set_text(self._presets[name][0]) - self._pep_dict['activity'] = self._presets[name][1] - self._pep_dict['subactivity'] = self._presets[name][2] - self._pep_dict['mood'] = self._presets[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.stop_timeout() - name = widget.get_name() - app.settings.remove_status_preset(name) - self._get_presets() - - def _on_save_as_preset_clicked(self, _widget): - self.stop_timeout() - 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.settings.set_status_preset_setting( - preset_name, 'message', msg_text_one_line) - app.settings.set_status_preset_setting( - preset_name, 'activity', activity) - app.settings.set_status_preset_setting( - preset_name, 'subactivity', subactivity) - app.settings.set_status_preset_setting( - preset_name, 'mood', mood) - self._get_presets() - - if preset_name in self._presets: - ConfirmationDialog( - _('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 - - _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.stop_timeout() - 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.stop_timeout() - 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.stop_timeout() - self._ui.activity_page_button.set_sensitive(switch.get_active()) - - def _on_mood_switch(self, switch, *args): - 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'] - - if self.account is None: - for client in app.get_available_clients(): - if not app.settings.get_account_setting( - client.account, 'sync_with_global_status'): - continue - client.set_user_mood(mood) - - else: - client = app.get_client(self.account) - 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']) - - if self.account is None: - for client in app.get_available_clients(): - if not app.settings.get_account_setting( - client.account, 'sync_with_global_status'): - continue - client.set_user_activity(activity) - - else: - client = app.get_client(self.account) - client.set_user_activity(activity) - - def _send_status_and_message(self, message): - if self.account is not None: - app.get_client(self.account).change_status(self._status, message) - return - - for account in app.connections: - if not app.settings.get_account_setting( - account, 'sync_with_global_status'): - continue - app.get_client(account).change_status(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 self._show_pep: - self._send_user_activity() - self._send_user_mood() - - if self._callback is not None: - self._callback(message) - else: - self._send_status_and_message(message) - self.destroy() ===================================== gajim/gtk/status_icon.py ===================================== @@ -207,19 +207,10 @@ def _add_status_menu(self): sub_menu.append(Gtk.SeparatorMenuItem()) - self._status_change_item = Gtk.MenuItem.new_with_mnemonic( - _('_Change Status Message…')) - sub_menu.append(self._status_change_item) - self._status_change_item.connect( - 'activate', self._on_change_status) - - sub_menu.append(Gtk.SeparatorMenuItem()) - uf_show = get_uf_show('offline', use_mnemonic=True) item = Gtk.MenuItem.new_with_mnemonic(uf_show) - sub_menu.append(item) item.connect('activate', self._on_show, 'offline') - + sub_menu.append(item) sub_menu.show_all() self._popup_menus.append(sub_menu) @@ -285,7 +276,3 @@ def _handle_first_event(): @staticmethod def _on_show(_widget, show): app.interface.change_status(status=show) - - @staticmethod - def _on_change_status(_widget): - app.interface.change_status(status=None) ===================================== gajim/gtk/status_selector.py ===================================== @@ -63,8 +63,6 @@ def _create_popover(self): 'xa', 'dnd', 'separator', - 'change_status_message', - 'separator', 'offline', ] @@ -77,16 +75,11 @@ def _create_popover(self): show_label = Gtk.Label() show_label.set_halign(Gtk.Align.START) - if item == 'change_status_message': - show_icon.set_from_icon_name('document-edit-symbolic', - Gtk.IconSize.MENU) - show_label.set_text_with_mnemonic(_('_Change Status Message')) - else: - surface = get_show_circle( - item, AvatarSize.SHOW_CIRCLE, self.get_scale_factor()) - show_icon.set_from_surface(surface) - show_label.set_text_with_mnemonic( - get_uf_show(item, use_mnemonic=True)) + surface = get_show_circle( + item, AvatarSize.SHOW_CIRCLE, self.get_scale_factor()) + show_icon.set_from_surface(surface) + show_label.set_text_with_mnemonic( + get_uf_show(item, use_mnemonic=True)) show_box = Gtk.Box(spacing=6) show_box.add(show_icon) @@ -97,10 +90,6 @@ def _create_popover(self): button.set_relief(Gtk.ReliefStyle.NONE) button.add(show_box) button.connect('clicked', self._on_change_status) - - if item == 'change_status_message': - self._change_status_message = button - popover_box.add(button) popover_box.show_all() @@ -111,8 +100,6 @@ def _create_popover(self): def _on_change_status(self, button): self._status_popover.popdown() new_status = button.get_name() - if new_status == 'change_status_message': - new_status = None app.interface.change_status(status=new_status, account=self._account) self.update() @@ -142,5 +129,3 @@ def update(self, *args, **kwargs): _('Status: %s') % show_label) if not self._compact: self._current_show_label.set_text(show_label) - - self._change_status_message.set_sensitive(show != 'offline') ===================================== gajim/gui_interface.py ===================================== @@ -824,7 +824,7 @@ def handle_event_signed_in(self, obj): location.enable() if ask_for_status_message(obj.conn.status, signin=True): - open_window('StatusChange', status=obj.conn.status) + app.window.show_app_page() def send_httpupload(self, chat_control, path=None): if path is not None: @@ -1503,7 +1503,10 @@ def change_status(self, status, account=None): status = helpers.get_global_show() if ask: - open_window('StatusChange', status=status) + if account is None: + app.window.show_app_page() + else: + app.window.show_account_page(account) return if account is not None: @@ -1525,7 +1528,7 @@ def change_account_status(self, account, status): status = client.status if ask: - open_window('StatusChange', status=status, account=account) + app.window.show_account_page(account) return self._change_status(account, status) @@ -1540,7 +1543,6 @@ def _change_status(account, status): account, 'last_status_msg', helpers.to_one_line(message)) - # TODO update systray icon if status == 'offline': # TODO delete pep View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02861286da7e301b9b49f92711fb2bd0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02861286da7e301b9b49f92711fb2bd0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Use textview for multi line Note element
by Daniel Brötzmann 24 May '21

24 May '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 819629d5 by wurstsalat at 2021-05-24T17:38:32+02:00 Profile: Use textview for multi line Note element - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -67,9 +67,15 @@ } .profile-scrolled { - border: 1px solid; + border: 1px solid @borders; border-radius: 4px; - border-color: @borders; +} +.profile-scrolled-read textview { + background: transparent; +} +.profile-scrolled-read textview text { + background: transparent; + color: @theme_text_color; } /* Emoticon Popover */ ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -79,7 +79,7 @@ 'role': {'value': ''}, 'url': {'value': ''}, 'key': {'value': '', 'value_type': 'text'}, - 'note': {'value': ''}, + 'note': {'value': '', 'value_type': 'text'}, } @@ -142,7 +142,7 @@ def __init__(self, account): 'org': TextEntryProperty, 'url': TextEntryProperty, 'key': KeyProperty, - 'note': TextEntryProperty, + 'note': MultiLineProperty, } self.set_column_spacing(12) @@ -592,6 +592,41 @@ def _on_text_changed(self, entry, _param): self._value_label.set_value(text) +class MultiLineProperty(VCardProperty): + def __init__(self, prop, _account): + VCardProperty.__init__(self, prop) + + self._edit_text_view = ValueTextView(prop) + self._edit_text_view.show() + + self._edit_scrolled = Gtk.ScrolledWindow() + self._edit_scrolled.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + self._edit_scrolled.add(self._edit_text_view) + self._edit_scrolled.set_valign(Gtk.Align.CENTER) + self._edit_scrolled.set_size_request(350, 100) + self._edit_scrolled.get_style_context().add_class('profile-scrolled') + + self._read_text_view = ValueTextView(prop) + self._read_text_view.set_sensitive(False) + self._read_text_view.set_left_margin(0) + self._read_text_view.show() + + self._read_scrolled = Gtk.ScrolledWindow() + self._read_scrolled.set_policy(Gtk.PolicyType.NEVER, + Gtk.PolicyType.AUTOMATIC) + self._read_scrolled.add(self._read_text_view) + self._read_scrolled.set_valign(Gtk.Align.CENTER) + self._read_scrolled.set_size_request(350, 100) + self._read_scrolled.get_style_context().add_class( + 'profile-scrolled-read') + + self._edit_widgets.append(self._edit_scrolled) + self._read_widgets.append(self._read_scrolled) + + self._third_column = [self._edit_scrolled, self._read_scrolled] + + class DateProperty(VCardProperty): def __init__(self, prop, account): VCardProperty.__init__(self, prop) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/819629d50e0c51b87ea13a9af2027153… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/819629d50e0c51b87ea13a9af2027153… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Add Note entry
by Daniel Brötzmann 24 May '21

24 May '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: adc680fb by wurstsalat at 2021-05-24T12:49:45+02:00 Profile: Add Note entry - - - - - 2 changed files: - gajim/gtk/profile.py - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -38,6 +38,7 @@ 'role': Q_('?profile:Role'), 'url': _('URL'), 'key': Q_('?profile:Public Encryption Key'), + 'note': Q_('?profile:Note'), } ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -79,6 +79,7 @@ 'role': {'value': ''}, 'url': {'value': ''}, 'key': {'value': '', 'value_type': 'text'}, + 'note': {'value': ''}, } @@ -104,6 +105,7 @@ 'role', 'url', 'key', + 'note', ] @@ -117,7 +119,7 @@ TYPE_VALUES = { - '-' : None, + '-': None, 'home': _('Home'), 'work': _('Work') } @@ -140,6 +142,7 @@ def __init__(self, account): 'org': TextEntryProperty, 'url': TextEntryProperty, 'key': KeyProperty, + 'note': TextEntryProperty, } self.set_column_spacing(12) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/adc680fb1a46384ffe953109c50fdcee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/adc680fb1a46384ffe953109c50fdcee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add StatusMessageSelector
by Daniel Brötzmann 23 May '21

23 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 902924d4 by wurstsalat at 2021-05-24T00:35:26+02:00 Add StatusMessageSelector - - - - - 4 changed files: - gajim/data/gui/account_page.ui - gajim/gtk/account_page.py - gajim/gtk/app_page.py - + gajim/gtk/status_message_selector.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -230,6 +230,21 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox" id="status_message_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -243,7 +258,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> ===================================== gajim/gtk/account_page.py ===================================== @@ -21,6 +21,7 @@ from gajim.common.i18n import _ from .roster import Roster +from .status_message_selector import StatusMessageSelector from .status_selector import StatusSelector from .notification_manager import NotificationManager from .util import get_builder @@ -49,6 +50,10 @@ def __init__(self, account): self._status_selector.set_halign(Gtk.Align.CENTER) self._ui.account_action_box.add(self._status_selector) + self._status_message_selector = StatusMessageSelector(account=account) + self._status_message_selector.set_halign(Gtk.Align.CENTER) + self._ui.status_message_box.add(self._status_message_selector) + self._notification_manager = NotificationManager(account) self._ui.account_box.add(self._notification_manager) ===================================== gajim/gtk/app_page.py ===================================== @@ -19,6 +19,7 @@ from gajim.common.helpers import open_uri from gajim.common.i18n import _ +from .status_message_selector import StatusMessageSelector from .status_selector import StatusSelector from .util import get_builder @@ -38,16 +39,24 @@ def __init__(self): self.get_style_context().add_class('app-page') self._unread_count = 0 - gajim_label = Gtk.Label(label=_('Status')) - gajim_label.get_style_context().add_class('large-header') - self.add(gajim_label) - status_label = Gtk.Label(label=_('Status for all accounts')) + status_header = Gtk.Label(label=_('Status')) + status_header.get_style_context().add_class('large-header') + self.add(status_header) + status_label = Gtk.Label( + label=_('Status and status message for all accounts')) status_label.get_style_context().add_class('dim-label') self.add(status_label) + status_box = Gtk.Box(spacing=12) + status_box.set_halign(Gtk.Align.CENTER) self._status_selector = StatusSelector() - self._status_selector.set_halign(Gtk.Align.CENTER) - self.add(self._status_selector) + status_box.add(self._status_selector) + + self._status_message_selector = StatusMessageSelector() + self._status_message_selector.set_halign(Gtk.Align.CENTER) + status_box.add(self._status_message_selector) + + self.add(status_box) update_label = Gtk.Label(label=_('Updates')) update_label.get_style_context().add_class('large-header') ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -0,0 +1,70 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common import ged +from gajim.common.helpers import get_global_status_message +from gajim.common.helpers import to_one_line +from gajim.common.i18n import _ + + +class StatusMessageSelector(Gtk.Box): + def __init__(self, account=None): + Gtk.Box.__init__(self) + self.get_style_context().add_class('linked') + self._account = account + + self._entry = Gtk.Entry() + self._entry.set_size_request(200, -1) + self._entry.set_property('show-emoji-icon', True) + self._entry.set_placeholder_text(_('Status message…')) + self._entry.connect('activate', self._set_status_message) + self._entry.connect('changed', self._on_changed) + + self._button = Gtk.Button.new_from_icon_name( + 'object-select-symbolic', Gtk.IconSize.BUTTON) + self._button.set_tooltip_text(_('Set status message')) + self._button.connect('clicked', self._set_status_message) + self.add(self._entry) + self.add(self._button) + self.show_all() + app.ged.register_event_handler('our-show', ged.POSTGUI, self.update) + + def _on_changed(self, _entry): + self._button.set_sensitive(True) + + def _set_status_message(self, *args): + self._button.set_sensitive(False) + message = self._entry.get_text() + message = to_one_line(message) + if self._account is not None: + client = app.get_client(self._account) + client.change_status(client.status, message) + else: + for account in app.connections: + if not app.settings.get_account_setting( + account, 'sync_with_global_status'): + continue + client = app.get_client(account) + client.change_status(client.status, message) + + def update(self, *args): + if self._account is None: + message = get_global_status_message() + else: + client = app.get_client(self._account) + message = client.status_message + self._entry.set_text(message) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/902924d4441689b73e2b5e4712be2898… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/902924d4441689b73e2b5e4712be2898… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Status Message Dialog
by Philipp Hörist 23 May '21

23 May '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 790ec5b9 by lovetox at 2021-05-23T21:06:14+02:00 Fix Status Message Dialog - - - - - 1 changed file: - gajim/gtk/status_change.py Changes: ===================================== gajim/gtk/status_change.py ===================================== @@ -542,17 +542,14 @@ def _send_user_activity(self): def _send_status_and_message(self, message): if self.account is not None: - app.interface.roster.send_status(self.account, - self._status, - message) + app.get_client(self.account).change_status(self._status, message) return for account in app.connections: if not app.settings.get_account_setting( account, 'sync_with_global_status'): continue - - app.interface.roster.send_status(account, self._status, message) + app.get_client(account).change_status(self._status, message) def _change_status(self, *args): self.stop_timeout() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/790ec5b9edfb9cba6a11f6dedfbf9062… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/790ec5b9edfb9cba6a11f6dedfbf9062… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Diplay name of domain jids correctly
by Philipp Hörist 23 May '21

23 May '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: ebddaa65 by lovetox at 2021-05-23T19:23:48+02:00 Diplay name of domain jids correctly - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -222,6 +222,8 @@ def name(self): nickname = app.storage.cache.get_contact(self._jid, 'nickname') if nickname: return nickname + if self._jid.is_domain: + return self._jid.domain return self._jid.localpart @property View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ebddaa656dcc53c6f951ac092609a9f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ebddaa656dcc53c6f951ac092609a9f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StatusIcon: Improve behaviour
by Daniel Brötzmann 23 May '21

23 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 06663860 by wurstsalat at 2021-05-23T18:39:43+02:00 StatusIcon: Improve behaviour - - - - - 3 changed files: - gajim/common/helpers.py - gajim/gtk/status_icon.py - gajim/gtk/util.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -872,17 +872,6 @@ def copy(self): return copy.deepcopy(self) -def save_roster_position(window): - if not app.settings.get('save-roster-position'): - return - if app.is_display(Display.WAYLAND): - return - x_pos, y_pos = window.get_position() - log.debug('Save roster position: %s %s', x_pos, y_pos) - app.settings.set('roster_x-position', x_pos) - app.settings.set('roster_y-position', y_pos) - - class Singleton(type): _instances = {} # type: Dict[Any, Any] def __call__(cls, *args, **kwargs): ===================================== gajim/gtk/status_icon.py ===================================== @@ -30,11 +30,11 @@ from gajim.common.i18n import _ from gajim.common.helpers import get_global_show from gajim.common.helpers import get_uf_show -from gajim.common.helpers import save_roster_position from gajim.common.nec import EventHelper from .util import get_builder from .util import get_icon_name +from .util import save_roster_position from .util import restore_roster_position from .util import open_window @@ -169,7 +169,7 @@ def _on_popup_menu(self, _status_icon, button, activate_time): if button == 1: self._on_activate() elif button == 2: - self._on_toggle_window() + self._on_activate() elif button == 3: self._build_menu(activate_time) @@ -244,14 +244,7 @@ def _on_sounds_mute(widget): def _on_toggle_window(self, *args): # When using Gtk.StatusIcon, app.window will never return True for # 'has-toplevel-focus' while clicking the menu item - GLib.idle_add(self._toggle_window) - - @staticmethod - def _toggle_window(): - if app.window.get_property('has-toplevel-focus'): - app.window.hide() - else: - app.window.present() + GLib.idle_add(self._on_activate) @staticmethod def _on_preferences(_widget): @@ -285,10 +278,8 @@ def _handle_first_event(): account, jid, event = app.events.get_first_systray_event() if not event: return - win = app.window if not app.window.get_property('visible'): - # Needed if we are in one window mode - restore_roster_position(win) + restore_roster_position(app.window) app.interface.handle_event(account, jid, event.type_) @staticmethod ===================================== gajim/gtk/util.py ===================================== @@ -336,6 +336,17 @@ def move_window(window: Gtk.Window, pos_x: int, pos_y: int) -> None: window.move(pos_x, pos_y) +def save_roster_position(window): + if not app.settings.get('save-roster-position'): + return + if app.is_display(Display.WAYLAND): + return + x_pos, y_pos = window.get_position() + log.debug('Save roster position: %s %s', x_pos, y_pos) + app.settings.set('roster_x-position', x_pos) + app.settings.set('roster_y-position', y_pos) + + def restore_roster_position(window): if not app.settings.get('save-roster-position'): return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/06663860ae5dc2435a04453951f3f63d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/06663860ae5dc2435a04453951f3f63d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StatusChange: Stop timeout on destroy
by Daniel Brötzmann 23 May '21

23 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 93706bf6 by wurstsalat at 2021-05-23T18:16:38+02:00 StatusChange: Stop timeout on destroy - - - - - 1 changed file: - gajim/gtk/status_change.py Changes: ===================================== gajim/gtk/status_change.py ===================================== @@ -103,11 +103,15 @@ def __init__(self, callback=None, account=None, status=None, show_pep=True): self._message_buffer.connect('changed', self.stop_timeout) self.connect('key-press-event', self._on_key_press) + self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) self.show_all() self.start_timeout() + def _on_destroy(self, *args): + self.stop_timeout() + def on_timeout(self): self._change_status() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93706bf63cef7010689de4c24bb3be22… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93706bf63cef7010689de4c24bb3be22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Open new chats with bare jid
by Daniel Brötzmann 23 May '21

23 May '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2eb913a7 by wurstsalat at 2021-05-23T12:33:00+02:00 Open new chats with bare jid - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -438,9 +438,8 @@ def _on_event(self, event): event.properties.jid, 'pm') else: - self.add_chat(event.account, - event.properties.jid, - 'contact') + jid = event.properties.jid.new_as_bare() + self.add_chat(event.account, jid, 'contact') else: # No chat is open, dont handle any gui events return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2eb913a74e2ed71a9548b7524f7fd085… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2eb913a74e2ed71a9548b7524f7fd085… You're receiving this email because of your account on dev.gajim.org.

1 0

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

22 May '21

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

1 0

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