Commits March 2022

commits@gajim.org

1 participants
91 discussions

[Git][gajim/gajim][master] 2 commits: Add MUC localpart generator
by Daniel Brötzmann (＠wurstsalat) 14 Mar '22

14 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f01094e3 by wurstsalat at 2022-03-14T23:44:58+01:00 Add MUC localpart generator - - - - - 9b72433a by wurstsalat at 2022-03-14T23:52:16+01:00 GroupchatCreation: Rework dialog - - - - - 6 changed files: - gajim/common/const.py - gajim/common/helpers.py - gajim/data/gui/groupchat_creation.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/common/const.py ===================================== @@ -448,6 +448,12 @@ def __str__(self): } +VOWELS = 'aeiou' + + +CONSONANTS = 'bcdfghjklmnpqrstvwxyz' + + THANKS = u"""\ Alexander Futász Alexander V. Butenko ===================================== gajim/common/helpers.py ===================================== @@ -94,6 +94,8 @@ from gajim.common.const import URIAction from gajim.common.const import GIO_TLS_ERRORS from gajim.common.const import SHOW_LIST +from gajim.common.const import CONSONANTS +from gajim.common.const import VOWELS from gajim.common.regex import INVALID_XML_CHARS_REGEX from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX from gajim.common.structs import URI @@ -1394,6 +1396,19 @@ def get_muc_context(jid: JID) -> Optional[str]: return 'public' +def get_random_muc_localpart() -> str: + rand = random.randrange(4) + is_vowel = bool(random.getrandbits(1)) + result = '' + for _ in range(rand * 2 + (5 - rand)): + if is_vowel: + result = f'{result}{VOWELS[random.randrange(len(VOWELS))]}' + else: + result = f'{result}{CONSONANTS[random.randrange(len(CONSONANTS))]}' + is_vowel = not is_vowel + return result + + def get_start_of_day(date_time: datetime) -> datetime: return date_time.replace(hour=0, minute=0, ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.24"/> <object class="GtkListStore" id="account_liststore"> <columns>  @@ -10,23 +10,25 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkPopover" id="public_private_popover"> - <property name="can_focus">False</property> + <object class="GtkOverlay" id="create_group_chat"> + <property name="visible">True</property> + <property name="can-focus">False</property> <child> <object class="GtkBox"> + <property name="width-request">400</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="border_width">12</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">18</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Public or Private?</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Create Group Chat</property> + <property name="wrap">True</property> <style> - <class name="bold16"/> + <class name="large-header"/> </style> </object> <packing> @@ -36,14 +38,264 @@ </packing> </child> <child> - <object class="GtkLabel"> +  + <object class="GtkGrid" id="grid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Private:</b> If you plan to chat encrypted, you would typically want to create a private group chat. You have to invite people so they can join.</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="width_chars">40</property> - <property name="max_width_chars">40</property> + <property name="can-focus">False</property> + <property name="margin-top">12</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">_Name</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">name_entry</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"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Description</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">description_entry</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="GtkEntry" id="name_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <signal name="changed" handler="_on_name_entry_changed" swapped="no"/> + </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="show-emoji-icon">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="account_combo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="valign">center</property> + <property name="margin-bottom">12</property> + <property name="model">account_liststore</property> + <property name="id-column">0</property> + <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">end</property> + <property name="margin-bottom">12</property> + <property name="label" translatable="yes">_Account</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">account_combo</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="GtkEntry" id="address_entry"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <signal name="changed" handler="_on_address_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="address_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Address</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">5</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="private_radio"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="margin-top">12</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + <property name="group">public_radio</property> + <signal name="toggled" handler="_on_public_private_toggled" swapped="no"/> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="margin-start">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Private</property> + <property name="use-markup">True</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">You have to invite people so they can join</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="public_radio"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + <property name="group">private_radio</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Public</property> + <property name="use-markup">True</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Anyone can join</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -51,139 +303,17 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Public:</b> Anyone who knows the address can join.</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> - <object class="GtkBox" id="create_group_chat"> - <property name="width_request">400</property> - <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">18</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Create Group Chat</property> - <property name="wrap">True</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="GtkGrid" id="grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</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">_Name</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">name_entry</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"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Description</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">description_entry</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="GtkEntry" id="name_entry"> - <property name="width_request">200</property> - <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">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="description_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_emoji_icon">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</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="valign">center</property> - <property name="margin_top">12</property> - <property name="label" translatable="yes">_Public</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">public_switch</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="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="margin-top">12</property> <property name="spacing">12</property> <child> - <object class="GtkSwitch" id="public_switch"> + <object class="GtkSpinner" id="spinner"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -192,20 +322,17 @@ </packing> </child> <child> - <object class="GtkMenuButton"> + <object class="GtkButton" id="create_button"> + <property name="label" translatable="yes">_Create</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">end</property> - <property name="relief">none</property> - <property name="popover">public_private_popover</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">dialog-information-symbolic</property> - </object> - </child> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_create_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -215,130 +342,39 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</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">_Address</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">address_entry</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="address_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="activate" handler="_on_address_entry_activate" swapped="no"/> - <signal name="changed" handler="_on_address_entry_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="account_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="valign">center</property> - <property name="model">account_liststore</property> - <property name="id_column">0</property> - <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="account_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Account</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">account_combo</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">3</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="index">-1</property> </packing> </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="margin_top">12</property> - <property name="spacing">12</property> + <child type="overlay"> + <object class="GtkBox" id="no_connection_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="opacity">0.90</property> <child> - <object class="GtkSpinner" id="spinner"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">You are not connected</property> + <property name="wrap">True</property> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="create_button"> - <property name="label" translatable="yes">_Create</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_create_clicked" swapped="no"/> - <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> + <style> + <class name="solid-background"/> + </style> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">3</property> - </packing> </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -17,6 +17,10 @@ .dialog-margin > box { margin: 18px;} #MessageWindow, #RosterWindow paned { background-color: @theme_base_color; } +.solid-background { + background-color: @theme_base_color; +} + #DropArea {background-color: @theme_base_color;} .chatcontrol-separator-top {margin-top: 5px;} ===================================== gajim/gtk/builder.pyi ===================================== @@ -452,17 +452,19 @@ class GroupchatControlBuilder(Builder): class GroupchatCreationBuilder(Builder): account_liststore: Gtk.ListStore - public_private_popover: Gtk.Popover - create_group_chat: Gtk.Box + create_group_chat: Gtk.Overlay grid: Gtk.Grid name_entry: Gtk.Entry description_entry: Gtk.Entry - public_switch: Gtk.Switch - address_entry: Gtk.Entry account_combo: Gtk.ComboBox account_label: Gtk.Label + address_entry: Gtk.Entry + address_label: Gtk.Label + private_radio: Gtk.RadioButton + public_radio: Gtk.RadioButton spinner: Gtk.Spinner create_button: Gtk.Button + no_connection_box: Gtk.Box class GroupchatDetailsBuilder(Builder): ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -12,7 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Any +from typing import Optional +from typing import Union import logging import random @@ -24,11 +25,16 @@ from nbxmpp.task import Task from gajim.common import app +from gajim.common import ged from gajim.common.const import MUC_CREATION_EXAMPLES from gajim.common.const import MUC_DISCO_ERRORS -from gajim.common.i18n import _ +from gajim.common.events import AccountConnected +from gajim.common.events import AccountDisonnected +from gajim.common.ged import EventHelper +from gajim.common.helpers import get_random_muc_localpart from gajim.common.helpers import validate_jid from gajim.common.helpers import to_user_string +from gajim.common.i18n import _ from .dialogs import ErrorDialog from .builder import get_builder @@ -37,9 +43,10 @@ log = logging.getLogger('gajim.gui.groupchat_creation') -class CreateGroupchatWindow(Gtk.ApplicationWindow): - def __init__(self, account: str) -> None: +class CreateGroupchatWindow(Gtk.ApplicationWindow, EventHelper): + def __init__(self, account: Optional[str]) -> None: Gtk.ApplicationWindow.__init__(self) + EventHelper.__init__(self) self.set_name('CreateGroupchat') self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -54,37 +61,53 @@ def __init__(self, account: str) -> None: self._destroyed: bool = False - self._account = self._fill_account_combo(account) - self._create_entry_completion() - self._fill_placeholders() self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) + self.register_events([ + ('account-connected', ged.GUI2, self._on_account_state), + ('account-disconnected', ged.GUI2, self._on_account_state) + ]) + self.show_all() + + if app.get_number_of_connected_accounts() == 0: + # This can happen under rare circumstances + self._ui.no_connection_box.show() + return + + self._account = self._update_accounts(account) + self.set_focus(self._ui.address_entry) - def _get_muc_service_jid(self) -> str: - client = app.get_client(self._account) - return str(client.get_module('MUC').service_jid or 'muc.example.com') + def _on_account_state(self, + _event: Union[AccountConnected, AccountDisonnected] + ) -> None: + any_account_connected = app.get_number_of_connected_accounts() > 0 + self._ui.no_connection_box.set_visible(not any_account_connected) + if any_account_connected: + self._account = self._update_accounts() - def _fill_account_combo(self, account: str) -> str: + def _update_accounts(self, account: Optional[str] = None) -> str: accounts = app.get_enabled_accounts_with_labels(connected_only=True) account_liststore = self._ui.account_combo.get_model() + assert isinstance(account_liststore, Gtk.ListStore) + account_liststore.clear() + for acc in accounts: account_liststore.append(acc) - # Hide account combobox if there is only one account - if len(accounts) == 1: - self._ui.account_combo.hide() - self._ui.account_label.hide() + self._ui.account_combo.set_visible(len(accounts) != 1) + self._ui.account_label.set_visible(len(accounts) != 1) if account is None: account = accounts[0][0] self._ui.account_combo.set_active_id(account) + self._fill_placeholders() return account def _create_entry_completion(self) -> None: @@ -109,25 +132,25 @@ def _fill_placeholders(self) -> None: self._ui.address_entry.set_placeholder_text( f'{placeholder[2]}@{server}') + def _get_muc_service_jid(self) -> str: + assert self._account is not None + client = app.get_client(self._account) + return str(client.get_module('MUC').service_jid or 'muc.example.com') + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() def _on_account_combo_changed(self, combo: Gtk.ComboBox) -> None: self._account = combo.get_active_id() + if self._account is None: + model = combo.get_model() + iter_ = model.get_iter_first() + if not iter_: + return + self._account = model[iter_][0] self._fill_placeholders() - def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: - text = entry.get_text() - if '@' in text: - text = text.split('@', 1)[0] - - model = entry.get_completion().get_model() - model.clear() - - server = self._get_muc_service_jid() - model.append([f'{text}@{server}']) - def _validate_jid(self, text: str) -> None: if not text: self._set_warning_icon(False) @@ -168,7 +191,7 @@ def _set_warning(self, text: str) -> None: self._ui.create_button.set_sensitive(False) def _set_warning_from_error(self, error: StanzaError) -> None: - condition = error.condition + condition = error.condition or '' if condition == 'gone': condition = 'already-exists' text = MUC_DISCO_ERRORS.get(condition, to_user_string(error)) @@ -177,22 +200,49 @@ def _set_warning_from_error(self, error: StanzaError) -> None: def _set_warning_from_error_code(self, error_code: str) -> None: self._set_warning(MUC_DISCO_ERRORS[error_code]) + def _on_name_entry_changed(self, entry: Gtk.Entry) -> None: + if self._ui.private_radio.get_active(): + return + + name = entry.get_text() + server = self._get_muc_service_jid() + self._ui.address_entry.set_text(f'{name.lower()}@{server}') + def _on_address_entry_changed(self, entry: Gtk.Entry) -> None: text = entry.get_text() self._update_entry_completion(entry, text) self._validate_jid(text) - def _on_address_entry_activate(self, _entry: Gtk.Entry) -> None: - self._on_create_clicked() + def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: + text = entry.get_text() + if '@' in text: + text = text.split('@', 1)[0] + + model = entry.get_completion().get_model() + assert isinstance(model, Gtk.ListStore) + model.clear() - def _on_create_clicked(self, *args: Any) -> None: + server = self._get_muc_service_jid() + model.append([f'{text}@{server}']) + + def _on_public_private_toggled(self, _radiobutton: Gtk.RadioButton) -> None: + is_public = self._ui.public_radio.get_active() + self._ui.address_label.set_visible(is_public) + self._ui.address_entry.set_visible(is_public) + + def _on_create_clicked(self, _button: Gtk.Button) -> None: + assert self._account is not None if not app.account_is_available(self._account): ErrorDialog( _('Not Connected'), _('You have to be connected to create a group chat.')) return - room_jid = self._ui.address_entry.get_text() + if self._ui.public_radio.get_active(): + room_jid = self._ui.address_entry.get_text() + else: + server = self._get_muc_service_jid() + room_jid = f'{get_random_muc_localpart()}@{server}' self._set_processing_state(True) client = app.get_client(self._account) @@ -205,6 +255,7 @@ def _disco_info_received(self, task: Task) -> None: result = task.finish() except StanzaError as error: if error.condition == 'item-not-found': + assert error.jid is not None self._create_muc(error.jid) return self._set_warning_from_error(error) @@ -218,7 +269,7 @@ def _disco_info_received(self, task: Task) -> None: def _create_muc(self, room_jid: str) -> None: name = self._ui.name_entry.get_text() description = self._ui.description_entry.get_text() - is_public = self._ui.public_switch.get_active() + is_public = self._ui.public_radio.get_active() config = { # XEP-0045 options @@ -234,6 +285,7 @@ def _create_muc(self, room_jid: str) -> None: } # Create new group chat by joining + assert self._account is not None app.interface.create_groupchat( self._account, str(room_jid), @@ -243,3 +295,5 @@ def _create_muc(self, room_jid: str) -> None: def _on_destroy(self, _widget: Gtk.Widget) -> None: self._destroyed = True + self.unregister_events() + app.check_finalize(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fe3d46bf5b8a8f6eb4d5405205afd0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fe3d46bf5b8a8f6eb4d5405205afd0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatControl: Disable invite and details if we are not joined
by Daniel Brötzmann (＠wurstsalat) 14 Mar '22

14 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9fe3d46b by wurstsalat at 2022-03-14T23:09:16+01:00 GroupchatControl: Disable invite and details if we are not joined - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -328,12 +328,16 @@ def update_actions(self, *args: Any) -> None: self._get_action('contact-information-').set_enabled(joined) + self._get_action('groupchat-details-').set_enabled(joined) + self._get_action('execute-command-').set_enabled(joined) self._get_action('ban-').set_enabled(joined) self._get_action('kick-').set_enabled(joined) + self._get_action('invite-').set_enabled(joined) + def remove_actions(self) -> None: super().remove_actions() actions = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fe3d46bf5b8a8f6eb4d5405205afd0b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fe3d46bf5b8a8f6eb4d5405205afd0b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MoreMenuButton: Allow quotes only if we are joined
by Daniel Brötzmann (＠wurstsalat) 14 Mar '22

14 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0ad6ea73 by wurstsalat at 2022-03-14T21:48:36+01:00 MoreMenuButton: Allow quotes only if we are joined - - - - - 1 changed file: - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -69,6 +69,10 @@ def __init__(self, def _on_click(self, _button: Gtk.Button) -> None: show_retract = False if isinstance(self._contact, GroupchatContact): + if not self._contact.is_joined: + self._create_popover(False) + return + disco_info = app.storage.cache.get_last_disco_info( self._contact.jid) assert disco_info is not None @@ -92,6 +96,8 @@ def _create_popover(self, show_retract: bool) -> None: self_contact = self._contact.get_self() assert self_contact is not None quote_enabled = not self_contact.role.is_visitor + else: + quote_enabled = False quote_button = Gtk.ModelButton() quote_button.set_halign(Gtk.Align.START) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ad6ea738f35036571cb54de6b9326e9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ad6ea738f35036571cb54de6b9326e9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist (＠lovetox) 14 Mar '22

14 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d07380d0 by lovetox at 2022-03-14T18:18:49+01:00 Remove unused import - - - - - 1 changed file: - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -16,7 +16,6 @@ from __future__ import annotations -from typing import Any from typing import Iterator from typing import cast from typing import Optional View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d07380d0b5e5a2c3a96c1324d33a40a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d07380d0b5e5a2c3a96c1324d33a40a7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Websocket: Don’t fail on invalid host-meta files
by Philipp Hörist (＠lovetox) 14 Mar '22

14 Mar '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b31ab564 by lovetox at 2022-03-14T19:22:25+01:00 Websocket: Don’t fail on invalid host-meta files - - - - - 1 changed file: - nbxmpp/addresses.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -161,7 +161,7 @@ class ServerAddresses(Observable): try: uri = parse_websocket_uri(response_body.data) - except ValueError as error: + except Exception as error: log.info('Error parsing websocket uri: %s', error) self._on_request_resolved() return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/b31ab5646d3cf82dacaeeda5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/b31ab5646d3cf82dacaeeda5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-2.0.6
by Philipp Hörist (＠lovetox) 14 Mar '22

14 Mar '22

Philipp Hörist pushed new tag nbxmpp-2.0.6 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/nbxmpp-2.0.6 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 2 commits: Websocket: Don’t fail on invalid host-meta files
by Philipp Hörist (＠lovetox) 14 Mar '22

14 Mar '22

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: a42c3cd5 by lovetox at 2022-03-14T19:20:51+01:00 Websocket: Don’t fail on invalid host-meta files - - - - - 5600b5ab by lovetox at 2022-03-14T19:21:16+01:00 2.0.6 - - - - - 3 changed files: - nbxmpp/__init__.py - nbxmpp/addresses.py - setup.cfg Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "2.0.5" +__version__ = "2.0.6" ===================================== nbxmpp/addresses.py ===================================== @@ -161,7 +161,7 @@ class ServerAddresses(Observable): try: uri = parse_websocket_uri(response_body.data) - except ValueError as error: + except Exception as error: log.info('Error parsing websocket uri: %s', error) self._on_request_resolved() return ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 2.0.5 +version = 2.0.6 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/d1a86fbfa032e27b6da934e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/d1a86fbfa032e27b6da934e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GajimMenu: Add default for value parameter
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 790a088e by lovetox at 2022-03-14T00:16:14+01:00 GajimMenu: Add default for value parameter - - - - - 9bb23460 by lovetox at 2022-03-14T00:18:39+01:00 Menus: Refactor SingleChat menus - Split into self contact, private chat and single chat menu - Use GajimMenu - - - - - 3 changed files: - gajim/gtk/controls/chat.py - gajim/gtk/menus.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -68,6 +68,8 @@ from gajim.command_system.framework import CommandHost from ..menus import get_encryption_menu +from ..menus import get_private_chat_menu +from ..menus import get_self_contact_menu from ..menus import get_singlechat_menu log = logging.getLogger('gajim.gui.controls.chat') @@ -116,8 +118,16 @@ def __init__(self, account: str, jid: JID) -> None: self.conversation_view.connect('call-declined', self._on_call_declined) # Menu for the HeaderBar - self.control_menu = get_singlechat_menu( - self.control_id, self.account, self.contact.jid, self._type) + if self._type == ControlType.CHAT: + if self.contact.is_self: + self.control_menu = get_self_contact_menu(self.control_id, + self.contact) + else: + self.control_menu = get_singlechat_menu(self.control_id, + self.contact) + else: + self.control_menu = get_private_chat_menu(self.control_id, + self.contact) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) ===================================== gajim/gtk/menus.py ===================================== @@ -57,73 +57,68 @@ MenuItemListT = list[tuple[str, str, MenuValueT]] +def get_self_contact_menu(control_id: str, + contact: types.BareContact) -> GajimMenu: + account = contact.account + jid = contact.jid + + menu = GajimMenu() + + menu.add_item(_('Profile'), f'app.{account}-profile', f'"{account}"') + submenu = get_send_file_submenu(control_id) + menu.append_submenu(_('Send File'), submenu) + + params = RemoveHistoryActionParams(account=account, jid=jid) + menu.add_item(_('Remove History…'), 'app.remove-history', params) + menu.add_item(_('Search…'), 'win.search-history', None) + return menu + + def get_singlechat_menu(control_id: str, - account: str, - jid: JID, - type_: ControlType - ) -> Gio.Menu: - client = app.get_client(account) - is_self_contact = jid.bare == client.get_own_jid().bare - contact = client.get_module('Contacts').get_contact(jid) + contact: Union[types.BareContact, + types.GroupchatParticipant] + ) -> GajimMenu: - self_contact_menu: list[tuple[str, Any]] = [ - ('profile', _('Profile')), - (_('Send File'), [ - ('win.send-file-httpupload-', _('Upload File…')), - ('win.send-file-jingle-', _('Send File Directly…')) - ]), - ('app.remove-history', _('Remove History…')), - ('win.search-history', _('Search…')) - ] + menu = GajimMenu() + menu.add_item(_('Details'), f'win.information-{control_id}') + menu.add_item(_('Block Contact…'), f'win.block-contact-{control_id}') - singlechat_menu: list[tuple[str, Any]] = [ - ('win.information-', _('Details')), - ('win.block-contact-', _('Block Contact…')), - (_('Send File'), [ - ('win.send-file-httpupload-', _('Upload File…')), - ('win.send-file-jingle-', _('Send File Directly…')) - ]), - ('win.start-call-', _('Start Call…')), - ('win.search-history', _('Search…')) - ] + submenu = get_send_file_submenu(control_id) + menu.append_submenu(_('Send File'), submenu) + + menu.add_item(_('Start Call…'), f'win.start-call-{control_id}') + menu.add_item(_('Search…'), 'win.search-history') if can_add_to_roster(contact): - singlechat_menu.append(('win.add-to-roster-', - _('Add to Contact List…'))) - - def build_menu(preset: list[tuple[str, Any]]): - menu = Gio.Menu() - for item in preset: - if isinstance(item[1], str): - action_name, label = item - if action_name == 'win.search-history': - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, None) - menu.append_item(menuitem) - elif action_name == 'profile': - action = f'app.{account}-{action_name}' - menuitem = Gio.MenuItem.new(label, action) - variant = GLib.Variant('s', account) - menuitem.set_action_and_target_value(action, variant) - menu.append_item(menuitem) - elif action_name == 'app.remove-history': - params = RemoveHistoryActionParams(account=account, jid=jid) - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, - params.to_variant()) - menu.append_item(menuitem) - else: - menu.append(label, action_name + control_id) - else: - label, sub_menu = item - submenu = build_menu(sub_menu) - menu.append_submenu(label, submenu) - return menu + menu.append(_('Add to Contact List…'), + f'win.add-to-roster-{control_id}') - if is_self_contact: - return build_menu(self_contact_menu) + return menu - return build_menu(singlechat_menu) + +def get_private_chat_menu(control_id: str, + contact: types.GroupchatParticipant + ) -> GajimMenu: + + menu = GajimMenu() + menu.add_item(_('Details'), f'win.information-{control_id}') + menu.add_item(_('Upload File…'), f'win.send-file-httpupload-{control_id}') + menu.add_item(_('Search…'), 'win.search-history') + + if can_add_to_roster(contact): + menu.append(_('Add to Contact List…'), + f'win.add-to-roster-{control_id}') + + return menu + + +def get_send_file_submenu(control_id: str) -> GajimMenu: + menu = GajimMenu() + + menu.add_item(_('Upload File…'), f'win.send-file-httpupload-{control_id}') + menu.add_item(_('Send File Directly…'), + f'win.send-file-jingle-{control_id}') + return menu def get_groupchat_menu(control_id: str, account: str, jid: JID) -> GajimMenu: @@ -207,10 +202,10 @@ def build_accounts_menu() -> None: def get_encryption_menu(control_id: str, control_type: ControlType, - ) -> Optional[Gio.Menu]: - menu = Gio.Menu() - menu.append( - _('Disabled'), f'win.set-encryption-{control_id}::disabled') + ) -> Optional[GajimMenu]: + menu = GajimMenu() + action = f'win.set-encryption-{control_id}' + menu.add_item(_('Disabled'), action, '"disabled"') for name, plugin in app.plugin_manager.encryption_plugins.items(): if control_type.is_groupchat: if not hasattr(plugin, 'allow_groupchat'): @@ -218,8 +213,8 @@ def get_encryption_menu(control_id: str, if control_type.is_privatechat: if not hasattr(plugin, 'allow_privatechat'): continue - menu_action = f'win.set-encryption-{control_id}::{name}' - menu.append(name, menu_action) + menu.add_item(name, action, f'"{name}"') + if menu.get_n_items() == 1: return None return menu ===================================== gajim/gtk/util.py ===================================== @@ -931,7 +931,10 @@ def from_list(cls, menulist: MenuItemListT) -> GajimMenu: menu.append_item(menuitem) return menu - def add_item(self, label: str, action: str, value: MenuValueT) -> None: + def add_item(self, + label: str, + action: str, + value: Optional[MenuValueT] = None) -> None: item = make_menu_item(label, action, value) self.append_item(item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c36528176c745f8da9546eb11b1d57d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c36528176c745f8da9546eb11b1d57d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: GajimMenu: Add from_list()
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a16e3340 by lovetox at 2022-03-13T22:23:48+01:00 GajimMenu: Add from_list() - - - - - 67340fb2 by lovetox at 2022-03-13T22:24:28+01:00 Menus: Use GajimMenu - - - - - c3652817 by lovetox at 2022-03-13T22:33:16+01:00 Menus: Fix move to workspace action - - - - - 2 changed files: - gajim/gtk/menus.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -49,7 +49,6 @@ from gajim.gui.structs import ForgetGroupchatActionParams from gajim.gui.structs import MoveChatToWorkspaceAP from gajim.gui.structs import RemoveHistoryActionParams -from gajim.gui.util import make_menu from gajim.gui.util import GajimMenu from gajim.gui.const import ControlType @@ -127,8 +126,8 @@ def build_menu(preset: list[tuple[str, Any]]): return build_menu(singlechat_menu) -def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: - menulist: MenuItemListT = [ +def get_groupchat_menu(control_id: str, account: str, jid: JID) -> GajimMenu: + menuitems: MenuItemListT = [ (_('Details'), f'win.groupchat-details-{control_id}', None), (_('Change Nickname…'), f'win.change-nickname-{control_id}', None), (_('Request Voice'), f'win.request-voice-{control_id}', None), @@ -136,10 +135,10 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: (_('Search…'), 'win.search-history', None) ] - return make_menu(menulist) + return GajimMenu.from_list(menuitems) -def get_account_menu(account: str) -> Gio.Menu: +def get_account_menu(account: str) -> GajimMenu: val = f'"{account}"' @@ -149,7 +148,7 @@ def get_account_menu(account: str) -> Gio.Menu: (_('Server Info'), f'app.{account}-server-info', val), ] - menu = make_menu(menuitems) + menu = GajimMenu.from_list(menuitems) advanced_menuitems: MenuItemListT = [ (_('Archiving Preferences'), f'app.{account}-archive', val), @@ -162,7 +161,7 @@ def get_account_menu(account: str) -> Gio.Menu: advanced_menuitems.append( (_('Bookmarks'), f'app.{account}-bookmarks', val)) - menu.append_submenu(_('Advanced'), make_menu(advanced_menuitems)) + menu.append_submenu(_('Advanced'), GajimMenu.from_list(advanced_menuitems)) return menu @@ -369,7 +368,7 @@ def get_conv_uri_context_menu(account: str, uri: URI) -> Optional[Gtk.Menu]: return menu -def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: +def get_roster_menu(account: str, jid: str, gateway: bool = False) -> GajimMenu: block_label = _('Block…') if jid_is_blocked(account, jid): @@ -388,10 +387,10 @@ def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: menuitems.insert( 1, (_('Modify Gateway…'), f'win.modify-gateway-{account}', value)) - return make_menu(menuitems) + return GajimMenu.from_list(menuitems) -def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: +def get_subscription_menu(account: str, jid: JID) -> GajimMenu: params = AddChatActionParams(account=account, jid=jid, type='contact', @@ -405,16 +404,16 @@ def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: (_('Deny'), f'win.subscription-deny-{account}', value), ] - return make_menu(menuitems) + return GajimMenu.from_list(menuitems) -def get_start_chat_row_menu(account: str, jid: JID) -> Gio.Menu: +def get_start_chat_row_menu(account: str, jid: JID) -> GajimMenu: params = ForgetGroupchatActionParams(account=account, jid=jid) menuitems: MenuItemListT = [ (_('Forget this Group Chat'), 'app.forget-groupchat', params), ] - return make_menu(menuitems) + return GajimMenu.from_list(menuitems) def get_chat_list_row_menu(workspace_id: str, @@ -434,12 +433,7 @@ def get_chat_list_row_menu(workspace_id: str, workspaces = app.settings.get_workspaces() if len(workspaces) > 1: submenu = menu.add_submenu(_('Move Chat')) - - params = MoveChatToWorkspaceAP(workspace_id=workspace_id, - account=account, - jid=jid) - - for name in get_workspace_names(workspace_id, account, jid): + for name, params in get_workspace_params(workspace_id, account, jid): submenu.add_item(name, 'win.move-chat-to-workspace', params) if can_add_to_roster(contact): @@ -452,83 +446,87 @@ def get_chat_list_row_menu(workspace_id: str, return menu -def get_workspace_names(current_workspace_id: str, - account: str, - jid: JID - ) -> Iterator[str]: +def get_workspace_params(current_workspace_id: str, + account: str, + jid: JID + ) -> Iterator[tuple[str, MoveChatToWorkspaceAP]]: for workspace_id in app.settings.get_workspaces(): if workspace_id == current_workspace_id: continue - yield app.settings.get_workspace_setting(workspace_id, 'name') + name = app.settings.get_workspace_setting(workspace_id, 'name') + params = MoveChatToWorkspaceAP(workspace_id=workspace_id, + account=account, + jid=jid) + yield name, params def get_groupchat_admin_menu(control_id: str, self_contact: types.GroupchatParticipant, - contact: types.GroupchatParticipant) -> Gio.Menu: + contact: types.GroupchatParticipant) -> GajimMenu: - adminitems: MenuItemListT = [] + menu = GajimMenu() action = f'win.change-affiliation-{control_id}' if is_affiliation_change_allowed(self_contact, contact, 'owner'): value = f'["{contact.real_jid}", "owner"]' - adminitems.append((_('Make Owner'), action, value)) + menu.add_item(_('Make Owner'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'admin'): value = f'["{contact.real_jid}", "admin"]' - adminitems.append((_('Make Admin'), action, value)) + menu.add_item(_('Make Admin'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'member'): value = f'["{contact.real_jid}", "member"]' - adminitems.append((_('Make Member'), action, value)) + menu.add_item(_('Make Member'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'none'): value = f'["{contact.real_jid}", "none"]' - adminitems.append((_('Revoke Member'), action, value)) + menu.add_item(_('Revoke Member'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'outcast'): value = f'"{contact.real_jid}"' - adminitems.append((_('Ban…'), f'win.ban-{control_id}', value)) + menu.add_item(_('Ban…'), f'win.ban-{control_id}', value) - if not adminitems: - adminitems.append((_('Not Available'), 'dummy', None)) + if not menu.get_n_items(): + menu.add_item(_('Not Available'), 'dummy', None) - return make_menu(adminitems) + return menu def get_groupchat_mod_menu(control_id: str, self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant - ) -> Gio.Menu: + ) -> GajimMenu: - moditems: MenuItemListT = [] + menu = GajimMenu() if is_role_change_allowed(self_contact, contact): value = f'"{contact.name}"' - moditems.append((_('Kick…'), f'win.kick-{control_id}', value)) + menu.add_item(_('Kick…'), f'win.kick-{control_id}', value) action = f'win.change-role-{control_id}' if is_role_change_allowed(self_contact, contact): if contact.role.is_visitor: value = f'["{contact.name}", "participant"]' - moditems.append((_('Grant Voice'), action, value)) + menu.add_item(_('Grant Voice'), action, value) else: value = f'["{contact.name}", "visitor"]' - moditems.append((_('Revoke Voice'), action, value)) + menu.add_item(_('Revoke Voice'), action, value) - if not moditems: - moditems.append((_('Not Available'), 'dummy', None)) + if not menu.get_n_items(): + menu.add_item(_('Not Available'), 'dummy', None) - return make_menu(moditems) + return menu def get_groupchat_roster_menu(account: str, control_id: str, self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant - ) -> Gio.Menu: + ) -> GajimMenu: value = f'"{contact.name}"' @@ -538,7 +536,7 @@ def get_groupchat_roster_menu(account: str, ] real_contact = contact.get_real_contact() - if real_contact is not None and not real_contact.is_in_roster: + if real_contact is not None and can_add_to_roster(real_contact): value = f'["{account}", "{real_contact.jid}"]' action = f'app.{account}-add-contact' general_items.insert(1, (_('Add to Contact List…'), action, value)) @@ -546,7 +544,7 @@ def get_groupchat_roster_menu(account: str, mod_menu = get_groupchat_mod_menu(control_id, self_contact, contact) admin_menu = get_groupchat_admin_menu(control_id, self_contact, contact) - menu = make_menu(general_items) + menu = GajimMenu.from_list(general_items) menu.append_section(_('Moderation'), mod_menu) menu.append_section(_('Administration'), admin_menu) return menu ===================================== gajim/gtk/util.py ===================================== @@ -919,18 +919,18 @@ def make_menu_item(label: str, return item -def make_menu(menuitems: MenuItemListT) -> Gio.Menu: - menu = Gio.Menu() - for item in menuitems: - menuitem = make_menu_item(*item) - menu.append_item(menuitem) - return menu - - class GajimMenu(Gio.Menu): def __init__(self): Gio.Menu.__init__(self) + @classmethod + def from_list(cls, menulist: MenuItemListT) -> GajimMenu: + menu = cls() + for item in menulist: + menuitem = make_menu_item(*item) + menu.append_item(menuitem) + return menu + def add_item(self, label: str, action: str, value: MenuValueT) -> None: item = make_menu_item(label, action, value) self.append_item(item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e1e2d09e3106f7bcfc37de1fafc37d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e1e2d09e3106f7bcfc37de1fafc37d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Contacts: Add is_self property
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: cdfe617b by lovetox at 2022-03-13T22:02:21+01:00 Contacts: Add is_self property - - - - - 76812816 by lovetox at 2022-03-13T22:02:21+01:00 Contacts: Add helper method can_add_to_roster() - - - - - feac903d by lovetox at 2022-03-13T22:02:21+01:00 Menus: Simplify add to roster check - - - - - a6ffdd5f by lovetox at 2022-03-13T22:02:21+01:00 Menus: Simplify unread check - - - - - 389feb73 by lovetox at 2022-03-13T22:02:21+01:00 Add GajimMenu - - - - - 8e1e2d09 by lovetox at 2022-03-13T22:02:21+01:00 Menus: Refactor ChatList menu - Use GajimMenu - Simplify code - - - - - 5 changed files: - gajim/common/modules/contacts.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/structs.py - gajim/gtk/util.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -246,6 +246,11 @@ def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') + @property + def is_self(self): + own_jid = app.get_client(self._account).get_own_jid().new_as_bare() + return own_jid == self.jid + def supports(self, requested_feature: str) -> bool: for resource in self.iter_resources(): if resource.supports(requested_feature): @@ -780,3 +785,18 @@ def update_presence(self, def update_avatar(self, *args: Any) -> None: app.app.avatar_storage.invalidate_cache(self._jid) self.notify('user-avatar-update') + + +def can_add_to_roster(contact: Union[BareContact, + GroupchatContact, + GroupchatParticipant]) -> bool: + + if isinstance(contact, GroupchatContact): + return False + + if isinstance(contact, GroupchatParticipant): + return contact.real_jid is not None + + if contact.is_self: + return False + return not contact.is_in_roster ===================================== gajim/gtk/main.py ===================================== @@ -57,6 +57,7 @@ from .util import set_urgency_hint from .const import UNLOAD_CHAT_TIME from .structs import AddChatActionParams +from .structs import AddToRosterParams log = logging.getLogger('gajim.gui.main') @@ -275,7 +276,7 @@ def _add_actions(self) -> None: ('activate-workspace', 's', self._activate_workspace), ('add-chat', 'a{sv}', self._add_chat), ('add-group-chat', 'as', self._add_group_chat), - ('add-to-roster', 'as', self._add_to_roster), + ('add-to-roster', 'a{sv}', self._add_to_roster), ] for action in actions: @@ -599,8 +600,8 @@ def select_chat_number(self, number: int) -> None: def _add_to_roster(_action: Gio.SimpleAction, param: GLib.Variant) -> None: - _workspace, account, jid = param.unpack() - open_window('AddContact', account=account, jid=JID.from_string(jid)) + params = AddToRosterParams.from_variant(param) + open_window('AddContact', account=params.account, jid=params.jid) def show_app_page(self) -> None: self._account_side_bar.unselect_all() ===================================== gajim/gtk/menus.py ===================================== @@ -17,6 +17,7 @@ from __future__ import annotations from typing import Any +from typing import Iterator from typing import cast from typing import Optional from typing import Union @@ -41,13 +42,15 @@ from gajim.common.const import URIAction from gajim.common.structs import URI from gajim.common.structs import VariantMixin +from gajim.common.modules.contacts import can_add_to_roster from gajim.gui.structs import AddChatActionParams +from gajim.gui.structs import AddToRosterParams from gajim.gui.structs import ForgetGroupchatActionParams from gajim.gui.structs import MoveChatToWorkspaceAP from gajim.gui.structs import RemoveHistoryActionParams -from gajim.gui.util import make_menu_item from gajim.gui.util import make_menu +from gajim.gui.util import GajimMenu from gajim.gui.const import ControlType @@ -85,11 +88,9 @@ def get_singlechat_menu(control_id: str, ('win.search-history', _('Search…')) ] - if not contact.is_in_roster: - if (type_.is_chat or - (type_.is_privatechat and contact.real_jid is not None)): - singlechat_menu.append( - ('win.add-to-roster-', _('Add to Contact List…'))) + if can_add_to_roster(contact): + singlechat_menu.append(('win.add-to-roster-', + _('Add to Contact List…'))) def build_menu(preset: list[tuple[str, Any]]): menu = Gio.Menu() @@ -420,71 +421,46 @@ def get_chat_list_row_menu(workspace_id: str, account: str, jid: JID, pinned: bool - ) -> Gio.Menu: + ) -> GajimMenu: client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') + menu = GajimMenu() - menu_items: list[Any] = [ - ('toggle-chat-pinned', toggle_label), - ] + toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') + menu.add_item(toggle_label, 'win.toggle-chat-pinned', None) workspaces = app.settings.get_workspaces() if len(workspaces) > 1: - menu_items.append((_('Move Chat'), [])) - - is_self_contact = contact.jid.bare == client.get_own_jid().bare - if (not contact.is_groupchat and not contact.is_in_roster and - not is_self_contact): - if contact.is_pm_contact: - if contact.real_jid is not None: - menu_items.append(('add-to-roster', _('Add to Contact List…'))) - else: - menu_items.append(('add-to-roster', _('Add to Contact List…'))) + submenu = menu.add_submenu(_('Move Chat')) - unread_count = app.window.get_chat_unread_count( - account, jid, include_silent=True) - if unread_count is not None and unread_count > 0: - menu_items.append(('mark-as-read', _('Mark as read'))) + params = MoveChatToWorkspaceAP(workspace_id=workspace_id, + account=account, + jid=jid) - menu = Gio.Menu() - for item in menu_items: - if isinstance(item[1], str): - action, label = item - action = f'win.{action}' - menuitem = Gio.MenuItem.new(label, action) - variant_list = GLib.Variant( - 'as', [workspace_id, account, str(jid)]) - menuitem.set_action_and_target_value(action, variant_list) - menu.append_item(menuitem) - else: - # This is a submenu - if len(workspaces) > 1: - submenu = build_workspaces_submenu( - workspace_id, account, jid) - menu.append_submenu(item[0], submenu) + for name in get_workspace_names(workspace_id, account, jid): + submenu.add_item(name, 'win.move-chat-to-workspace', params) + + if can_add_to_roster(contact): + params = AddToRosterParams(account=account, jid=jid) + menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) + + if app.window.get_chat_unread_count(account, jid, include_silent=True): + menu.add_item(_('Mark as read'), 'win.mark-as-read', None) return menu -def build_workspaces_submenu(current_workspace_id: str, - account: str, - jid: JID - ) -> Gio.Menu: - submenu = Gio.Menu() +def get_workspace_names(current_workspace_id: str, + account: str, + jid: JID + ) -> Iterator[str]: + for workspace_id in app.settings.get_workspaces(): if workspace_id == current_workspace_id: continue - name = app.settings.get_workspace_setting(workspace_id, 'name') - params = MoveChatToWorkspaceAP(workspace_id=workspace_id, - account=account, - jid=jid) - - item = make_menu_item(name, 'win.move-chat-to-workspace', params) - submenu.append_item(item) - return submenu + yield app.settings.get_workspace_setting(workspace_id, 'name') def get_groupchat_admin_menu(control_id: str, ===================================== gajim/gtk/structs.py ===================================== @@ -66,6 +66,12 @@ class MoveChatToWorkspaceAP(VariantMixin): jid: JID +@dataclass +class AddToRosterParams(VariantMixin): + account: str + jid: JID + + def get_params_class(func: Callable[..., Any]) -> Any: module = sys.modules[__name__] params = inspect.signature(func).parameters ===================================== gajim/gtk/util.py ===================================== @@ -925,3 +925,17 @@ def make_menu(menuitems: MenuItemListT) -> Gio.Menu: menuitem = make_menu_item(*item) menu.append_item(menuitem) return menu + + +class GajimMenu(Gio.Menu): + def __init__(self): + Gio.Menu.__init__(self) + + def add_item(self, label: str, action: str, value: MenuValueT) -> None: + item = make_menu_item(label, action, value) + self.append_item(item) + + def add_submenu(self, label: str) -> GajimMenu: + menu = GajimMenu() + self.append_submenu(label, menu) + return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/216180ece97a8d4d14e95fb291fed61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/216180ece97a8d4d14e95fb291fed61… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2022