Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Add MucUserStatus row
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: e40936f5 by lovetox at 2021-04-29T22:35:33+02:00 Add MucUserStatus row - - - - - 3 changed files: - gajim/gtk/controls/groupchat.py - + gajim/gtk/conversation/rows/muc_user_status.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -51,7 +51,6 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.const import MUCJoinedState from gajim.common.structs import OutgoingMessage from gajim.gui.controls.base import BaseControl @@ -88,9 +87,9 @@ class GroupchatControl(BaseControl): def __init__(self, account, jid): BaseControl.__init__(self, - 'groupchat_control', - account, - jid) + 'groupchat_control', + account, + jid) self._client.connect_signal('state-changed', self._on_client_state_changed) @@ -972,23 +971,9 @@ def _on_user_status_show_changed(self, user_contact, properties): - if not self.contact.settings.get('print_status'): - return - - nick = user_contact.name - status = user_contact.status - status = '' if status is None else ' - %s' % status - show = helpers.get_uf_show(user_contact.show.value) - - if properties.is_muc_self_presence: - message = _('You are now {show}{status}').format(show=show, - status=status) - - else: - message = _('{nick} is now {show}{status}').format(nick=nick, - show=show, - status=status) - self.add_info_message(message) + self.conversation_view.add_muc_user_status( + user_contact, + properties.is_muc_self_presence) def _on_user_affiliation_changed(self, _contact, ===================================== gajim/gtk/conversation/rows/muc_user_status.py ===================================== @@ -0,0 +1,73 @@ +# 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/>. + +import time +from datetime import datetime + +from gi.repository import Gtk + +from gajim.common.i18n import _ +from gajim.common.const import AvatarSize +from gajim.common import helpers + +from .widgets import SimpleLabel +from .base import BaseRow + + +class MUCUserStatus(BaseRow): + def __init__(self, account, user_contact, is_self): + BaseRow.__init__(self, account) + + self.type = 'muc-user-status' + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + icon_name = 'feather-info-symbolic' + icon = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU) + self.grid.attach(icon, 1, 0, 1, 1) + + self._label = SimpleLabel() + self._label.set_text(self._make_text(user_contact, is_self)) + self._label.get_style_context().add_class('gajim-status-message') + self.grid.attach(self._label, 2, 0, 1, 1) + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_hexpand(True) + timestamp_widget.set_halign(Gtk.Align.END) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 3, 0, 1, 1) + + self.show_all() + + @staticmethod + def _make_text(user_contact, is_self): + nick = user_contact.name + status = user_contact.status + status = '' if status is None else ' - %s' % status + show = helpers.get_uf_show(user_contact.show.value) + + if is_self: + message = _('You are now {show}{status}').format(show=show, + status=status) + + else: + message = _('{nick} is now {show}{status}').format(nick=nick, + show=show, + status=status) + return message ===================================== gajim/gtk/conversation/view.py ===================================== @@ -34,6 +34,7 @@ from .conversation.rows.date import DateRow from .conversation.rows.muc_subject import MUCSubject from .conversation.rows.muc_join_left import MUCJoinLeft +from .conversation.rows.muc_user_status import MUCUserStatus log = logging.getLogger('gajim.gui.conversation_view') @@ -80,6 +81,11 @@ def __init__(self, account, contact, history_mode=False): account=self._account, jid=self._contact.jid) + app.settings.connect_signal('print_status', + self._on_contact_setting_changed, + account=self._account, + jid=self._contact.jid) + if self._contact is not None: self._read_marker_row = ReadMarkerRow(self._account, self._contact) self.add(self._read_marker_row) @@ -116,6 +122,9 @@ def _sort_func(self, row1, row2): def _filter_func(self, row): if row.type in ('muc-user-joined', 'muc-user-left'): return self._contact.settings.get('print_join_left') + if row.type == 'muc-user-status': + return self._contact.settings.get('print_status') + return True def add_muc_subject(self, text, nick, date): @@ -136,6 +145,10 @@ def add_muc_user_joined(self, nick): nick) self._insert_message(join_left) + def add_muc_user_status(self, user_contact, is_self): + user_status = MUCUserStatus(self._account, user_contact, is_self) + self._insert_message(user_status) + def add_info_message(self, text): message = InfoMessage(self._account, text) self._insert_message(message) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e40936f5b1051510a4bb308b189ba93e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e40936f5b1051510a4bb308b189ba93e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add Info message styling
by Daniel Brötzmann 29 Apr '21

29 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fc8a485b by wurstsalat at 2021-04-29T22:09:54+02:00 Add Info message styling - - - - - 14 changed files: - + gajim/data/icons/hicolor/16x16/devices/feather-info-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-log-in-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-log-out-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-info-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-log-in-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-log-out-symbolic.symbolic.png - + gajim/data/icons/hicolor/scalable/devices/feather-info-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-log-in-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-log-out-symbolic.svg - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/rows/muc_subject.py Changes: ===================================== gajim/data/icons/hicolor/16x16/devices/feather-info-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-info-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-log-in-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-log-in-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-log-out-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-log-out-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-info-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-info-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-log-in-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-log-in-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-log-out-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-log-out-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/scalable/devices/feather-info-symbolic.svg ===================================== @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-info" + version="1.1" + id="svg8" + sodipodi:docname="feather-info-symbolic.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview10" + showgrid="false" + inkscape:zoom="34.291667" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 12 1 C 5.9367124 1 1 5.9367124 1 12 C 1 18.063288 5.9367124 23 12 23 C 18.063288 23 23 18.063288 23 12 C 23 5.9367124 18.063288 1 12 1 z M 12 3 C 16.982407 3 21 7.0175926 21 12 C 21 16.982407 16.982407 21 12 21 C 7.0175926 21 3 16.982407 3 12 C 3 7.0175926 7.0175926 3 12 3 z " + id="circle2" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 12 11 A 1 1 0 0 0 11 12 L 11 16 A 1 1 0 0 0 12 17 A 1 1 0 0 0 13 16 L 13 12 A 1 1 0 0 0 12 11 z " + id="line4" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 12 7 A 1 1 0 0 0 11 8 A 1 1 0 0 0 12 9 L 12.009766 9 A 1 1 0 0 0 13.009766 8 A 1 1 0 0 0 12.009766 7 L 12 7 z " + id="line6" /> +</svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-log-in-symbolic.svg ===================================== @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-log-in" + version="1.1" + id="svg8" + sodipodi:docname="feather-log-in-symbolic.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview10" + showgrid="false" + inkscape:zoom="34.291667" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 15 2 A 1 1 0 0 0 14 3 A 1 1 0 0 0 15 4 L 19 4 C 19.564129 4 20 4.4358706 20 5 L 20 19 C 20 19.564129 19.564129 20 19 20 L 15 20 A 1 1 0 0 0 14 21 A 1 1 0 0 0 15 22 L 19 22 C 20.64501 22 22 20.64501 22 19 L 22 5 C 22 3.3549904 20.64501 2 19 2 L 15 2 z " + id="path2" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 10.029297 6 A 1 1 0 0 0 9.2929688 6.2929688 A 1 1 0 0 0 9.2929688 7.7070312 L 13.585938 12 L 9.2929688 16.292969 A 1 1 0 0 0 9.2929688 17.707031 A 1 1 0 0 0 10.707031 17.707031 L 15.707031 12.707031 A 1.0001 1.0001 0 0 0 15.707031 11.292969 L 10.707031 6.2929688 A 1 1 0 0 0 10.029297 6 z " + id="polyline4" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 3 11 A 1 1 0 0 0 2 12 A 1 1 0 0 0 3 13 L 15 13 A 1 1 0 0 0 16 12 A 1 1 0 0 0 15 11 L 3 11 z " + id="line6" /> +</svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-log-out-symbolic.svg ===================================== @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-log-out" + version="1.1" + id="svg8" + sodipodi:docname="feather-log-out-symbolic.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview10" + showgrid="false" + inkscape:zoom="34.291667" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 5 2 C 3.3549904 2 2 3.3549904 2 5 L 2 19 C 2 20.64501 3.3549904 22 5 22 L 9 22 A 1 1 0 0 0 10 21 A 1 1 0 0 0 9 20 L 5 20 C 4.4358706 20 4 19.564129 4 19 L 4 5 C 4 4.4358706 4.4358706 4 5 4 L 9 4 A 1 1 0 0 0 10 3 A 1 1 0 0 0 9 2 L 5 2 z " + id="path2" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 16.029297 6 A 1 1 0 0 0 15.292969 6.2929688 A 1 1 0 0 0 15.292969 7.7070312 L 19.585938 12 L 15.292969 16.292969 A 1 1 0 0 0 15.292969 17.707031 A 1 1 0 0 0 16.707031 17.707031 L 21.707031 12.707031 A 1.0001 1.0001 0 0 0 21.707031 11.292969 L 16.707031 6.2929688 A 1 1 0 0 0 16.029297 6 z " + id="polyline4" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 9 11 A 1 1 0 0 0 8 12 A 1 1 0 0 0 9 13 L 21 13 A 1 1 0 0 0 22 12 A 1 1 0 0 0 21 11 L 9 11 z " + id="line6" /> +</svg> ===================================== gajim/data/style/default-dark.css ===================================== @@ -9,6 +9,9 @@ color: rgb(200, 200, 200); } .gajim-status-message { + color: rgb(140, 175, 210); +} +.gajim-subject-message { color: rgb(205, 225, 255); background: rgb(40, 60, 80); } @@ -24,6 +27,12 @@ .gajim-state-tab-muc-msg { color: rgb(80, 95, 230); } +.gajim-user-disconnected { + color: rgb(80, 30, 30); +} +.gajim-user-connected { + color: rgb(30, 80, 50); +} .gajim-roster-disconnected { background: rgb(80, 30, 30); } ===================================== gajim/data/style/default.css ===================================== @@ -9,6 +9,9 @@ color: rgb(85, 85, 85); } .gajim-status-message { + color: rgb(100, 130, 160); +} +.gajim-subject-message { color: rgb(40, 70, 100); background: rgb(225, 235, 250); } @@ -24,6 +27,12 @@ .gajim-state-tab-muc-msg { color: rgb(40, 40, 200); } +.gajim-user-disconnected { + color: rgb(230, 170, 170); +} +.gajim-user-connected { + color: rgb(160, 200, 170); +} .gajim-roster-disconnected { background: rgb(230, 170, 170); } ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -37,13 +37,22 @@ def __init__(self, account, text): avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) - self.grid.attach(avatar_placeholder, 0, 0, 1, 2) - timestamp_widget = self.create_timestamp_widget(self.timestamp) - timestamp_widget.set_valign(Gtk.Align.START) - self.grid.attach(timestamp_widget, 2, 0, 1, 1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + icon = Gtk.Image.new_from_icon_name('feather-info-symbolic', + Gtk.IconSize.MENU) + icon.get_style_context().add_class('gajim-status-message') + self.grid.attach(icon, 1, 0, 1, 1) self._label = SimpleLabel() + self._label.get_style_context().add_class('gajim-status-message') self._label.set_text(text) + self.grid.attach(self._label, 2, 0, 1, 1) + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_hexpand(True) + timestamp_widget.set_halign(Gtk.Align.END) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 3, 0, 1, 1) - self.grid.attach(self._label, 1, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -33,23 +33,34 @@ def __init__(self, type_, account, nick, reason=None, error=False): self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp - self._label = SimpleLabel() + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) if type_ == 'muc-user-joined': text = self._make_join_message(nick) + icon_name = 'feather-log-in-symbolic' + icon_class = 'gajim-user-connected' else: text = self._make_left_message(nick, reason, error) + icon_name = 'feather-log-out-symbolic' + icon_class = 'gajim-user-disconnected' + + icon = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU) + icon.get_style_context().add_class(icon_class) + self.grid.attach(icon, 1, 0, 1, 1) + self._label = SimpleLabel() self._label.set_text(text) + self._label.get_style_context().add_class('gajim-status-message') + self.grid.attach(self._label, 2, 0, 1, 1) - avatar_placeholder = Gtk.Box() - avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) - self.grid.attach(avatar_placeholder, 0, 0, 1, 2) timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_hexpand(True) + timestamp_widget.set_halign(Gtk.Align.END) timestamp_widget.set_valign(Gtk.Align.START) - self.grid.attach(timestamp_widget, 2, 0, 1, 1) + self.grid.attach(timestamp_widget, 3, 0, 1, 1) - self.grid.attach(self._label, 1, 0, 1, 1) self.show_all() @staticmethod @@ -57,9 +68,9 @@ def _make_left_message(nick, reason, error): reason = '' if reason is None else ': {reason}'.format(reason=reason) if error: - #Group Chat: User was kicked because of an server error: reason - message = _('{nick} has left due to ' - 'an error{reason}').format(nick=nick, reason=reason) + # Group Chat: User was kicked because of an server error: reason + message = _('{nick} has left due to an error{reason}').format( + nick=nick, reason=reason) else: message = _('{nick} has left{reason}').format(nick=nick, @@ -68,4 +79,4 @@ def _make_left_message(nick, reason, error): @staticmethod def _make_join_message(nick): - return _('%s has joined the group chat') % nick + return _('%s has joined') % nick ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -45,7 +45,7 @@ def __init__(self, account, text, nick, date): subject_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) subject_box.get_style_context().add_class('conversation-subject-box') - subject_box.get_style_context().add_class('gajim-status-message') + subject_box.get_style_context().add_class('gajim-subject-message') title = Gtk.Label(label=_('Subject')) title.set_halign(Gtk.Align.START) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc8a485b80483a168cc4ead427937794… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc8a485b80483a168cc4ead427937794… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Update AccountBadge and Identifier
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: bb69f7fe by lovetox at 2021-04-29T21:51:39+02:00 Update AccountBadge and Identifier - - - - - 9 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/chat_list.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/groupchat_invitation.py - gajim/gtk/groupchat_invite.py - gajim/gtk/start_chat.py - gajim/gtk/util.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -501,9 +501,9 @@ </packing> </child> <child> - <object class="GtkBox" id="account_badge"> - <property name="visible">True</property> + <object class="GtkBox" id="account_badge_box"> <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="valign">center</property> <property name="orientation">vertical</property> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -199,9 +199,9 @@ <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkBox" id="account_badge"> - <property name="visible">True</property> + <object class="GtkBox" id="account_badge_box"> <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="valign">center</property> <property name="margin-end">6</property> @@ -538,9 +538,6 @@ <property name="name">groupchat</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -664,7 +661,7 @@ </object> <packing> <property name="name">nickname</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -799,7 +796,7 @@ </object> <packing> <property name="name">subject</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -925,7 +922,7 @@ </object> <packing> <property name="name">password</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -1038,7 +1035,7 @@ </object> <packing> <property name="name">captcha</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> @@ -1201,7 +1198,7 @@ </object> <packing> <property name="name">error</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> @@ -1326,7 +1323,7 @@ </object> <packing> <property name="name">captcha-error</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> @@ -1436,7 +1433,7 @@ </object> <packing> <property name="name">muc-info</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> @@ -1587,7 +1584,7 @@ </object> <packing> <property name="name">kick</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> @@ -1738,7 +1735,7 @@ </object> <packing> <property name="name">ban</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> <child> @@ -1934,7 +1931,7 @@ </object> <packing> <property name="name">destroy</property> - <property name="position">11</property> + <property name="position">10</property> </packing> </child> <child> @@ -2060,7 +2057,7 @@ </object> <packing> <property name="name">rename</property> - <property name="position">12</property> + <property name="position">11</property> </packing> </child> <child> @@ -2160,7 +2157,7 @@ </object> <packing> <property name="name">invite</property> - <property name="position">13</property> + <property name="position">12</property> </packing> </child> <child> @@ -2289,7 +2286,7 @@ </object> <packing> <property name="name">muc-settings</property> - <property name="position">14</property> + <property name="position">13</property> </packing> </child> </object> ===================================== gajim/gtk/chat_list.py ===================================== @@ -19,6 +19,7 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import RowHeaderType @@ -30,13 +31,15 @@ from gajim.gui_menu_builder import get_chat_list_row_menu from .util import get_builder +from .util import EventHelper log = logging.getLogger('gajim.gui.chatlist') -class ChatList(Gtk.ListBox): +class ChatList(Gtk.ListBox, EventHelper): def __init__(self, workspace_id): Gtk.ListBox.__init__(self) + EventHelper.__init__(self) self._chats = {} self._current_filter_text = '' @@ -48,6 +51,11 @@ def __init__(self, workspace_id): self.set_sort_func(self._sort_func) self._set_placeholder() + self.register_events([ + ('account-enabled', ged.GUI2, self._on_account_changed), + ('account-disabled', ged.GUI2, self._on_account_changed), + ]) + self.connect('destroy', self._on_destroy) self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) @@ -262,6 +270,10 @@ def _add_unread(row, properties): row.add_unread() + def _on_account_changed(self, *args): + for row in self.get_children(): + row.update_account_identifier() + class ChatRow(Gtk.ListBoxRow): def __init__(self, workspace_id, account, jid, type_, pinned): @@ -295,16 +307,12 @@ def __init__(self, workspace_id, account, jid, type_, pinned): self._ui.eventbox.connect('button-press-event', self._on_button_press) self._ui.close_button.connect('clicked', self._on_close_button_clicked) - account_class = app.css_config.get_dynamic_class(account) - self._ui.account_identifier.get_style_context().add_class(account_class) - if len(app.get_enabled_accounts_with_labels()) > 1: - self._ui.account_identifier.show() - if self.type == 'groupchat': self._ui.group_chat_indicator.show() self.update_avatar() self.update_name() + self.update_account_identifier() # Get last chat message from archive line = app.storage.archive.get_last_conversation_line(account, jid) @@ -399,6 +407,12 @@ def update_name(self): self._ui.name_label.set_text(self.contact.name) + def update_account_identifier(self): + account_class = app.css_config.get_dynamic_class(self.account) + self._ui.account_identifier.get_style_context().add_class(account_class) + show = len(app.settings.get_active_accounts()) > 1 + self._ui.account_identifier.set_visible(show) + def _on_chatstate_update(self, contact, _signal_name): if contact.chatstate is None: self._ui.chatstate_image.hide() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -16,23 +16,32 @@ from gi.repository import Gtk +from gajim.common import ged + from gajim.gui.controls.chat import ChatControl from gajim.gui.controls.groupchat import GroupchatControl from gajim.gui.controls.private import PrivateChatControl +from .util import EventHelper log = logging.getLogger('gajim.gui.chatstack') -class ChatStack(Gtk.Stack): +class ChatStack(Gtk.Stack, EventHelper): def __init__(self): Gtk.Stack.__init__(self) + EventHelper.__init__(self) self.set_vexpand(True) self.set_hexpand(True) self.add_named(Gtk.Box(), 'empty') + self.register_events([ + ('account-enabled', ged.GUI2, self._on_account_changed), + ('account-disabled', ged.GUI2, self._on_account_changed), + ]) + self.show_all() self._controls = {} @@ -97,3 +106,7 @@ def remove_chats_for_account(self, account): if chat_account != account: continue self.remove_chat(account, jid) + + def _on_account_changed(self, *args): + for control in self._controls.values(): + control.update_account_badge() ===================================== gajim/gtk/controls/base.py ===================================== @@ -56,7 +56,7 @@ from gajim.gui.message_input import MessageInputTextView from gajim.gui.util import get_hardware_key_codes from gajim.gui.util import get_builder -from gajim.gui.util import generate_account_badge +from gajim.gui.util import AccountBadge from gajim.gui.const import ControlType # pylint: disable=unused-import from gajim.gui.emoji_chooser import emoji_chooser @@ -126,13 +126,10 @@ def __init__(self, widget_name, account, jid): self.xml.connect_signals(self) self.widget = self.xml.get_object('%s_hbox' % widget_name) - self._accounts = app.get_enabled_accounts_with_labels() - if len(self._accounts) > 1: - account_badge = generate_account_badge(self.account) - account_badge.set_tooltip_text( - _('Account: %s') % app.get_account_label(self.account)) - self.xml.account_badge.add(account_badge) - account_badge.show() + self._account_badge = AccountBadge(self.account) + self.xml.account_badge_box.add(self._account_badge) + show = len(app.settings.get_active_accounts()) > 1 + self.xml.account_badge_box.set_visible(show) # Drag and drop self.xml.overlay.add_overlay(self.xml.drop_area) @@ -1400,6 +1397,10 @@ def scroll_messages(self, direction, msg_buf, msg_type): message = '> %s\n' % message.replace('\n', '\n> ') msg_buf.set_text(message) + def update_account_badge(self): + show = len(app.settings.get_active_accounts()) > 1 + self.xml.account_badge_box.set_visible(show) + class ScrolledWindow(Gtk.ScrolledWindow): def __init__(self, *args, **kwargs): ===================================== gajim/gtk/groupchat_invitation.py ===================================== @@ -21,7 +21,7 @@ from .groupchat_info import GroupChatInfoScrolled from .groupchat_nick import NickChooser -from .util import generate_account_badge +from .util import AccountBadge class GroupChatInvitation(Gtk.ApplicationWindow): @@ -63,9 +63,7 @@ def __init__(self, account, event): enabled_accounts = app.get_enabled_accounts_with_labels() if len(enabled_accounts) > 1: - account_badge = generate_account_badge(account) - account_badge.set_tooltip_text( - _('Account: %s') % app.get_account_label(account)) + account_badge = AccountBadge(account) contact_box.add(account_badge) invitation_label = Gtk.Label( ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -26,7 +26,7 @@ from gajim.common.helpers import validate_jid from .util import get_builder -from .util import generate_account_badge +from .util import AccountBadge class GroupChatInvite(Gtk.Box): @@ -303,9 +303,7 @@ def __init__(self, account, contact, jid, name, show_account): name_box.add(self.name_label) if show_account: - account_badge = generate_account_badge(account) - account_badge.set_tooltip_text( - _('Account: %s' % self.account_label)) + account_badge = AccountBadge(account) account_badge.set_halign(Gtk.Align.END) account_badge.set_valign(Gtk.Align.START) account_badge.set_hexpand(True) ===================================== gajim/gtk/start_chat.py ===================================== @@ -39,7 +39,7 @@ from .groupchat_nick import NickChooser from .util import get_builder from .util import get_icon_name -from .util import generate_account_badge +from .util import AccountBadge class Search(IntEnum): @@ -647,9 +647,7 @@ def __init__(self, account, contact, jid, name, show_account, name_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) name_box.add(self.name_label) if show_account: - account_badge = generate_account_badge(account) - account_badge.set_tooltip_text( - _('Account: %s') % self.account_label) + account_badge = AccountBadge(account) account_badge.set_halign(Gtk.Align.END) account_badge.set_valign(Gtk.Align.START) account_badge.set_hexpand(True) ===================================== gajim/gtk/util.py ===================================== @@ -697,19 +697,6 @@ def get_color_for_account(account: str) -> str: return rgba.to_string() -def generate_account_badge(account): - account_label = app.get_account_label(account) - badge = Gtk.Label(label=account_label) - badge.set_ellipsize(Pango.EllipsizeMode.END) - badge.set_max_width_chars(12) - badge.set_size_request(50, -1) - account_class = app.css_config.get_dynamic_class(account) - badge_context = badge.get_style_context() - badge_context.add_class(account_class) - badge_context.add_class('badge') - return badge - - @lru_cache(maxsize=16) def get_css_show_class(show): if show in ('online', 'chat'): @@ -899,3 +886,23 @@ def _on_realize(*args): event_box.add(widget) return event_box return klass_wrapper + + +class AccountBadge(Gtk.Label): + def __init__(self, account): + Gtk.Label.__init__(self) + self.set_ellipsize(Pango.EllipsizeMode.END) + self.set_max_width_chars(12) + self.set_size_request(50, -1) + self.get_style_context().add_class('badge') + self._account = account + + self.refresh() + self.show() + + def refresh(self): + label = app.get_account_label(self._account) + self.set_text(label) + account_class = app.css_config.get_dynamic_class(self._account) + self.get_style_context().add_class(account_class) + self.set_tooltip_text(_('Account: %s') % label) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb69f7fe721dc1db9fe192bcbbb69aff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb69f7fe721dc1db9fe192bcbbb69aff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix workspace label
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 650ae662 by lovetox at 2021-04-29T20:47:38+02:00 Fix workspace label - - - - - 1 changed file: - gajim/gtk/chat_page.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -123,10 +123,6 @@ def _on_button_release(paned, event): def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): self._chat_stack.show_chat(account, jid) self._search_view.set_context(account, jid) - - self._ui.workspace_label.set_text( - app.settings.get_workspace_setting(workspace_id, 'name')) - self.emit('chat-selected', workspace_id, account, jid) def _on_chat_unselected(self, _chat_list_stack): @@ -143,7 +139,11 @@ def _on_search_history(self, _action, _param): def _on_search_hide(self, *args): self._search_revealer.hide() - def _on_chat_list_changed(self, *args): + def _on_chat_list_changed(self, chat_list_stack, *args): + chat_list = chat_list_stack.get_current_chat_list() + name = app.settings.get_workspace_setting(chat_list.workspace_id, + 'name') + self._ui.workspace_label.set_text(name) self._ui.search_entry.set_text('') def process_event(self, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/650ae662a13643feeff2f6a07bace29c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/650ae662a13643feeff2f6a07bace29c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Label
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 83cbe939 by lovetox at 2021-04-29T20:36:15+02:00 Fix Label - - - - - 2 changed files: - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -43,6 +43,7 @@ def __init__(self, account, text): self.grid.attach(timestamp_widget, 2, 0, 1, 1) self._label = SimpleLabel() + self._label.set_text(text) self.grid.attach(self._label, 1, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk +from gi.repository import Pango class SimpleLabel(Gtk.Label): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/83cbe9394b1035963d51dde717f4b15a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/83cbe9394b1035963d51dde717f4b15a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add SimpleLabel
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f0f55aa7 by lovetox at 2021-04-29T14:34:06+02:00 Add SimpleLabel - - - - - 3 changed files: - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/muc_join_left.py - + gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -19,10 +19,9 @@ from gi.repository import Gtk from gajim.common.const import AvatarSize -from gajim.common.styling import process +from .widgets import SimpleLabel from .base import BaseRow -from ..message_widget import MessageWidget class InfoMessage(BaseRow): @@ -43,9 +42,7 @@ def __init__(self, account, text): timestamp_widget.set_valign(Gtk.Align.START) self.grid.attach(timestamp_widget, 2, 0, 1, 1) - result = process(text) - message_widget = MessageWidget(account) - message_widget.add_content(result) + self._label = SimpleLabel() - self.grid.attach(message_widget, 1, 0, 1, 1) + self.grid.attach(self._label, 1, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -16,11 +16,11 @@ from datetime import datetime from gi.repository import Gtk -from gi.repository import Pango from gajim.common.i18n import _ from gajim.common.const import AvatarSize +from .widgets import SimpleLabel from .base import BaseRow @@ -33,11 +33,7 @@ def __init__(self, type_, account, nick, reason=None, error=False): self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp - self._label = Gtk.Label() - self._label.set_selectable(True) - self._label.set_line_wrap(True) - self._label.set_xalign(0) - self._label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) + self._label = SimpleLabel() if type_ == 'muc-user-joined': text = self._make_join_message(nick) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -0,0 +1,24 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + + +class SimpleLabel(Gtk.Label): + def __init__(self): + Gtk.Label.__init__(self) + self.set_selectable(True) + self.set_line_wrap(True) + self.set_xalign(0) + self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0f55aa79e74a194afaf21a1f90e3968… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f0f55aa79e74a194afaf21a1f90e3968… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add MUCJoinLeft Row
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 6b7de0c9 by lovetox at 2021-04-29T13:34:05+02:00 Add MUCJoinLeft Row - - - - - 4 changed files: - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/info.py - + gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -911,10 +911,8 @@ def rejoin(self): def _on_user_joined(self, _contact, _signal_name, user_contact, properties): nick = user_contact.name if not properties.is_muc_self_presence: - - if (self.contact.is_joined and - self.contact.settings.get('print_join_left')): - self.add_info_message(_('%s has joined the group chat') % nick) + if self.contact.is_joined: + self.conversation_view.add_muc_user_joined(nick) return status_codes = properties.muc_status_codes or [] @@ -968,7 +966,6 @@ def _on_user_nickname_changed(self, _contact, _signal_name, user_contact, proper # tv.last_received_message_id[nick] # del tv.last_received_message_id[nick] - def _on_user_status_show_changed(self, _contact, _signal_name, @@ -1119,15 +1116,10 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): #Group Chat: We have been removed from the room message = _('{nick} has been removed from the group chat{by}{reason}') - print_join_left = self.contact.settings.get('print_join_left') - if StatusCode.REMOVED_ERROR in status_codes: # Handle 333 before 307, some MUCs add both - if print_join_left: - #Group Chat: User was kicked because of an server error: reason - message = _('{nick} has left due to ' - 'an error{reason}').format(nick=nick, reason=reason) - self.add_info_message(message) + self.conversation_view.add_muc_user_left( + nick, properties.muc_user.reason, error=True) elif StatusCode.REMOVED_KICKED in status_codes: #Group Chat: User was kicked by Alice: reason @@ -1155,10 +1147,9 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): message = message.format(nick=nick, by=actor, reason=reason) self.add_info_message(message) - elif print_join_left: - message = _('{nick} has left{reason}').format(nick=nick, - reason=reason) - self.add_info_message(message) + else: + self.conversation_view.add_muc_user_left( + nick, properties.muc_user.reason) def _on_room_joined(self, _contact, _signal_name): self._show_page('groupchat') ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -33,7 +33,6 @@ def __init__(self, account, text): timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp - self.kind = 'info' text = GLib.markup_escape_text(text) ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -0,0 +1,75 @@ +# 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/>. + +import time +from datetime import datetime + +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common.i18n import _ +from gajim.common.const import AvatarSize + +from .base import BaseRow + + +class MUCJoinLeft(BaseRow): + def __init__(self, type_, account, nick, reason=None, error=False): + BaseRow.__init__(self, account) + + self.type = type_ + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp + + self._label = Gtk.Label() + self._label.set_selectable(True) + self._label.set_line_wrap(True) + self._label.set_xalign(0) + self._label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) + + if type_ == 'muc-user-joined': + text = self._make_join_message(nick) + else: + text = self._make_left_message(nick, reason, error) + + self._label.set_text(text) + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 2, 0, 1, 1) + + self.grid.attach(self._label, 1, 0, 1, 1) + self.show_all() + + @staticmethod + def _make_left_message(nick, reason, error): + reason = '' if reason is None else ': {reason}'.format(reason=reason) + + if error: + #Group Chat: User was kicked because of an server error: reason + message = _('{nick} has left due to ' + 'an error{reason}').format(nick=nick, reason=reason) + + else: + message = _('{nick} has left{reason}').format(nick=nick, + reason=reason) + return message + + @staticmethod + def _make_join_message(nick): + return _('%s has joined the group chat') % nick ===================================== gajim/gtk/conversation/view.py ===================================== @@ -33,6 +33,7 @@ from .conversation.rows.info import InfoMessage from .conversation.rows.date import DateRow from .conversation.rows.muc_subject import MUCSubject +from .conversation.rows.muc_join_left import MUCJoinLeft log = logging.getLogger('gajim.gui.conversation_view') @@ -52,6 +53,7 @@ def __init__(self, account, contact, history_mode=False): Gtk.ListBox.__init__(self) self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_sort_func(self._sort_func) + self.set_filter_func(self._filter_func) self._account = account self._client = None if account is not None: @@ -73,6 +75,11 @@ def __init__(self, account, contact, history_mode=False): # message_id -> row mapping self._message_id_row_map = {} + app.settings.connect_signal('print_join_left', + self._on_contact_setting_changed, + account=self._account, + jid=self._contact.jid) + if self._contact is not None: self._read_marker_row = ReadMarkerRow(self._account, self._contact) self.add(self._read_marker_row) @@ -106,10 +113,29 @@ def _sort_func(self, row1, row2): return 0 return -1 if row1.timestamp < row2.timestamp else 1 + def _filter_func(self, row): + if row.type in ('muc-user-joined', 'muc-user-left'): + return self._contact.settings.get('print_join_left') + return True + def add_muc_subject(self, text, nick, date): subject = MUCSubject(self._account, text, nick, date) self._insert_message(subject) + def add_muc_user_left(self, nick, reason, error=False): + join_left = MUCJoinLeft('muc-user-left', + self._account, + nick, + reason=reason, + error=error) + self._insert_message(join_left) + + def add_muc_user_joined(self, nick): + join_left = MUCJoinLeft('muc-user-joined', + self._account, + nick) + self._insert_message(join_left) + def add_info_message(self, text): message = InfoMessage(self._account, text) self._insert_message(message) @@ -364,3 +390,6 @@ def show_error(self, id_, error): def on_quote(self, text): self.emit('quote', text) + + def _on_contact_setting_changed(self, *args): + self.invalidate_filter() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b7de0c9408bdc5ba1c65795fc384acd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b7de0c9408bdc5ba1c65795fc384acd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Enabling/Disabling Accounts
by Philipp Hörist 29 Apr '21

29 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 827a5008 by lovetox at 2021-04-29T11:13:26+02:00 Fix Enabling/Disabling Accounts - - - - - 12 changed files: - gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/accounts.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py - gajim/gtk/main.py - gajim/gtk/main_stack.py - gajim/gtk/roster.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/account_page.py ===================================== @@ -19,13 +19,13 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.nec import EventHelper from .roster import Roster from .status_selector import StatusSelector from .notification_manager import NotificationManager from .util import get_builder from .util import open_window +from .util import EventHelper ROSTER_MENU_DICT = { 'show-offline': _('Show Offline Contacts'), ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -35,7 +35,10 @@ def add_account(self, account): self.add(Account(account)) def remove_account(self, account): - pass + for row in self.get_children(): + if row.account == account: + row.destroy() + return @staticmethod def _on_row_activated(_listbox, row): @@ -97,6 +100,7 @@ def __init__(self, account): self._contact.connect('avatar-update', self._on_avatar_update) self._contact.connect('presence-update', self._on_presence_update) + self.connect('destroy', self._on_destroy) self._update_image() def _on_presence_update(self, _contact, _signal_name): @@ -110,3 +114,7 @@ def _update_image(self): self.get_scale_factor(), style='round-corners') self.set_from_surface(surface) + + def _on_destroy(self, *args): + self._contact.disconnect_all_from_obj(self) + app.check_finalize(self) ===================================== gajim/gtk/accounts.py ===================================== @@ -23,6 +23,7 @@ from gi.repository import GObject from gajim.common import app +from gajim.common import ged from gajim.common import passwords from gajim.common.i18n import _ from gajim.common.i18n import Q_ @@ -535,9 +536,19 @@ def _set_label(self, active): self._switch_state_label.set_text(text) def _on_enable_switch(self, switch, state, account): + def _on_disconnect(event): + if event.account != account: + return + app.ged.remove_event_handler('account-disconnected', + ged.CORE, + _on_disconnect) + app.interface.disable_account(account) + def _disable(): + app.ged.register_event_handler('account-disconnected', + ged.CORE, + _on_disconnect) app.connections[account].change_status('offline', 'offline') - app.interface.disable_account(account) switch.set_state(state) self._set_label(state) ===================================== gajim/gtk/chat_list.py ===================================== @@ -168,6 +168,12 @@ def remove_chat(self, account, jid): self.remove(row) row.destroy() + def remove_chats_for_account(self, account): + for row_account, jid in list(self._chats.keys()): + if row_account != account: + continue + self.remove_chat(account, jid) + def get_selected_chat(self): row = self.get_selected_row() if row is None: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -102,12 +102,17 @@ def get_chatlist(self, workspace_id): return self._chat_lists[workspace_id] def get_selected_chat(self): + chat_list = self.get_current_chat_list() + if chat_list is None: + return None + return chat_list.get_selected_chat() + + def get_current_chat_list(self): workspace_id = self.get_visible_child_name() if workspace_id == 'empty': return None - chat_list = self._chat_lists[workspace_id] - return chat_list.get_selected_chat() + return self._chat_lists[workspace_id] def is_chat_active(self, account, jid): chat = self.get_selected_chat() @@ -202,6 +207,11 @@ def remove_chat(self, workspace_id, account, jid): self.store_open_chats(workspace_id) self.emit('chat-removed', account, jid, type_) + def remove_chats_for_account(self, account): + for workspace_id, chat_list in self._chat_lists.items(): + chat_list.remove_chats_for_account(account) + self.store_open_chats(workspace_id) + def _find_chat(self, account, jid): for chat_list in self._chat_lists.values(): if chat_list.contains_chat(account, jid): ===================================== gajim/gtk/chat_page.py ===================================== @@ -235,6 +235,14 @@ def _on_chat_removed(self, _chat_list, account, jid, type_): client = app.get_client(account) client.get_module('MUC').leave(jid) + def remove_chats_for_account(self, account): + chat_list = self._chat_list_stack.get_current_chat_list() + if chat_list is not None: + chat_list.unselect_all() + + self._chat_list_stack.remove_chats_for_account(account) + self._chat_stack.remove_chats_for_account(account) + def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -91,3 +91,9 @@ def clear(self): def process_event(self, event): control = self.get_control(event.account, event.jid) control.process_event(event) + + def remove_chats_for_account(self, account): + for chat_account, jid in list(self._controls.keys()): + if chat_account != account: + continue + self.remove_chat(account, jid) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -1273,12 +1273,6 @@ def shutdown(self, reason=None): app.plugin_manager.remove_gui_extension_point( 'groupchat_control', self) - # They can already be removed by the destroy function - # TODO remove - if self.room_jid in app.contacts.get_gc_list(self.account): - app.contacts.remove_room(self.account, self.room_jid) - del app.gc_connected[self.account][self.room_jid] - self.roster.destroy() self.roster = None ===================================== gajim/gtk/main.py ===================================== @@ -74,6 +74,8 @@ def __init__(self): ('muc-disco-update', ged.GUI1, self._on_event), ('our-show', ged.GUI1, self._on_our_show), ('signed-in', ged.GUI1, self._on_signed_in), + ('account-enabled', ged.GUI1, self._on_account_enabled), + ('account-disabled', ged.GUI1, self._on_account_disabled), ]) self._load_chats() @@ -81,6 +83,17 @@ def __init__(self): self._add_actions2() self.show_all() + def _on_account_enabled(self, event): + self._account_side_bar.add_account(event.account) + self._main_stack.add_account_page(event.account) + + def _on_account_disabled(self, event): + workspace_id = self._workspace_side_bar.get_first_workspace() + self.activate_workspace(workspace_id) + self._account_side_bar.remove_account(event.account) + self._main_stack.remove_account_page(event.account) + self._main_stack.remove_chats_for_account(event.account) + @staticmethod def _on_our_show(event): if event.show == 'offline': ===================================== gajim/gtk/main_stack.py ===================================== @@ -24,13 +24,25 @@ class MainStack(Gtk.Stack): def __init__(self): Gtk.Stack.__init__(self) + self.add_named(Gtk.Box(), 'empty') + self._chat_page = ChatPage() self._chat_page.connect('chat-selected', self._on_chat_selected) self.add_named(self._chat_page, 'chats') for account in list(app.connections.keys()): - account_page = AccountPage(account) - self.add_named(account_page, account) + self.add_account_page(account) + + def add_account_page(self, account): + account_page = AccountPage(account) + self.add_named(account_page, account) + + def remove_account_page(self, account): + account_page = self.get_child_by_name(account) + account_page.destroy() + + def remove_chats_for_account(self, account): + self._chat_page.remove_chats_for_account(account) def show_chats(self, workspace_id): self._chat_page.show_workspace_chats(workspace_id) @@ -46,7 +58,10 @@ def get_chat_page(self): return self.get_child_by_name('chats') def process_event(self, event): + empty_box = self.get_child_by_name('empty') for page in self.get_children(): + if page is empty_box: + continue page.process_event(event) def _on_chat_selected(self, *args): ===================================== gajim/gtk/roster.py ===================================== @@ -615,8 +615,8 @@ def _on_destroy(self, _roster): self._group_refs.clear() self._unset_model() self._roster = None + self._enable_sort(False) self._store.clear() - self._store.reset_default_sort_func() self._store = None # self._tooltip.destroy() # self._tooltip = None ===================================== gajim/gui_interface.py ===================================== @@ -1417,12 +1417,16 @@ def enable_account(self, account): 'name') app.block_signed_in_notifications[account] = True app.last_message_time[account] = {} - # refresh roster - gui_menu_builder.build_accounts_menu() - app.connections[account].change_status('online', '') app.settings.set_account_setting(account, 'active', True) + gui_menu_builder.build_accounts_menu() app.app.update_app_actions_state() + + app.nec.push_incoming_event(NetworkEvent( + 'account-enabled', + account=account)) + + app.connections[account].change_status('online', '') window = get_app_window('AccountsWindow') if window is not None: GLib.idle_add(window.enable_account, account, True) @@ -1435,6 +1439,15 @@ def disable_account(self, account): continue win.destroy() + app.settings.set_account_setting(account, 'roster_version', '') + app.settings.set_account_setting(account, 'active', False) + gui_menu_builder.build_accounts_menu() + app.app.update_app_actions_state() + + app.nec.push_incoming_event(NetworkEvent( + 'account-disabled', + account=account)) + if account == app.ZEROCONF_ACC_NAME: app.connections[account].disable_account() app.connections[account].cleanup() @@ -1450,11 +1463,6 @@ def disable_account(self, account): del app.newly_added[account] del app.last_message_time[account] - app.settings.set_account_setting(account, 'roster_version', '') - gui_menu_builder.build_accounts_menu() - app.settings.set_account_setting(account, 'active', False) - app.app.update_app_actions_state() - def remove_account(self, account): if app.settings.get_account_setting(account, 'active'): self.disable_account(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/827a500840a2c6a5ffd75b6bd32ab5fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/827a500840a2c6a5ffd75b6bd32ab5fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MUCSubject: Add styling
by Daniel Brötzmann 28 Apr '21

28 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 0589c500 by wurstsalat at 2021-04-28T22:15:50+02:00 MUCSubject: Add styling - - - - - 6 changed files: - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/data/style/default-dark.css ===================================== @@ -9,7 +9,8 @@ color: rgb(200, 200, 200); } .gajim-status-message { - color: rgb(140, 175, 210); + color: rgb(205, 225, 255); + background: rgb(40, 60, 80); } .gajim-url { color: rgb(60, 135, 220); ===================================== gajim/data/style/default.css ===================================== @@ -9,7 +9,8 @@ color: rgb(85, 85, 85); } .gajim-status-message { - color: rgb(100, 130, 160); + color: rgb(40, 70, 100); + background: rgb(225, 235, 250); } .gajim-url { color: rgb(30, 75, 135); ===================================== gajim/data/style/gajim.css ===================================== @@ -75,6 +75,10 @@ .conversation-date-row { padding: 12px; } +.conversation-subject-box { + border-radius: 6px; + padding: 12px; +} .conversation-meta { color: @insensitive_fg_color; font-size: small; ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -807,17 +807,15 @@ def _on_room_subject(self, _contact, _signal_name, properties): self._subject_data = properties - text = _('%(nick)s has set the subject to %(subject)s') % { - 'nick': properties.muc_nickname, 'subject': properties.subject} - + date = None if properties.user_timestamp: date = time.strftime('%c', time.localtime(properties.user_timestamp)) - text = '%s - %s' % (text, date) if (app.settings.get('show_subject_on_join') or not self.contact.is_joining): - self.conversation_view.add_muc_subject(text) + self.conversation_view.add_muc_subject( + properties.subject, properties.muc_nickname, date) def _on_room_config_changed(self, _contact, _signal_name, properties): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -18,6 +18,8 @@ from gi.repository import GLib from gi.repository import Gtk +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ from gajim.common.styling import process from .base import BaseRow @@ -28,7 +30,7 @@ class MUCSubject(BaseRow): type = 'muc-subject' - def __init__(self, account, text): + def __init__(self, account, text, nick, date): BaseRow.__init__(self, account) timestamp = time.time() @@ -37,16 +39,35 @@ def __init__(self, account, text): text = GLib.markup_escape_text(text) - # avatar_placeholder = Gtk.Box() - # avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) - # self.grid.attach(avatar_placeholder, 0, 0, 1, 2) - timestamp_widget = self.create_timestamp_widget(self.timestamp) - timestamp_widget.set_valign(Gtk.Align.START) - self.grid.attach(timestamp_widget, 2, 0, 1, 1) + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + + subject_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + subject_box.get_style_context().add_class('conversation-subject-box') + subject_box.get_style_context().add_class('gajim-status-message') + + title = Gtk.Label(label=_('Subject')) + title.set_halign(Gtk.Align.START) + title.get_style_context().add_class('bold') + subject_box.add(title) + + meta_str = _('Changed by %s') % nick + if date is not None: + meta_str = f'{meta_str} ({date})' + meta = Gtk.Label(label=meta_str) + meta.set_halign(Gtk.Align.START) + meta.get_style_context().add_class('small-label') + subject_box.add(meta) result = process(text) message_widget = MessageWidget(account) message_widget.add_content(result) + subject_box.add(message_widget) + self.grid.attach(subject_box, 1, 0, 1, 1) + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 2, 0, 1, 1) - self.grid.attach(message_widget, 1, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -106,8 +106,8 @@ def _sort_func(self, row1, row2): return 0 return -1 if row1.timestamp < row2.timestamp else 1 - def add_muc_subject(self, text): - subject = MUCSubject(self._account, text) + def add_muc_subject(self, text, nick, date): + subject = MUCSubject(self._account, text, nick, date) self._insert_message(subject) def add_info_message(self, text): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0589c50026094c05de5d5aa5e1a1d8a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0589c50026094c05de5d5aa5e1a1d8a2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Remove old History Dialog
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 701007c7 by lovetox at 2021-04-28T13:13:00+02:00 Remove old History Dialog - - - - - 6 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gtk/const.py - gajim/gtk/controls/base.py - − gajim/gtk/history.py - gajim/gtk/main.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -301,16 +301,6 @@ def start_chat(_action, param): app.interface.new_chat_from_jid(account, jid) -def on_browse_history(_action, param): - jid, account = None, None - if param is not None: - dict_ = param.unpack() - jid = dict_.get('jid') - account = dict_.get('account') - - open_window('HistoryWindow', account=account, jid=jid) - - def on_groupchat_join(_action, param): account, jid = param.get_strv() open_window('GroupchatJoin', account=account, jid=jid) ===================================== gajim/application.py ===================================== @@ -420,7 +420,6 @@ def add_actions(self): ('open-link', 'as', app_actions.open_link), ('open-mail', 's', app_actions.open_mail), ('create-groupchat', 's', app_actions.on_create_gc), - ('browse-history', 'a{sv}', app_actions.on_browse_history), ('groupchat-join', 'as', app_actions.on_groupchat_join), ] ===================================== gajim/gtk/const.py ===================================== @@ -113,7 +113,6 @@ def __str__(self): 'SingleMessageWindow': 'gajim.gui.single_message', 'Bookmarks': 'gajim.gui.bookmarks', 'AccountWizard': 'gajim.gui.account_wizard', - 'HistoryWindow': 'gajim.gui.history', 'ManageProxies': 'gajim.gui.proxies', 'ManageSounds': 'gajim.gui.manage_sounds', 'ServiceDiscoveryWindow': 'gajim.gui.discovery', ===================================== gajim/gtk/controls/base.py ===================================== @@ -477,13 +477,6 @@ def _sec_labels_received(self, event): self.xml.label_selector.show_all() def delegate_action(self, action): - if action == 'browse-history': - dict_ = {'jid': GLib.Variant('s', str(self.contact.jid)), - 'account': GLib.Variant('s', self.account)} - variant = GLib.Variant('a{sv}', dict_) - app.app.activate_action('browse-history', variant) - return Gdk.EVENT_STOP - if action == 'clear-chat': self.conversation_view.clear() return Gdk.EVENT_STOP ===================================== gajim/gtk/history.py deleted ===================================== @@ -1,627 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> -# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -# Travis Shirk <travis AT pobox.com> -# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# -# 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/>. - -import time -import datetime -from enum import IntEnum -from enum import unique - -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib - -from gajim.common import app -from gajim.common import helpers -from gajim.common.i18n import _ -from gajim.common.const import KindConstant -from gajim.common.exceptions import PysqliteOperationalError - -# from gajim import conversation_textview - -from .conversation.view import ConversationView -from .util import python_month -from .util import gtk_month -from .util import resize_window -from .util import move_window -from .util import get_icon_name -from .util import get_completion_liststore -from .util import get_builder -from .util import scroll_to_end - -from .dialogs import ErrorDialog - - -@unique -class InfoColumn(IntEnum): - '''Completion dict''' - JID = 0 - ACCOUNT = 1 - NAME = 2 - COMPLETION = 3 - - -@unique -class Column(IntEnum): - LOG_JID = 0 - CONTACT_NAME = 1 - UNIXTIME = 2 - MESSAGE = 3 - TIME = 4 - LOG_LINE_ID = 5 - - -class HistoryWindow(Gtk.ApplicationWindow): - def __init__(self, account=None, jid=None): - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_title(_('Conversation History')) - - self.account = account - self.jid = jid - - self._client = app.get_client(account) - self._contact = None - if jid is not None: - self._contact = self._client.get_module('Contacts').get_contact( - jid) - - self._ui = get_builder('history_window.ui') - self.add(self._ui.history_box) - - self._conversation_view = ConversationView( - account, self._contact, history_mode=True) - self._ui.scrolledwindow.add(self._conversation_view) - self._ui.scrolledwindow.set_focus_vadjustment(Gtk.Adjustment()) - - self._clearing_search = False - self._first_day = None - self._last_day = None - - self._completion_dict = {} - self._accounts_seen_online = [] # Update dict when new accounts connect - self._jids_to_search = [] - - # This will load history too - task = self._fill_completion_dict() - GLib.idle_add(next, task) - - if jid: - self._ui.query_entry.set_text(jid) - else: - self._load_history(None) - - resize_window(self, - app.settings.get('history_window_width'), - app.settings.get('history_window_height')) - move_window(self, - app.settings.get('history_window_x-position'), - app.settings.get('history_window_y-position')) - - self._ui.connect_signals(self) - self.connect('delete-event', self._on_delete) - self.connect('destroy', self._on_destroy) - self.connect('key-press-event', self._on_key_press) - self.show_all() - - # PluginSystem: adding GUI extension point for - # HistoryWindow instance object - app.plugin_manager.gui_extension_point( - 'history_window', self) - - def _on_delete(self, _widget, *args): - self._save_state() - - def _on_destroy(self, _widget): - app.plugin_manager.remove_gui_extension_point( - 'history_window', self) - - def _on_key_press(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: - if self._ui.results_scrolledwindow.get_visible(): - self._ui.results_scrolledwindow.set_visible(False) - return - self._save_state() - self.destroy() - - def _on_jid_entry_match_selected(self, _widget, model, iter_, *args): - self._jid_entry_search(model[iter_][1]) - return True - - def _on_query_combo_changed(self, combo): - # only if selected from combobox - jid = self._ui.query_entry.get_text() - if jid == combo.get_active_id(): - self._jid_entry_search(jid) - - def _on_jid_entry_activate(self, entry): - self._jid_entry_search(entry.get_text()) - - def _jid_entry_search(self, jid): - self._load_history(jid, self.account) - self._ui.results_scrolledwindow.set_visible(False) - - def _fill_completion_dict(self): - """ - Fill completion_dict for key auto completion. Then load history for - current jid (by calling another function) - - Key will be either jid or full_completion_name (contact name or long - description like "pm-contact from groupchat...."). - - {key : (jid, account, nick_name, full_completion_name} - This is a generator and does pseudo-threading via idle_add(). - """ - liststore = get_completion_liststore(self._ui.query_entry) - liststore.set_sort_column_id(1, Gtk.SortType.ASCENDING) - self._ui.query_entry.get_completion().connect( - 'match-selected', self._on_jid_entry_match_selected) - - self._ui.query_combo.set_model(liststore) - - # Add all jids in logs.db: - db_jids = app.storage.archive.get_jids_in_db() - completion_dict = dict.fromkeys(db_jids) - - self._accounts_seen_online = list(app.settings.get_active_accounts()) - - # Enhance contacts of online accounts with contact. - # Needed for mapping below - for account in self._accounts_seen_online: - completion_dict.update( - helpers.get_contact_dict_for_account(account)) - - muc_active_icon = get_icon_name('muc-active') - online_icon = get_icon_name('online') - - keys = list(completion_dict.keys()) - # Move the actual jid at first so we load history faster - actual_jid = self._ui.query_entry.get_text() - if actual_jid in keys: - keys.remove(actual_jid) - keys.insert(0, actual_jid) - if '' in keys: - keys.remove('') - if None in keys: - keys.remove(None) - # Map jid to info tuple - # Warning : This for is time critical with big DB - for key in keys: - completed = key - completed2 = None - contact = completion_dict[completed] - if contact: - info_name = contact.name - info_completion = info_name - info_jid = contact.jid - else: - # Corresponding account is offline, we know nothing - info_name = completed.split('@')[0] - info_completion = completed - info_jid = completed - - info_acc = self._get_account_for_jid(info_jid) - - if (app.storage.archive.jid_is_room_jid(completed) or - app.storage.archive.jid_is_from_pm(completed)): - icon = muc_active_icon - if app.storage.archive.jid_is_from_pm(completed): - # It's PM. Make it easier to find - room, nick = app.get_room_and_nick_from_fjid(completed) - info_completion = '%s from %s' % (nick, room) - completed = info_completion - info_completion2 = '%s/%s' % (room, nick) - completed2 = info_completion2 - info_name = nick - else: - icon = online_icon - - if len(completed) > 70: - completed = completed[:70] + '[\u2026]' - liststore.append((icon, completed)) - self._completion_dict[key] = ( - info_jid, info_acc, info_name, info_completion) - self._completion_dict[completed] = ( - info_jid, info_acc, info_name, info_completion) - if completed2: - if len(completed2) > 70: - completed2 = completed2[:70] + '[\u2026]' - liststore.append((icon, completed2)) - self._completion_dict[completed2] = ( - info_jid, info_acc, info_name, info_completion2) - if key == actual_jid: - self._load_history(info_jid, self.account or info_acc) - yield True - keys.sort() - yield False - - @staticmethod - def _get_account_for_jid(jid): - """ - Return the corresponding account of the jid. May be None if an account - could not be found - """ - accounts = app.settings.get_active_accounts() - account = None - for acc in accounts: - jid_list = app.contacts.get_jid_list(acc) - gc_list = app.contacts.get_gc_list(acc) - if jid in jid_list or jid in gc_list: - account = acc - break - return account - - def _load_history(self, jid_or_name, account=None): - """ - Load history for the given jid/name and show it - """ - if jid_or_name and jid_or_name in self._completion_dict: - # a full qualified jid or a contact name was entered - info_jid, info_account, _info_name, info_completion = self._completion_dict[jid_or_name] - self._jids_to_search = [info_jid] - self.jid = info_jid - - if account: - self.account = account - else: - self.account = info_account - if self.account is None: - # We don't know account. Probably a gc not opened or an - # account not connected. - # Disable possibility to say if we want to log or not - self._ui.store_history_switch.set_sensitive(False) - else: - # Are logs disabled for account ? - no_log_for = app.settings.get_account_setting( - self.account, 'no_log_for').split(' ') - if self.account in no_log_for: - self._ui.store_history_switch.set_active(False) - self._ui.store_history_switch.set_sensitive(False) - else: - # Are logs disabled for jid ? - self._ui.store_history_switch.set_active( - str(self.jid) not in no_log_for) - self._ui.store_history_switch.set_sensitive(True) - - self._jids_to_search = [info_jid] - - # Get first/last date we have logs with contact - self.first_log = app.storage.archive.get_first_date_that_has_logs( - self.account, self.jid) - self._first_day = self._get_date_from_timestamp(self.first_log) - self.last_log = app.storage.archive.get_last_date_that_has_logs( - self.account, self.jid) - self._last_day = self._get_date_from_timestamp(self.last_log) - - # Select logs for last date we have logs with contact - self._ui.search_menu_button.set_sensitive(True) - month = gtk_month(self._last_day.month) - self._ui.calendar.select_month(month, self._last_day.year) - self._ui.calendar.select_day(self._last_day.day) - - self._ui.button_previous_day.set_sensitive(True) - self._ui.button_next_day.set_sensitive(True) - self._ui.button_first_day.set_sensitive(True) - self._ui.button_last_day.set_sensitive(True) - - self._ui.search_entry.set_sensitive(True) - self._ui.search_entry.grab_focus() - - self._ui.query_entry.set_text(info_completion) - - else: - # neither a valid jid, nor an existing contact name was entered - # we have got nothing to show or to search in - self.jid = None - self.account = None - - self._ui.search_entry.set_sensitive(False) - self._ui.store_history_switch.set_sensitive(False) - self._ui.search_menu_button.set_sensitive(False) - self._ui.calendar.clear_marks() - self._ui.button_previous_day.set_sensitive(False) - self._ui.button_next_day.set_sensitive(False) - self._ui.button_first_day.set_sensitive(False) - self._ui.button_last_day.set_sensitive(False) - - self._ui.results_scrolledwindow.set_visible(False) - - def _on_day_selected(self, *args): - if not self.jid: - return - year, month, day = self._ui.calendar.get_date() # integers - month = python_month(month) - date_str = datetime.date(year, month, day).strftime('%x') - self._ui.date_label.set_text(date_str) - self._load_conversation(year, month, day) - GLib.idle_add(scroll_to_end, self._ui.scrolledwindow) - - def _on_month_changed(self, calendar): - """ - Ask for days in this month, if they have logs it bolds them - (marks them) - """ - if not self.jid: - return - year, month, _day = calendar.get_date() # integers - if year < 2000: - calendar.select_month(0, 2000) - calendar.select_day(1) - return - - calendar.clear_marks() - month = python_month(month) - - try: - log_days = app.storage.archive.get_days_with_logs( - self.account, self.jid, year, month) - except PysqliteOperationalError as err: - ErrorDialog(_('Disk Error'), str(err)) - return - - for date in log_days: - calendar.mark_day(date.day) - - @staticmethod - def _get_date_from_timestamp(timestamp): - # Conversion from timestamp to date - log = time.localtime(timestamp) - year, mmonth, day = log[0], log[1], log[2] - date = datetime.datetime(year, mmonth, day) - return date - - def _change_date(self, button): - year, month, day = self._ui.calendar.get_date() - python_m = python_month(month) - date_ = datetime.datetime(year, python_m, day) - - if button is self._ui.button_first_day: - gtk_m = gtk_month(self._first_day.month) - self._ui.calendar.select_month(gtk_m, self._first_day.year) - self._ui.calendar.select_day(self._first_day.day) - return - - if button is self._ui.button_last_day: - gtk_m = gtk_month(self._last_day.month) - self._ui.calendar.select_month(gtk_m, self._last_day.year) - self._ui.calendar.select_day(self._last_day.day) - return - - if button is self._ui.button_previous_day: - end_date = self._first_day - timedelta = datetime.timedelta(days=-1) - if end_date >= date_: - return - - if button is self._ui.button_next_day: - end_date = self._last_day - timedelta = datetime.timedelta(days=1) - if end_date <= date_: - return - - # Iterate through days until log entry found or - # supplied end_date (first_log / last_log) reached - logs = None - while logs is None: - date_ = date_ + timedelta - if date_ == end_date: - break - try: - logs = app.storage.archive.get_date_has_logs( - self.account, self.jid, date_) - except PysqliteOperationalError as err: - ErrorDialog(_('Disk Error'), str(err)) - return - - gtk_m = gtk_month(date_.month) - self._ui.calendar.select_month(gtk_m, date_.year) - self._ui.calendar.select_day(date_.day) - - def _load_conversation(self, year, month, day): - """ - Load the conversation between `self.jid` and `self.account` held on the - given date into the history textbuffer. Values for `month` and `day` - are 1-based. - """ - self._conversation_view.clear() - - show_status = self._ui.show_status_checkbutton.get_active() - date = datetime.datetime(year, month, day) - - messages = app.storage.archive.get_messages_for_date( - self.account, self.jid, date) - for msg in messages: - if not show_status and msg.kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): - continue - if not msg.message and msg.kind not in (KindConstant.STATUS, - KindConstant.GCSTATUS): - continue - - kind = 'status' - contact_name = msg.contact_name - if msg.kind in ( - KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): - kind = 'incoming' - contact_name = self._contact.name - elif msg.kind == KindConstant.GC_MSG: - kind = 'incoming' - elif msg.kind in ( - KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): - kind = 'outgoing' - contact_name = app.nicks[self.account] - - self._conversation_view.add_message( - msg.message, - kind, - contact_name, - msg.time, - subject=msg.subject, - additional_data=msg.additional_data, - history=True, - log_line_id=msg.log_line_id) - - def _on_search_complete_history(self, _widget): - self._ui.date_label.get_style_context().remove_class('tagged') - - def _on_search_in_date(self, _widget): - self._ui.date_label.get_style_context().add_class('tagged') - - def _on_search_entry_activate(self, entry): - text = entry.get_text() - - model = self._ui.results_treeview.get_model() - self._clearing_search = True - model.clear() - self._clearing_search = False - - if text == '': - self._ui.results_scrolledwindow.set_visible(False) - return - - self._ui.results_scrolledwindow.set_visible(True) - - # perform search in preselected jids - # jids are preselected with the query_combo - for jid in self._jids_to_search: - account = self._completion_dict[jid][InfoColumn.ACCOUNT] - if account is None: - # We do not know an account. This can only happen if - # the contact is offine, or if we browse a groupchat history. - # The account is not needed, a dummy can be set. - # This may leed to wrong self nick in the displayed history - account = list(app.settings.get_active_accounts())[0] - - date = None - if self._ui.search_in_date.get_active(): - year, month, day = self._ui.calendar.get_date() # integers - month = python_month(month) - date = datetime.datetime(year, month, day) - - show_status = self._ui.show_status_checkbutton.get_active() - - results = app.storage.archive.search_log(account, jid, text, date) - result_found = False - # FIXME: - # add "subject: | message: " in message column if kind is single - # also do we need show at all? (we do not search on subject) - for row in results: - if not show_status and row.kind in (KindConstant.GCSTATUS, - KindConstant.STATUS): - continue - - contact_name = row.contact_name - if not contact_name: - if row.kind == KindConstant.CHAT_MSG_SENT: - contact_name = app.nicks[account] - else: - contact_name = self._completion_dict[jid][InfoColumn.NAME] - - local_time = time.localtime(row.time) - date = time.strftime('%Y-%m-%d', local_time) - - result_found = True - model.append((str(jid), contact_name, date, row.message, - str(row.time), str(row.log_line_id))) - - if result_found: - self._ui.results_treeview.set_cursor(0) - - def _on_results_cursor_changed(self, treeview): - """ - A row was selected, get date from row, and select it in calendar - which results to showing conversation logs for that date - """ - if self._clearing_search: - return - - # get currently selected date - cur_year, cur_month, cur_day = self._ui.calendar.get_date() - cur_month = python_month(cur_month) - model, paths = treeview.get_selection().get_selected_rows() - - if not paths: - return - - path = paths[0] - # make it a tuple (Y, M, D, 0, 0, 0...) - tim = time.strptime(model[path][Column.UNIXTIME], '%Y-%m-%d') - year = tim[0] - gtk_m = tim[1] - month = gtk_month(gtk_m) - day = tim[2] - - # switch to belonging logfile if necessary - log_jid = model[path][Column.LOG_JID] - if log_jid != self.jid: - self._load_history(log_jid, None) - - # avoid rerunning mark days algo if same month and year! - if year != cur_year or gtk_m != cur_month: - self._ui.calendar.select_month(month, year) - - if year != cur_year or gtk_m != cur_month or day != cur_day: - self._ui.calendar.select_day(day) - - self._scroll_to_message_and_highlight(model[path][Column.LOG_LINE_ID]) - - def _scroll_to_message_and_highlight(self, log_line_id): - for row in self._conversation_view.iter_rows(): - row.get_style_context().remove_class( - 'conversation-search-highlight') - - row = self._conversation_view.get_row_by_log_line_id(int(log_line_id)) - if row is not None: - row.get_style_context().add_class('conversation-search-highlight') - # This scrolls the ListBox to the highlighted row - row.grab_focus() - self._ui.results_treeview.grab_focus() - - def _on_log_history(self, switch, *args): - jid = str(self.jid) - oldlog = True - no_log_for = app.settings.get_account_setting( - self.account, 'no_log_for').split() - if jid in no_log_for: - oldlog = False - log = switch.get_active() - if not log and jid not in no_log_for: - no_log_for.append(jid) - if log and jid in no_log_for: - no_log_for.remove(jid) - if oldlog != log: - app.settings.set_account_setting( - self.account, 'no_log_for', ' '.join(no_log_for)) - - def _on_show_status(self, _widget): - # Reload logs - self._on_day_selected(None) - - def _save_state(self): - x_pos, y_pos = self.get_window().get_root_origin() - width, height = self.get_size() - app.settings.set('history_window_x-position', x_pos) - app.settings.set('history_window_y-position', y_pos) - app.settings.set('history_window_width', width) - app.settings.set('history_window_height', height) ===================================== gajim/gtk/main.py ===================================== @@ -116,7 +116,6 @@ def _add_actions2(self): 'change-nickname', 'change-subject', 'escape', - 'browse-history', 'send-file', 'show-contact-info', 'show-emoji-chooser', @@ -141,7 +140,6 @@ def _add_actions2(self): ] disabled_for_emacs = ( - 'browse-history', 'send-file', 'close-tab' ) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/701007c7ff0fb997972b8e4acd76f5e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/701007c7ff0fb997972b8e4acd76f5e2… 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