Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Groupchat: Remove subject page
by Daniel Brötzmann (＠wurstsalat) 27 Jan '22

27 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b6f66995 by wurstsalat at 2022-01-27T20:05:32+01:00 Groupchat: Remove subject page - - - - - 2 changed files: - gajim/data/gui/groupchat_control.ui - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -85,30 +85,6 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <child> - <object class="GtkButton" id="manage_change_subject_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_change_subject" swapped="no"/> - <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">Change Subject…</property> - </object> - </child> - <style> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> <child> <object class="GtkButton" id="manage_advanced_button"> <property name="visible">True</property> @@ -771,121 +747,7 @@ </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Change Subject</property> - <property name="xalign">0</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="subject_change_button"> - <property name="label" translatable="yes">Ch_ange</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">True</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_subject_change_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> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="width-request">450</property> - <property name="height-request">250</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkTextView" id="subject_textview"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word-char</property> - <property name="left-margin">3</property> - <property name="right-margin">3</property> - <property name="top-margin">3</property> - <property name="bottom-margin">3</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">subject</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> @@ -1747,9 +1609,6 @@ <property name="position">9</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -1826,7 +1685,7 @@ </object> <packing> <property name="name">invite</property> - <property name="position">11</property> + <property name="position">10</property> </packing> </child> <child> @@ -2040,7 +1899,7 @@ </object> <packing> <property name="name">muc-manage</property> - <property name="position">12</property> + <property name="position">11</property> </packing> </child> <child> @@ -2149,7 +2008,7 @@ </object> <packing> <property name="name">avatar-selector</property> - <property name="position">13</property> + <property name="position">12</property> </packing> </child> </object> ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -362,9 +362,6 @@ def update_actions(self, *args: Any) -> None: contact.affiliation.is_owner): self.xml.avatar_select_button.show() - self.xml.manage_change_subject_button.set_sensitive( - joined and self._is_subject_change_allowed()) - self.xml.manage_advanced_button.set_sensitive( joined and contact.affiliation in (Affiliation.ADMIN, Affiliation.OWNER)) @@ -406,18 +403,6 @@ def is_irc(self) -> bool: return False return self.disco_info.is_irc - def _is_subject_change_allowed(self) -> Optional[Any]: - contact = self.contact.get_self() - if contact is None: - return False - - if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): - return True - - if self.disco_info is None: - return False - return self.disco_info.muc_subjectmod or False - def _show_page(self, name: str) -> None: transition = Gtk.StackTransitionType.SLIDE_DOWN if name == 'groupchat': @@ -1559,8 +1544,10 @@ def delegate_action(self, action: str) -> int: return Gdk.EVENT_STOP if action == 'change-subject': - control_action = f'{action}-{self.control_id}' - app.window.lookup_action(control_action).activate() + open_window('GroupchatDetails', + contact=self.contact, + subject=self._subject_text, + page='subject') return Gdk.EVENT_STOP if action == 'show-contact-info': @@ -1578,8 +1565,6 @@ def focus(self) -> None: self.xml.password_entry.grab_focus_without_selecting() elif page_name == 'nickname': self.xml.nickname_entry.grab_focus_without_selecting() - elif page_name == 'subject': - self.xml.subject_textview.grab_focus() elif page_name == 'captcha': self._captcha_request.focus_first_entry() elif page_name == 'invite': @@ -1662,21 +1647,6 @@ def _on_manage_save_clicked(self, _button: Gtk.Button) -> None: self._show_page('groupchat') - def _on_change_subject(self, _button: Gtk.Button) -> None: - if self._get_current_page() not in ('groupchat', 'muc-manage'): - return - self.xml.subject_textview.get_buffer().set_text(self._subject_text) - self.xml.subject_textview.grab_focus() - self._show_page('subject') - - def _on_subject_change_clicked(self, _button: Gtk.Button) -> None: - buffer_ = self.xml.subject_textview.get_buffer() - subject = buffer_.get_text(buffer_.get_start_iter(), - buffer_.get_end_iter(), - False) - self._client.get_module('MUC').set_subject(self.room_jid, subject) - self._show_page('groupchat') - def _on_password_set_clicked(self, _button: Gtk.Button) -> None: password = self.xml.password_entry.get_text() self._client.get_module('MUC').set_password(self.room_jid, password) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b6f66995b3036725392c8dadd9398d52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b6f66995b3036725392c8dadd9398d52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Certificate: Improve layout
by Daniel Brötzmann (＠wurstsalat) 27 Jan '22

27 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8d1af22d by wurstsalat at 2022-01-27T17:29:09+01:00 Certificate: Improve layout - - - - - 6427297f by wurstsalat at 2022-01-27T17:29:42+01:00 ServerInfo: Make IP selectable - - - - - c5a93f29 by wurstsalat at 2022-01-27T19:47:22+01:00 GroupchatDetails: Add Subject - - - - - 6 changed files: - gajim/data/gui/certificate.ui - gajim/data/gui/groupchat_details.ui - gajim/data/gui/server_info.ui - gajim/gtk/builder.pyi - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/data/gui/certificate.ui ===================================== @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="certificate_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> - <property name="border_width">18</property> + <property name="hexpand">True</property> + <property name="border-width">18</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> <property name="spacing">12</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">application-certificate-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">application-certificate-symbolic</property> <property name="icon_size">6</property> </object> <packing> @@ -31,7 +32,7 @@ <child> <object class="GtkLabel" id="label_cert_for_account"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="justify">center</property> <style> <class name="large-header"/> @@ -51,16 +52,17 @@ </packing> </child> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">20</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="margin-top">20</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="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Common Name (CN)</property> @@ -69,27 +71,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="data_it_common_name"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</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="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Organization (O)</property> @@ -98,27 +100,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="data_it_organization"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <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="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Organizational Unit (OU)</property> @@ -127,27 +129,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="data_it_organizational_unit"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <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="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Serial Number</property> @@ -156,18 +158,18 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="data_it_serial_number"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> + <property name="wrap-mode">word-char</property> <property name="selectable">True</property> <property name="xalign">0</property> <attributes> @@ -175,14 +177,14 @@ </attributes> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Common Name (CN)</property> @@ -191,27 +193,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="data_ib_common_name"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left-attach">1</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Organization (O)</property> @@ -220,27 +222,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left-attach">0</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkLabel" id="data_ib_organization"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="left-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Organizational Unit (OU)</property> @@ -249,27 +251,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="left-attach">0</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkLabel" id="data_ib_organizational_unit"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="left-attach">1</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Issued on</property> @@ -278,27 +280,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">10</property> + <property name="left-attach">0</property> + <property name="top-attach">10</property> </packing> </child> <child> <object class="GtkLabel" id="data_issued_on"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">10</property> + <property name="left-attach">1</property> + <property name="top-attach">10</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Expires on</property> @@ -307,27 +309,27 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">11</property> + <property name="left-attach">0</property> + <property name="top-attach">11</property> </packing> </child> <child> <object class="GtkLabel" id="data_expires_on"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">11</property> + <property name="left-attach">1</property> + <property name="top-attach">11</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">SHA-1</property> @@ -336,96 +338,96 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">13</property> + <property name="left-attach">0</property> + <property name="top-attach">13</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">6</property> + <property name="can-focus">False</property> + <property name="margin-top">6</property> <property name="label" translatable="yes">Issued to</property> <style> <class name="bold"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel"> <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="margin-top">12</property> <property name="label" translatable="yes">Issued by</property> <style> <class name="bold"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel"> <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="margin-top">12</property> <property name="label" translatable="yes">Validity</property> <style> <class name="bold"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> + <property name="left-attach">0</property> + <property name="top-attach">9</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel"> <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="margin-top">12</property> <property name="label" translatable="yes">Fingerprints</property> <style> <class name="bold"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">12</property> + <property name="left-attach">0</property> + <property name="top-attach">12</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel" id="data_sha1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="wrap">True</property> - <property name="wrap_mode">char</property> + <property name="wrap-mode">char</property> <property name="selectable">True</property> <attributes> <attribute name="font-desc" value="Monospace 8"/> </attributes> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">13</property> + <property name="left-attach">1</property> + <property name="top-attach">13</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">SHA-256</property> @@ -434,53 +436,101 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">14</property> + <property name="left-attach">0</property> + <property name="top-attach">14</property> </packing> </child> <child> <object class="GtkLabel" id="data_sha256"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> <property name="wrap">True</property> - <property name="wrap_mode">char</property> + <property name="wrap-mode">char</property> <property name="selectable">True</property> <attributes> <attribute name="font-desc" value="Monospace 8"/> </attributes> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">14</property> + <property name="left-attach">1</property> + <property name="top-attach">14</property> </packing> </child> <child> <object class="GtkButton" id="copy_cert_info_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Copy Certificate Information</property> + <property name="can-focus">True</property> + <property name="has-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Copy Certificate Information</property> <property name="halign">end</property> <signal name="clicked" handler="_on_copy_cert_info_button_clicked" swapped="no"/> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-copy-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-copy-symbolic</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">15</property> + <property name="left-attach">1</property> + <property name="top-attach">15</property> </packing> </child> <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -2,6 +2,9 @@  <interface> <requires lib="gtk+" version="3.24"/> + <object class="GtkTextBuffer" id="subject_buffer"> + <signal name="changed" handler="_on_subject_text_changed" swapped="no"/> + </object>  <object class="GtkGrid" id="main_grid"> <property name="visible">True</property> @@ -128,6 +131,68 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox" id="subject_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTextView" id="subject_textview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="wrap-mode">word-char</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> + <property name="buffer">subject_buffer</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="subject_change_button"> + <property name="label" translatable="yes">Ch_ange</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">end</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_subject_change_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + <packing> + <property name="name">subject</property> + <property name="title" translatable="yes">Subject</property> + <property name="icon-name">view-pin-symbolic</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="affiliation_box"> <property name="visible">True</property> @@ -144,7 +209,7 @@ <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -163,7 +228,7 @@ <property name="name">outcasts</property> <property name="title" translatable="yes">Outcasts</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <style> ===================================== gajim/data/gui/server_info.ui ===================================== @@ -146,6 +146,9 @@ <property name="can-focus">False</property> <property name="label" translatable="yes">Server</property> </object> + <packing> + <property name="tab-fill">False</property> + </packing> </child> <child>  @@ -328,6 +331,7 @@ <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">start</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -363,6 +367,7 @@ </object> <packing> <property name="position">1</property> + <property name="tab-fill">False</property> </packing> </child> <child> @@ -399,6 +404,7 @@ </object> <packing> <property name="position">2</property> + <property name="tab-fill">False</property> </packing> </child> <child> @@ -470,6 +476,7 @@ </object> <packing> <property name="position">3</property> + <property name="tab-fill">False</property> </packing> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -500,6 +500,9 @@ class GroupchatDetailsBuilder(Builder): settings_box: Gtk.Box affiliation_box: Gtk.Box outcasts_box: Gtk.Box + subject_box: Gtk.Box + subject_textview: Gtk.TextView + subject_change_button: Gtk.Button class GroupchatInfoScrolledBuilder(Builder): ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -437,7 +437,9 @@ def _on_details(self, _action: Gio.SimpleAction, _param: Optional[GLib.Variant] ) -> None: - open_window('GroupchatDetails', contact=self.contact) + open_window('GroupchatDetails', + contact=self.contact, + subject=self._subject_text) def _on_groupchat_manage(self, _action: Gio.SimpleAction, ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -20,6 +20,9 @@ from gi.repository import GObject from gi.repository import Gtk +from nbxmpp.const import Affiliation +from nbxmpp.structs import MucSubject + from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ @@ -36,6 +39,7 @@ class GroupchatDetails(Gtk.ApplicationWindow): def __init__(self, contact: GroupchatContact, + subject: str, page: Optional[str] = None ) -> None: Gtk.ApplicationWindow.__init__(self) @@ -49,7 +53,10 @@ def __init__(self, self.account = contact.account self._client = app.get_client(contact.account) + self._subject_text = subject self._contact = contact + self._contact.connect( + 'room-subject', self._on_room_subject) self._ui = get_builder('groupchat_details.ui') self._ui.connect_signals(self) @@ -66,6 +73,7 @@ def __init__(self, self._add_affiliations() self._add_outcasts() + self._prepare_subject() self._load_avatar() self._ui.name_entry.set_text(contact.name) @@ -77,6 +85,10 @@ def __init__(self, self.show_all() + @property + def disco_info(self): + return app.storage.cache.get_last_disco_info(self._contact.jid) + def _on_stack_child_changed(self, _widget: Gtk.Stack, _pspec: GObject.ParamSpec) -> None: @@ -99,6 +111,50 @@ def _load_avatar(self) -> None: surface = self._contact.get_avatar(AvatarSize.VCARD_HEADER, scale) self._ui.header_image.set_from_surface(surface) + def _prepare_subject(self) -> None: + self._ui.subject_textview.get_buffer().set_text(self._subject_text) + + joined = self._contact.is_joined + change_allowed = self._is_subject_change_allowed() + self._ui.subject_textview.set_sensitive(joined and change_allowed) + + def _is_subject_change_allowed(self) -> bool: + contact = self._contact.get_self() + if contact is None: + return False + + if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): + return True + + if self.disco_info is None: + return False + return self.disco_info.muc_subjectmod or False + + def _on_subject_text_changed(self, buffer_: Gtk.TextBuffer) -> None: + text = buffer_.get_text(buffer_.get_start_iter(), + buffer_.get_end_iter(), + False) + self._ui.subject_change_button.set_sensitive( + text != self._subject_text) + + def _on_subject_change_clicked(self, _button: Gtk.Button) -> None: + buffer_ = self._ui.subject_textview.get_buffer() + subject = buffer_.get_text(buffer_.get_start_iter(), + buffer_.get_end_iter(), + False) + self._client.get_module('MUC').set_subject(self._contact.jid, subject) + + def _on_room_subject(self, + _contact: GroupchatContact, + _signal_name: str, + subject: Optional[MucSubject] + ) -> None: + if subject is None: + return + + self._subject_text = subject.text + self._ui.subject_textview.get_buffer().set_text(subject.text) + def _add_groupchat_info(self) -> None: groupchat_info = GroupChatInfoScrolled(self._contact.account, width=600) groupchat_info.set_halign(Gtk.Align.FILL) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bc2c5ce08a7750897c4b1778aa32cf4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bc2c5ce08a7750897c4b1778aa32cf4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix notifications on Windows
by Daniel Brötzmann (＠wurstsalat) 27 Jan '22

27 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bc2c5ce0 by wurstsalat at 2022-01-27T12:28:46+01:00 Fix notifications on Windows - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -121,16 +121,16 @@ def __init__(self): def _send(self, event: events.Notification) -> None: timeout = app.settings.get('notification_timeout') self._withdraw() - self._win32_active_popup = PopupNotification(event, timeout) + self._active_notification = PopupNotification(event, timeout) def _on_popup_destroy(_widget: Gtk.Window) -> None: - self._win32_active_popup = None + self._active_notification = None - self._win32_active_popup.connect('destroy', _on_popup_destroy) + self._active_notification.connect('destroy', _on_popup_destroy) def _withdraw(self, *args: Any) -> None: - if self._win32_active_popup is not None: - self._win32_active_popup.destroy() + if self._active_notification is not None: + self._active_notification.destroy() class PopupNotification(Gtk.Window): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc2c5ce08a7750897c4b1778aa32cf47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc2c5ce08a7750897c4b1778aa32cf47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Profile: Typing
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 753fa5b9 by wurstsalat at 2022-01-26T23:57:32+01:00 Profile: Typing - - - - - 0d5ed11a by wurstsalat at 2022-01-26T23:57:32+01:00 AvatarSelector: Typing - - - - - 2 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -104,6 +104,10 @@ def __init__(self) -> None: def prepare_crop_area(self, path: str) -> None: pixbuf = self._get_pixbuf_from_path(path) + if pixbuf is None: + log.info('Could not load from path %s', path) + return + self._crop_area.set_pixbuf(pixbuf) self._load_button.hide() self._helper_label.hide() @@ -272,6 +276,7 @@ def _on_draw(self, _widget: Gtk.Widget, context: cairo.Context) -> bool: self._update_pixbufs() + assert self._pixbuf width = self._pixbuf.get_width() height = self._pixbuf.get_height() crop = self._crop_to_widget() @@ -583,6 +588,7 @@ def _on_motion_notify(self, def _update_pixbufs(self) -> None: allocation = self.get_allocation() + assert self._browse_pixbuf width = self._browse_pixbuf.get_width() height = self._browse_pixbuf.get_height() @@ -603,6 +609,9 @@ def _update_pixbufs(self) -> None: 8, dest_width, dest_height) + if self._pixbuf is None: + return + self._pixbuf.fill(0x0) self._browse_pixbuf.scale( @@ -677,10 +686,15 @@ def _update_cursor(self, x_coord: float, y_coord: float) -> None: cursor_type = Gdk.CursorType.LEFT_PTR if cursor_type is not self._current_cursor: + default_display = Gdk.Display.get_default() + if default_display is None: + return cursor = Gdk.Cursor.new_for_display( - Gdk.Display.get_default(), + default_display, cursor_type) - self.get_window().set_cursor(cursor) + window = self.get_window() + assert window + window.set_cursor(cursor) self._current_cursor = cursor_type @staticmethod @@ -735,6 +749,7 @@ def _find_range(coord: float, min_v: int, max_v: int) -> Range: def _generate_color_shifted_pixbuf(self) -> None: # pylint: disable=no-member + assert self._pixbuf surface = cairo.ImageSurface( cairo.Format.ARGB32, self._pixbuf.get_width(), ===================================== gajim/gtk/profile.py ===================================== @@ -1,3 +1,23 @@ +# +# 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 typing import cast +from typing import Any +from typing import Optional +from typing import Union + import logging from gi.repository import Gio @@ -5,10 +25,13 @@ from gi.repository import Gtk from gi.repository import GLib +import cairo + from nbxmpp.errors import StanzaError from nbxmpp.namespaces import Namespace from nbxmpp.modules.vcard4 import VCard from nbxmpp.modules.user_avatar import Avatar +from nbxmpp.task import Task from gajim.common import app from gajim.common.const import AvatarSize @@ -43,7 +66,7 @@ class ProfileWindow(Gtk.ApplicationWindow): - def __init__(self, account, *args): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -70,15 +93,15 @@ def __init__(self, account, *args): self._ui.add_entry_button.set_menu_model(menu) self._add_actions() - self._avatar_selector = None - self._current_avatar = None - self._current_vcard = None - self._avatar_nick_public = None + self._avatar_selector: Optional[AvatarSelector] = None + self._current_avatar: Optional[cairo.Surface] = None + self._current_vcard: Optional[VCard] = None + self._avatar_nick_public: Optional[bool] = None # False - no change to avatar # None - we want to delete the avatar # Avatar - upload new avatar - self._new_avatar = False + self._new_avatar: Union[None, bool, Avatar] = False self._ui.nickname_entry.set_text(app.nicks[account]) @@ -115,14 +138,14 @@ def __init__(self, account, *args): user_data=Namespace.NICK) self._ui.connect_signals(self) - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) - def _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: app.check_finalize(self) - def _on_access_model_received(self, task): + def _on_access_model_received(self, task: Task) -> None: namespace = task.get_user_data() try: @@ -142,11 +165,12 @@ def _on_access_model_received(self, task): else: self._avatar_nick_public = (self._avatar_nick_public or access_model) + assert self._avatar_nick_public self._set_avatar_nick_access_switch(self._avatar_nick_public) - def _on_vcard_received(self, task): + def _on_vcard_received(self, task: Task): try: - self._current_vcard = task.finish() + self._current_vcard = cast(VCard, task.finish()) except StanzaError as error: log.info('Error loading VCard: %s', error) self._current_vcard = VCard() @@ -159,7 +183,7 @@ def _on_vcard_received(self, task): self._ui.profile_stack.set_visible_child_name('profile') self._ui.spinner.stop() - def _load_avatar(self): + def _load_avatar(self) -> None: scale = self.get_scale_factor() self._current_avatar = self._contact.get_avatar(AvatarSize.VCARD, scale, @@ -167,24 +191,27 @@ def _load_avatar(self): self._ui.avatar_image.set_from_surface(self._current_avatar) self._ui.avatar_image.show() - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _add_actions(self): + def _add_actions(self) -> None: for action in MENU_DICT: action_name = 'add-' + action.lower() act = Gio.SimpleAction.new(action_name, None) act.connect('activate', self._on_action) self.add_action(act) - def _on_action(self, action, _param): + def _on_action(self, + action: Gio.SimpleAction, + _param: Optional[GLib.Variant] + ) -> None: name = action.get_name() key = name.split('-')[1] self._vcard_grid.add_new_property(key) GLib.idle_add(scroll_to_end, self._ui.scrolled) - def _on_edit_clicked(self, *args): + def _on_edit_clicked(self, *args: Any) -> None: self._vcard_grid.set_editable(True) self._ui.edit_button.hide() self._ui.add_entry_button.set_no_show_all(False) @@ -196,7 +223,7 @@ def _on_edit_clicked(self, *args): self._ui.nickname_entry.set_sensitive(True) self._ui.privacy_button.show() - def _on_cancel_clicked(self, _widget): + def _on_cancel_clicked(self, _button: Gtk.Button) -> None: self._vcard_grid.set_editable(False) self._ui.edit_button.show() self._ui.add_entry_button.hide() @@ -211,7 +238,7 @@ def _on_cancel_clicked(self, _widget): self._vcard_grid.set_vcard(self._current_vcard.copy()) self._new_avatar = False - def _on_save_clicked(self, _widget): + def _on_save_clicked(self, _button: Gtk.Button) -> None: self._ui.spinner.start() self._ui.profile_stack.set_visible_child_name('spinner') self._ui.add_entry_button.hide() @@ -256,7 +283,7 @@ def _on_save_clicked(self, _widget): self.account, 'name') app.nicks[self.account] = nick - def _on_set_avatar(self, task): + def _on_set_avatar(self, task: Task) -> None: try: task.finish() except StanzaError as error: @@ -278,7 +305,7 @@ def _on_set_avatar(self, task): self._new_avatar = False return - def _on_remove_avatar(self, _button): + def _on_remove_avatar(self, _button: Gtk.Button) -> None: scale = self.get_scale_factor() surface = self._contact.get_avatar(AvatarSize.VCARD, scale, @@ -289,8 +316,8 @@ def _on_remove_avatar(self, _button): self._ui.remove_avatar_button.hide() self._new_avatar = None - def _on_edit_avatar(self, button): - def _on_file_selected(path): + def _on_edit_avatar(self, button: Gtk.Button) -> None: + def _on_file_selected(path: str) -> None: if self._avatar_selector is None: self._avatar_selector = AvatarSelector() self._ui.avatar_selector_box.add(self._avatar_selector) @@ -303,10 +330,11 @@ def _on_file_selected(path): AvatarChooserDialog(_on_file_selected, transient_for=button.get_toplevel()) - def _on_cancel_update_avatar(self, _button): + def _on_cancel_update_avatar(self, _button: Gtk.Button) -> None: self._ui.profile_stack.set_visible_child_name('profile') - def _on_update_avatar(self, _button): + def _on_update_avatar(self, _button: Gtk.Button) -> None: + assert self._avatar_selector success, data, width, height = self._avatar_selector.get_avatar_bytes() if not success: self._ui.profile_stack.set_visible_child_name('profile') @@ -314,6 +342,9 @@ def _on_update_avatar(self, _button): _('Failed to generate avatar.')) return + assert data + assert height + assert width sha = app.app.avatar_storage.save_avatar(data) if sha is None: self._ui.profile_stack.set_visible_child_name('profile') @@ -327,29 +358,31 @@ def _on_update_avatar(self, _button): scale = self.get_scale_factor() surface = app.app.avatar_storage.surface_from_filename( sha, AvatarSize.VCARD, scale) + if surface is None: + return self._ui.avatar_image.set_from_surface(clip_circle(surface)) self._ui.remove_avatar_button.show() self._ui.profile_stack.set_visible_child_name('profile') - def _set_vcard_access_switch(self, state): + def _set_vcard_access_switch(self, state: bool) -> None: self._ui.vcard_access.set_active(state) self._ui.vcard_access_label.set_text( _('Everyone') if state else _('Contacts')) - def _set_avatar_nick_access_switch(self, state): + def _set_avatar_nick_access_switch(self, state: bool) -> None: self._ui.avatar_nick_access.set_active(state) self._ui.avatar_nick_access_label.set_text( _('Everyone') if state else _('Contacts')) - def _access_switch_toggled(self, *args): + def _access_switch_toggled(self, *args: Any) -> None: state = self._ui.vcard_access.get_active() self._set_vcard_access_switch(state) state = self._ui.avatar_nick_access.get_active() self._set_avatar_nick_access_switch(state) - def _on_save_finished(self, task): + def _on_save_finished(self, task: Task) -> None: try: task.finish() except StanzaError as err: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/179380290fdc81003c95f024e6f7777… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/179380290fdc81003c95f024e6f7777… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageLabel: Don’t allow to focus label
by Philipp Hörist (＠lovetox) 26 Jan '22

26 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17938029 by lovetox at 2022-01-26T23:46:54+01:00 MessageLabel: Don’t allow to focus label This removes the outline around links - - - - - 1 changed file: - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -80,6 +80,7 @@ def __init__(self, account: str, selectable: bool) -> None: self.set_xalign(0) self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) self.set_track_visited_links(False) + self.set_can_focus(False) self._account = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/179380290fdc81003c95f024e6f77774… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/179380290fdc81003c95f024e6f77774… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatDetails: Add GroupchatOutcasts Page
by Philipp Hörist (＠lovetox) 26 Jan '22

26 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 56aa0693 by lovetox at 2022-01-26T22:17:37+01:00 GroupchatDetails: Add GroupchatOutcasts Page - - - - - 6 changed files: - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/groupchat_outcast.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_details.py - + gajim/gtk/groupchat_outcasts.py - pyrightconfig.json Changes: ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -147,6 +147,25 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkBox" id="outcasts_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + <packing> + <property name="name">outcasts</property> + <property name="title" translatable="yes">Outcasts</property> + <property name="icon-name">system-users-symbolic</property> + <property name="position">3</property> + </packing> + </child> <style> <class name="stack-border"/> </style> ===================================== gajim/data/gui/groupchat_outcast.ui ===================================== @@ -0,0 +1,266 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkPopover" id="info_popover"> + <property name="can-focus">False</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes"><b>XMPP Address</b> +&lt;user@domain/resource&gt; (only that resource matches) +&lt;user@domain&gt; (any resource matches) +&lt;domain/resource&gt; (only that resource matches) +&lt;domain&gt; (the domain itself matches, as does any user@domain or domain/resource) +</property> + <property name="use-markup">True</property> + <style> + <class name="padding-6"/> + </style> + </object> + </child> + </object> + <object class="GtkListStore" id="outcast_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> + </columns> + </object> + <object class="GtkBox" id="main_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="outcast_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTreeView" id="outcast_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="model">outcast_store</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> + <property name="enable-grid-lines">horizontal</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"> + <property name="mode">multiple</property> + <signal name="changed" handler="_on_selection_changed" swapped="no"/> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">fixed</property> + <property name="min-width">150</property> + <property name="title">XMPP Address</property> + <property name="expand">True</property> + <property name="clickable">True</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">0</property> + <child> + <object class="GtkCellRendererText"> + <property name="ellipsize">end</property> + <property name="placeholder-text">user(a)example.org</property> + <signal name="edited" handler="_on_jid_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">2</attribute> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">fixed</property> + <property name="min-width">120</property> + <property name="title" translatable="yes">Reason</property> + <property name="clickable">True</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">1</property> + <child> + <object class="GtkCellRendererText"> + <property name="placeholder-text">Spam</property> + <signal name="edited" handler="_on_reason_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">2</attribute> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="button_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox" id="add_remove_button_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + <property name="vexpand">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Only Admins and Owners can modify the affiliation</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_add" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Only Admins and Owners can modify the affiliation</property> + <signal name="clicked" handler="_on_remove" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-remove-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="info_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="popover">info_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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</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="spacing">6</property> + <child> + <object class="GtkImage" id="status_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinner" id="spinner"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="apply_button"> + <property name="label">_Apply</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="use-underline">True</property> + <signal name="clicked" handler="_on_apply" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -499,6 +499,7 @@ class GroupchatDetailsBuilder(Builder): info_box: Gtk.Box settings_box: Gtk.Box affiliation_box: Gtk.Box + outcasts_box: Gtk.Box class GroupchatInfoScrolledBuilder(Builder): @@ -541,6 +542,22 @@ class GroupchatNickChooserBuilder(Builder): apply_button: Gtk.Button +class GroupchatOutcastBuilder(Builder): + info_popover: Gtk.Popover + outcast_store: Gtk.ListStore + main_box: Gtk.Box + outcast_scrolled: Gtk.ScrolledWindow + outcast_treeview: Gtk.TreeView + button_box: Gtk.Box + add_remove_button_box: Gtk.Box + add_button: Gtk.Button + remove_button: Gtk.Button + info_button: Gtk.MenuButton + status_image: Gtk.Image + spinner: Gtk.Spinner + apply_button: Gtk.Button + + class GroupchatRosterBuilder(Builder): participant_store: Gtk.TreeStore roster_treeview: Gtk.TreeView @@ -808,7 +825,6 @@ class ServerInfoBuilder(Builder): no_addresses_label: Gtk.Label connection_type: Gtk.Label proxy_type: Gtk.Label - cert_button: Gtk.Button proxy_host: Gtk.Label domain_label: Gtk.Label dns_label: Gtk.Label @@ -1020,6 +1036,8 @@ def get_builder(file_name: Literal['groupchat_inviter.ui'], widgets: list[str] = @overload def get_builder(file_name: Literal['groupchat_nick_chooser.ui'], widgets: list[str] = ...) -> GroupchatNickChooserBuilder: ... @overload +def get_builder(file_name: Literal['groupchat_outcast.ui'], widgets: list[str] = ...) -> GroupchatOutcastBuilder: ... +@overload def get_builder(file_name: Literal['groupchat_roster.ui'], widgets: list[str] = ...) -> GroupchatRosterBuilder: ... @overload def get_builder(file_name: Literal['groupchat_roster_tooltip.ui'], widgets: list[str] = ...) -> GroupchatRosterTooltipBuilder: ... ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -25,6 +25,7 @@ from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact from gajim.gtk.groupchat_affiliation import GroupchatAffiliation +from gajim.gtk.groupchat_outcasts import GroupchatOutcasts from .builder import get_builder from .groupchat_info import GroupChatInfoScrolled @@ -63,6 +64,7 @@ def __init__(self, self._add_groupchat_info() self._add_groupchat_settings() self._add_affiliations() + self._add_outcasts() self._load_avatar() self._ui.name_entry.set_text(contact.name) @@ -120,6 +122,10 @@ def _add_affiliations(self) -> None: affiliations = GroupchatAffiliation(self._client, self._contact) self._ui.affiliation_box.add(affiliations) + def _add_outcasts(self) -> None: + affiliations = GroupchatOutcasts(self._client, self._contact) + self._ui.outcasts_box.add(affiliations) + def _on_key_press(self, _widget: GroupchatDetails, event: Gdk.EventKey) -> None: ===================================== gajim/gtk/groupchat_outcasts.py ===================================== @@ -0,0 +1,259 @@ +# 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 __future__ import annotations + +from typing import NamedTuple +from typing import Optional +from typing import cast + +import logging +from enum import IntEnum + +from gi.repository import Gtk +from nbxmpp.errors import StanzaError +from nbxmpp.structs import AffiliationResult +from nbxmpp.task import Task + +from gajim.common.client import Client +from gajim.common.i18n import _ +from gajim.common.modules.contacts import GroupchatContact + +from gajim.gui.builder import get_builder +from gajim.gui.dialogs import ErrorDialog + + +log = logging.getLogger('gajim.gui.groupchat_outcasts') + + +class OutcastRow(NamedTuple): + jid: str + reason: Optional[str] + + +class Column(IntEnum): + JID = 0 + REASON = 1 + + +class GroupchatOutcasts(Gtk.Box): + def __init__(self, client: Client, contact: GroupchatContact) -> None: + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + + self._client = client + self._contact = contact + self._current_rows: set[OutcastRow] = set() + + self_contact = contact.get_self() + assert self_contact is not None + self._own_affiliation = self_contact.affiliation.value + + self._ui = get_builder('groupchat_outcast.ui') + + self._treeview = self._ui.outcast_treeview + self._store = self._ui.outcast_store + + self.add(self._ui.main_box) + + if self._own_affiliation in ('admin', 'owner'): + self._ui.add_button.set_sensitive(True) + self._ui.add_button.set_tooltip_text('') + + self._ui.connect_signals(self) + + self._client.get_module('MUC').get_affiliation( + self._contact.jid, + 'outcast', + callback=self._on_outcasts_received) + + def _on_apply(self, _button: Gtk.Button) -> None: + self._begin_progress() + self._set_outcasts() + + def _begin_progress(self) -> None: + self._ui.spinner.show() + self._ui.spinner.start() + self._ui.apply_button.set_sensitive(False) + self._ui.outcast_scrolled.set_sensitive(False) + self._ui.add_remove_button_box.set_sensitive(False) + + def _end_progress(self, result: str) -> None: + self._ui.spinner.stop() + self._ui.spinner.hide() + self._ui.apply_button.set_sensitive(result == 'error') + self._ui.outcast_scrolled.set_sensitive(True) + self._ui.add_remove_button_box.set_sensitive(True) + + def _on_add(self, _button: Gtk.Button) -> None: + iter_ = self._store.append([None, None, True]) + + path = self._store.get_path(iter_) + self._treeview.scroll_to_cell(path, None, False, 0, 0) + self._treeview.get_selection().unselect_all() + self._treeview.get_selection().select_path(path) + + self._update_apply_button_state() + + def _on_remove(self, _button: Gtk.Button) -> None: + _model, paths = self._treeview.get_selection().get_selected_rows() + + references: list[Gtk.TreeRowReference] = [] + for path in paths: + references.append(Gtk.TreeRowReference.new(self._store, path)) + + for ref in references: + path = ref.get_path() + assert path is not None + iter_ = self._store.get_iter(path) + self._store.remove(iter_) + + self._update_apply_button_state() + + def _on_jid_edited(self, + _renderer: Gtk.CellRendererText, + path: str, + new_text: str) -> None: + + old_text = self._store[path][Column.JID] + if new_text == old_text: + return + + if self._jid_exists(new_text): + self._raise_error() + return + + self._store[path][Column.JID] = new_text + self._update_apply_button_state() + + def _on_reason_edited(self, + _renderer: Gtk.CellRendererText, + path: str, + new_text: str) -> None: + self._store[path][Column.REASON] = new_text or None + self._update_apply_button_state() + + def _on_selection_changed(self, tree_selection: Gtk.TreeSelection) -> None: + sensitive = bool(tree_selection.count_selected_rows()) + self._set_remove_button_state(sensitive) + + def _jid_exists(self, jid: str) -> bool: + for row in self._store: + if row[Column.JID] == jid: + return True + return False + + def _set_remove_button_state(self, sensitive: bool) -> None: + value = self._own_affiliation in ('admin', 'owner') + self._ui.remove_button.set_sensitive(sensitive and value) + + def _update_apply_button_state(self): + if self._own_affiliation not in ('admin', 'owner'): + return + new_rows = self._get_new_rows() + self._ui.apply_button.set_sensitive(new_rows != self._current_rows) + self._ui.status_image.hide() + + def _allowed_to_edit(self) -> bool: + return self._own_affiliation in ('owner', 'admin') + + def _get_new_rows(self) -> set[OutcastRow]: + rows: set[OutcastRow] = set() + + for row in self._store: + if not row[Column.JID]: + continue + + rows.add(OutcastRow(jid=row[Column.JID], + reason=row[Column.REASON])) + return rows + + def _get_diff(self) -> list[OutcastRow]: + + new_rows = self._get_new_rows() + + before = {row.jid for row in self._current_rows} + after = {row.jid for row in new_rows} + + removed = before - after + removed_rows = [row for row in self._current_rows if row.jid in removed] + + added = after - before + added_rows = [row for row in new_rows if row.jid in added] + + same = after - removed - added + same_rows = {row for row in new_rows if row.jid in same} + modified_rows = list(same_rows - self._current_rows) + + return removed_rows + added_rows + modified_rows + + def _set_outcasts(self) -> None: + diff_rows = self._get_diff() + + outcasts = {} + for row in diff_rows: + outcasts[row.jid] = {'affiliation': 'outcast'} + if row.reason: + outcasts[row.jid]['reason'] = row.reason + + self._client.get_module('MUC').set_affiliation( + self._contact.jid, + outcasts, + callback=self._on_affiliation_finished) + + def _on_affiliation_finished(self, task: Task) -> None: + try: + task.finish() + except StanzaError as error: + log.info('Error while setting outcasts: %s', error) + self._end_progress('error') + self._set_status_image('error', tooltip_text=str(error)) + return + + self._current_rows = self._get_new_rows() + self._set_status_image('success') + self._end_progress('success') + + def _on_outcasts_received(self, task: Task) -> None: + try: + result = cast(AffiliationResult, task.finish()) + except StanzaError as error: + log.info('Error while requesting outcasts: %s', error.condition) + return + + editable = self._allowed_to_edit() + for jid, attrs in result.users.items(): + reason = attrs.get('reason') + + jid = str(jid) + self._store.append([jid, reason, editable]) + + self._current_rows.add(OutcastRow(jid=jid, reason=reason)) + + def _set_status_image(self, state: str, tooltip_text: str = '') -> None: + icon_name = 'feather-check-symbolic' + css_class = 'success-color' + + if state == 'error': + icon_name = 'dialog-warning-symbolic' + css_class = 'warning-color' + + self._ui.status_image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + self._ui.status_image.get_style_context().add_class(css_class) + self._ui.status_image.set_tooltip_text(tooltip_text) + self._ui.status_image.show() + + @staticmethod + def _raise_error() -> None: + ErrorDialog(_('Error'), + _('An entry with this XMPP Address already exists')) ===================================== pyrightconfig.json ===================================== @@ -46,6 +46,7 @@ "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_outcasts.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", "gajim/gtk/main.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56aa069322bd4e87176190ba688c2859… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56aa069322bd4e87176190ba688c2859… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Archive: Remove workaround
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9df3a354 by wurstsalat at 2022-01-26T21:32:30+01:00 Archive: Remove workaround - - - - - 2 changed files: - gajim/common/storage/archive.py - gajim/gtk/controls/base.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -413,53 +413,6 @@ def get_conversation_before_after(self, sql, tuple(jids) + (timestamp, n_lines)).fetchall() - @timeit - def get_conversation_muc_before_after(self, - _account: str, - jid: JID, - before: bool, - timestamp: float, - n_lines: int - ) -> list[ConversationRow]: - """ - Load n_lines lines of conversation with jid before or after timestamp - - :param account: The account - - :param jid: The jid for which we request the conversation - - :param before: bool for direction (before or after timestamp) - - :param timestamp: timestamp - - returns a list of namedtuples - """ - jids = [jid] - if before: - time_order = 'AND time < ? ORDER BY time DESC, log_line_id DESC' - else: - time_order = 'AND time > ? ORDER BY time ASC, log_line_id ASC' - - # TODO: this does not load messages correctly when account_id is set - # account_id = self.get_account_id(account, type_=JIDConstant.ROOM_TYPE) - - sql = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, stanza_id, - error as "error [common_error]", - marker as "marker [marker]" - FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) - AND kind = {kind} - {time_order} - LIMIT ? - '''.format(jids=', '.join('?' * len(jids)), - kind=KindConstant.GC_MSG, - time_order=time_order) - - return self._con.execute( - sql, - tuple(jids) + (timestamp, n_lines)).fetchall() - @timeit def get_last_conversation_line(self, account: str, ===================================== gajim/gtk/controls/base.py ===================================== @@ -1436,20 +1436,12 @@ def fetch_n_lines_history(self, else: timestamp = row.db_timestamp - if self.is_groupchat: - messages = app.storage.archive.get_conversation_muc_before_after( - self.account, - self.contact.jid, - before, - timestamp, - n_lines) - else: - messages = app.storage.archive.get_conversation_before_after( - self.account, - self.contact.jid, - before, - timestamp, - n_lines) + messages = app.storage.archive.get_conversation_before_after( + self.account, + self.contact.jid, + before, + timestamp, + n_lines) self._chat_loaded = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9df3a3545afbe4554110524f063deb0a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9df3a3545afbe4554110524f063deb0a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: MessageInput: Typing
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 755ab990 by wurstsalat at 2022-01-26T20:38:46+01:00 MessageInput: Typing - - - - - db1ce5ad by wurstsalat at 2022-01-26T20:49:53+01:00 PEPConfig: Typing - - - - - d0075c4e by wurstsalat at 2022-01-26T20:53:55+01:00 MamPreferences: Typing - - - - - 4ad0530c by wurstsalat at 2022-01-26T21:15:30+01:00 AdvancedConfig: Typing - - - - - fda036d5 by wurstsalat at 2022-01-26T21:16:54+01:00 Update pyrightconfig - - - - - 5 changed files: - gajim/gtk/advanced_config.py - gajim/gtk/mam_preferences.py - gajim/gtk/message_input.py - gajim/gtk/pep_config.py - pyrightconfig.json Changes: ===================================== gajim/gtk/advanced_config.py ===================================== @@ -83,8 +83,8 @@ def __init__(self) -> None: col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), renderer_text, text=0) treeview.insert_column(col, -1) - col.props.expand = True - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_expand(True) + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) col.set_resizable(True) self.renderer_text = Gtk.CellRendererText() @@ -95,14 +95,14 @@ def __init__(self) -> None: treeview.insert_column(col, -1) col.set_cell_data_func(self.renderer_text, self._value_column_data_callback) - col.props.expand = True - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_expand(True) + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) col.set_resizable(True) renderer_text = Gtk.CellRendererText() col = Gtk.TreeViewColumn(Q_('?config:Type'), renderer_text, text=2) treeview.insert_column(col, -1) - col.props.sizing = Gtk.TreeViewColumnSizing.FIXED + col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) treeview.set_model(self.modelfilter) @@ -149,6 +149,7 @@ def _on_treeview_row_activated(self, _column: Gtk.TreeViewColumn ) -> None: modelpath = self.modelfilter.convert_path_to_child_path(path) + assert modelpath modelrow = self.model[modelpath] setting = modelrow[Column.NAME] @@ -166,8 +167,9 @@ def _on_config_edited(self, path: str, text: str ) -> None: - path = Gtk.TreePath.new_from_string(path) - modelpath = self.modelfilter.convert_path_to_child_path(path) + treepath = Gtk.TreePath.new_from_string(path) + modelpath = self.modelfilter.convert_path_to_child_path(treepath) + assert modelpath modelrow = self.model[modelpath] setting = modelrow[Column.NAME] @@ -194,7 +196,7 @@ def _on_reset_button_clicked(self, button: Gtk.Button) -> None: app.settings.set(setting, default) button.set_sensitive(False) - def _fill_model(self, parent=None) -> None: + def _fill_model(self) -> None: for category, settings in ADVANCED_SETTINGS.items(): if category != 'app': continue @@ -215,7 +217,7 @@ def _fill_model(self, parent=None) -> None: else: raise ValueError - self.model.append(parent, [setting, value, type_]) + self.model.append(None, [setting, value, type_]) def _visible_func(self, model: Gtk.TreeModel, ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -82,10 +82,10 @@ def _mam_prefs_received(self, task: Task) -> None: self._ui.default_combo.set_active_id(result.default) self._ui.preferences_store.clear() for jid in result.always: - self._ui.preferences_store.append((str(jid), True)) + self._ui.preferences_store.append([str(jid), True]) for jid in result.never: - self._ui.preferences_store.append((str(jid), False)) + self._ui.preferences_store.append([str(jid), False]) def _mam_prefs_saved(self, task: Task) -> None: try: ===================================== gajim/gtk/message_input.py ===================================== @@ -94,6 +94,7 @@ def _on_focus_in(self, ) -> bool: self.toggle_speller(True) scrolled = self.get_parent() + assert scrolled scrolled.get_style_context().add_class('message-input-focus') return False @@ -102,6 +103,7 @@ def _on_focus_out(self, _event: Gdk.EventFocus ) -> bool: scrolled = self.get_parent() + assert scrolled scrolled.get_style_context().remove_class('message-input-focus') if not self.has_text(): self.toggle_speller(False) @@ -225,7 +227,8 @@ def _replace(anchor: Gtk.TextChildAnchor) -> None: image = anchor.get_widgets()[0] if hasattr(image, 'codepoint'): # found emoji - self._replace_char_at_iter(iter_, image.codepoint) + codepoint = getattr(image, 'codepoint') + self._replace_char_at_iter(iter_, codepoint) image.destroy() iter_ = self.get_buffer().get_start_iter() @@ -258,7 +261,7 @@ def insert_emoji(self, codepoint: str, pixbuf: GdkPixbuf.Pixbuf) -> None: else: anchor = buf.create_child_anchor(insert_iter) image = Gtk.Image.new_from_pixbuf(pixbuf) - image.codepoint = codepoint + setattr(image, 'codepoint', codepoint) image.show() self.add_child_at_anchor(image, anchor) buf.insert_at_cursor(' ') ===================================== gajim/gtk/pep_config.py ===================================== @@ -16,7 +16,9 @@ from gi.repository import Gdk from gi.repository import Gtk + from nbxmpp.errors import StanzaError +from nbxmpp.task import Task from gajim.common import app from gajim.common.i18n import _ @@ -32,7 +34,7 @@ class PEPConfig(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -47,21 +49,23 @@ def __init__(self, account): self.account = account self.set_title(_('PEP Service Configuration (%s)') % self.account) - self._con = app.connections[self.account] + self._client = app.get_client(account) self._init_services() self._ui.services_treeview.get_selection().connect( 'changed', self._on_services_selection_changed) self.show_all() - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_services_selection_changed(self, _selection): + def _on_services_selection_changed(self, + _selection: Gtk.TreeSelection + ) -> None: self._ui.configure_button.set_sensitive(True) self._ui.delete_button.set_sensitive(True) @@ -79,11 +83,11 @@ def _init_services(self): col.pack_start(cellrenderer_text, True) col.add_attribute(cellrenderer_text, 'text', 0) - jid = self._con.get_own_jid().bare - self._con.get_module('Discovery').disco_items( + jid = self._client.get_own_jid().bare + self._client.get_module('Discovery').disco_items( jid, callback=self._items_received) - def _items_received(self, task): + def _items_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -95,7 +99,7 @@ def _items_received(self, task): if item.jid == jid and item.node is not None: self.treestore.append([item.node]) - def _on_node_delete(self, task): + def _on_node_delete(self, task: Task) -> None: node = task.get_user_data() try: @@ -104,10 +108,12 @@ def _on_node_delete(self, task): WarningDialog( _('PEP node was not removed'), _('PEP node %(node)s was not removed:\n%(message)s') % { - 'node': node, 'message': error}) + 'node': node, + 'message': error}) return model = self._ui.services_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter_first() while iter_: if model[iter_][0] == node: @@ -115,35 +121,37 @@ def _on_node_delete(self, task): break iter_ = model.iter_next(iter_) - def _on_delete_button_clicked(self, _widget): + def _on_delete_button_clicked(self, _widget: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() + assert isinstance(model, Gtk.ListStore) + assert iter_ node = model[iter_][0] - con = app.connections[self.account] - con.get_module('PubSub').delete(node, - callback=self._on_node_delete, - user_data=node) + self._client.get_module('PubSub').delete( + node, + callback=self._on_node_delete, + user_data=node) - def _on_configure_button_clicked(self, _widget): + def _on_configure_button_clicked(self, _button: Gtk.Button) -> None: selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() + assert isinstance(model, Gtk.ListStore) + assert iter_ node = model[iter_][0] - con = app.connections[self.account] - con.get_module('PubSub').get_node_configuration( + self._client.get_module('PubSub').get_node_configuration( node, callback=self._nec_pep_config_received) def _on_config_submit(self, form, node): - con = app.connections[self.account] - con.get_module('PubSub').set_node_configuration(node, form) + self._client.get_module('PubSub').set_node_configuration(node, form) - def _nec_pep_config_received(self, task): + def _nec_pep_config_received(self, task: Task) -> None: try: result = task.finish() except Exception: ===================================== pyrightconfig.json ===================================== @@ -50,7 +50,9 @@ "gajim/gtk/groupchat_state.py", "gajim/gtk/main.py", "gajim/gtk/main_stack.py", + "gajim/gtk/mam_preferences.py", "gajim/gtk/manage_sounds.py", + "gajim/gtk/message_input.py", "gajim/gtk/notification.py", "gajim/gtk/password_dialog.py", "gajim/gtk/preview_audio.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba90f881a750e9d77c9e291f09d1dc4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ba90f881a750e9d77c9e291f09d1dc4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Roster: Typing, fix error
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2743de11 by wurstsalat at 2022-01-26T20:11:02+01:00 Roster: Typing, fix error - - - - - ba90f881 by wurstsalat at 2022-01-26T20:11:02+01:00 RosterItemExchange: Typing - - - - - 3 changed files: - gajim/common/events.py - gajim/gtk/roster.py - gajim/gtk/roster_item_exchange.py Changes: ===================================== gajim/common/events.py ===================================== @@ -418,7 +418,7 @@ class RosterItemExchangeEvent(ApplicationEvent): name: str = field(init=False, default='roster-item-exchange') client: 'Client' jid: JID - exchange_items_list: list[str] + exchange_items_list: dict[str, list[str]] action: str ===================================== gajim/gtk/roster.py ===================================== @@ -30,7 +30,7 @@ from gi.repository import Gtk from nbxmpp import JID -from nbxmpp import Namespace +from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common import ged @@ -39,6 +39,8 @@ from gajim.common.const import StyleAttr from gajim.common.const import PresenceShowExt from gajim.common.events import ApplicationEvent +from gajim.common.events import RosterPush +from gajim.common.events import RosterReceived from gajim.common.helpers import event_filter from gajim.common.i18n import _ @@ -358,11 +360,12 @@ def _on_remove_contact(self, if contact.jid.domain == selected_contact.jid.domain: has_transport_contacts = True break - if has_transport_contacts: - def _on_remove(): - self._client.get_module('Gateway').unsubscribe( - selected_contact.jid) + def _on_remove(): + self._client.get_module('Gateway').unsubscribe( + selected_contact.jid) + + if has_transport_contacts: ConfirmationDialog( _('Remove Transport'), _('Transport \'%s\' will be ' @@ -406,6 +409,9 @@ def _on_roster_button_press_event(self, return path, _, _, _ = pos + if path is None: + return + path = self._modelfilter.convert_path_to_child_path(path) assert path is not None iter_ = self._store.get_iter(path) @@ -524,12 +530,12 @@ def _on_contact_update(self, self._draw_contact(contact) @event_filter(['account']) - def _on_roster_received(self, _event: ApplicationEvent) -> None: + def _on_roster_received(self, _event: RosterReceived) -> None: self._reset_roster() @event_filter(['account']) - def _on_roster_push(self, event: ApplicationEvent) -> None: - contact = self._get_contact(event.item.jid) + def _on_roster_push(self, event: RosterPush) -> None: + contact = self._get_contact(str(event.item.jid)) if event.item.subscription == 'remove': contact.disconnect(self) @@ -718,15 +724,15 @@ def _text_cell_data_func(_column: Gtk.TreeViewColumn, has_parent = bool(model.iter_parent(iter_)) style = 'contact' if has_parent else 'group' - bgcolor = app.css_config.get_value('.gajim-%s-row' % style, + bgcolor = app.css_config.get_value(f'.gajim-{style}-row', StyleAttr.BACKGROUND) renderer.set_property('cell-background', bgcolor) - color = app.css_config.get_value('.gajim-%s-row' % style, + color = app.css_config.get_value(f'.gajim-{style}-row', StyleAttr.COLOR) renderer.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-%s-row' % style) + desc = app.css_config.get_font(f'.gajim-{style}-row') renderer.set_property('font-desc', desc) if not has_parent: ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -12,8 +12,12 @@ # 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 Optional + from gi.repository import Gtk +from nbxmpp.protocol import JID + from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ @@ -26,8 +30,13 @@ class RosterItemExchange(Gtk.ApplicationWindow): """ Used when someone sends a Roster Item Exchange suggestion (XEP-0144) """ - def __init__(self, account, action, exchange_list, jid_from, - message_body=None): + def __init__(self, + account: str, + action: str, + exchange_list: dict[str, list[str]], + jid_from: JID, + message_body: Optional[str] = None + ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -46,6 +55,7 @@ def __init__(self, account, action, exchange_list, jid_from, # Set label depending on action contact = self._client.get_module('Contacts').get_contact(jid_from) + type_label = '' if action == 'add': type_label = _('%(name)s (%(jid)s) would like to add some ' 'contacts to your contact list.') % { @@ -75,7 +85,8 @@ def __init__(self, account, action, exchange_list, jid_from, # Columns renderer1 = Gtk.CellRendererToggle() renderer1.set_property('activatable', True) - renderer1.connect('toggled', self._toggled) + renderer1.connect('toggled', self._on_toggled) + title = '' if self._action == 'add': title = _('Add') elif self._action == 'modify': @@ -95,8 +106,9 @@ def __init__(self, account, action, exchange_list, jid_from, -1, _('Groups'), renderer4, text=3) # Init contacts - self.model = self._ui.items_list_treeview.get_model() - self.model.clear() + self._model = self._ui.items_list_treeview.get_model() + assert isinstance(self._model, Gtk.ListStore) + self._model.clear() if action == 'add': self._add() @@ -107,12 +119,13 @@ def __init__(self, account, action, exchange_list, jid_from, self._ui.connect_signals(self) - def _toggled(self, cell, path): + def _on_toggled(self, cell: Gtk.CellRendererToggle, path: str) -> None: model = self._ui.items_list_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter(path) model[iter_][0] = not cell.get_active() - def _add(self): + def _add(self) -> None: for jid in self._exchange_list: contact = self._client.get_module('Contacts').get_contact(jid) name = self._exchange_list[jid][0] @@ -127,12 +140,13 @@ def _add(self): groups = groups + group + ', ' if not contact.is_in_roster: self.show_all() - iter_ = self.model.append() - self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + assert isinstance(self._model, Gtk.ListStore) + iter_ = self._model.append() + self._model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) self._ui.accept_button.set_label(_('Add')) - def _modify(self): + def _modify(self) -> None: for jid in self._exchange_list: is_right = True contact = self._client.get_module('Contacts').get_contact(jid) @@ -153,12 +167,13 @@ def _modify(self): groups = groups + group + ', ' if not is_right and contact.is_in_roster: self.show_all() - iter_ = self.model.append() - self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + assert isinstance(self._model, Gtk.ListStore) + iter_ = self._model.append() + self._model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) self._ui.accept_button.set_label(_('Modify')) - def _delete(self): + def _delete(self) -> None: for jid in self._exchange_list: contact = self._client.get_module('Contacts').get_contact(jid) name = self._exchange_list[jid][0] @@ -173,13 +188,15 @@ def _delete(self): groups = groups + group + ', ' if contact.is_in_roster: self.show_all() - iter_ = self.model.append() - self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + assert isinstance(self._model, Gtk.ListStore) + iter_ = self._model.append() + self._model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) self._ui.accept_button.set_label(_('Delete')) - def _on_accept_button_clicked(self, _widget): + def _on_accept_button_clicked(self, _button: Gtk.Button) -> None: model = self._ui.items_list_treeview.get_model() + assert isinstance(model, Gtk.ListStore) iter_ = model.get_iter_first() if self._action == 'add': count = 0 @@ -198,7 +215,7 @@ def _on_accept_button_clicked(self, _widget): if groups == ['']: groups = [] jid = model[iter_][1] - if app.jid_is_transport(self._jid_from): + if app.jid_is_transport(str(self._jid_from)): self._client.get_module('Presence').automatically_added.append( jid) @@ -211,7 +228,7 @@ def _on_accept_button_clicked(self, _widget): iter_ = model.iter_next(iter_) InformationDialog(i18n.ngettext('Added %d contact', 'Added %d contacts', - count, count, count)) + count, str(count), str(count))) elif self._action == 'modify': count = 0 while iter_: @@ -244,8 +261,8 @@ def _on_accept_button_clicked(self, _widget): iter_ = model.iter_next(iter_) InformationDialog(i18n.ngettext('Removed %d contact', 'Removed %d contacts', - count, count, count)) + count, str(count), str(count))) self.destroy() - def _on_cancel_button_clicked(self, _widget): + def _on_cancel_button_clicked(self, _button: Gtk.Button) -> None: self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed50151e036b8fda6580e2fadeef5b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ed50151e036b8fda6580e2fadeef5b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationView: Don’t allow to focus rows
by Philipp Hörist (＠lovetox) 26 Jan '22

26 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ed50151e by lovetox at 2022-01-26T20:09:59+01:00 ConversationView: Don’t allow to focus rows This can steal focus from the text and hinder users to copy text - - - - - 1 changed file: - gajim/gtk/conversation/rows/base.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -41,6 +41,7 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: self.text: str = '' self._merged: bool = False + self.set_can_focus(False) self.get_style_context().add_class('conversation-row') self.grid = Gtk.Grid(row_spacing=3, column_spacing=12) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed50151e036b8fda6580e2fadeef5b9a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed50151e036b8fda6580e2fadeef5b9a… 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