Commits April 2021

commits@gajim.org

1 participants
60 discussions

[Git][gajim/gajim][mainwindow] Reduce icon size
by Philipp Hörist 30 Apr '21

30 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a01126c2 by lovetox at 2021-04-30T22:11:12+02:00 Reduce icon size - - - - - 1 changed file: - gajim/gtk/conversation/rows/muc_user_status.py Changes: ===================================== gajim/gtk/conversation/rows/muc_user_status.py ===================================== @@ -47,7 +47,7 @@ def __init__(self, account, user_contact, is_self): show_icon.set_opacity(0.6) surface = get_show_circle( user_contact.show.value, - AvatarSize.SHOW_CIRCLE, + 16, self.get_scale_factor()) show_icon.set_from_surface(surface) self.grid.attach(show_icon, 1, 0, 1, 1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a01126c2b2345d1bd99519d7ca8b5505… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a01126c2b2345d1bd99519d7ca8b5505… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Accounts: Use SpinSetting for custom port
by Philipp Hörist 30 Apr '21

30 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: a5fc50ca by lovetox at 2021-04-30T17:47:48+02:00 Accounts: Use SpinSetting for custom port Fixes #10541 - - - - - 2 changed files: - gajim/gtk/accounts.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -965,9 +965,10 @@ def __init__(self, account, parent): SettingType.ACCOUNT_CONFIG, 'custom_host', bind='account::use_custom_host'), - Setting(SettingKind.ENTRY, _('Port'), + Setting(SettingKind.SPIN, _('Port'), SettingType.ACCOUNT_CONFIG, 'custom_port', - bind='account::use_custom_host'), + bind='account::use_custom_host', + props={'range_': (0, 65535)},), Setting(SettingKind.COMBO, _('Type'), SettingType.ACCOUNT_CONFIG, 'custom_type', ===================================== gajim/gtk/settings.py ===================================== @@ -497,7 +497,7 @@ def __init__(self, *args, range_): self.spin.set_numeric(True) self.spin.set_update_policy(Gtk.SpinButtonUpdatePolicy.IF_VALID) self.spin.set_value(self.setting_value) - self.spin.set_halign(Gtk.Align.END) + self.spin.set_halign(Gtk.Align.FILL) self.spin.set_valign(Gtk.Align.CENTER) self.spin.connect('notify::value', self.on_value_change) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5fc50ca5d1a8c3f8662dc57e966e5dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5fc50ca5d1a8c3f8662dc57e966e5dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Add start of MessageLabel impl
by Philipp Hörist 30 Apr '21

30 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 9813f847 by lovetox at 2021-04-30T10:45:52+02:00 Add start of MessageLabel impl - - - - - db76bece by lovetox at 2021-04-30T14:05:20+02:00 Add Links to MessageLabel - - - - - 3 changed files: - gajim/common/styling.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/util.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -3,6 +3,8 @@ from dataclasses import dataclass from dataclasses import field +from gi.repository import GLib + PRE = '`' STRONG = '*' STRIKE = '~' @@ -41,23 +43,28 @@ class StyleObject: text: str +class URIMarkup: + def get_markup_string(self): + return f'<a href="{self.text}">{self.text}</a>' + + @dataclass -class Uri(StyleObject): +class Uri(StyleObject, URIMarkup): name: str = field(default='uri', init=False) @dataclass -class Address(StyleObject): +class Address(StyleObject, URIMarkup): name: str = field(default='address', init=False) @dataclass -class XMPPAddress(StyleObject): +class XMPPAddress(StyleObject, URIMarkup): name: str = field(default='xmppadr', init=False) @dataclass -class MailAddress(StyleObject): +class MailAddress(StyleObject, URIMarkup): name: str = field(default='mailadr', init=False) @@ -135,7 +142,7 @@ def process(text, nested=False): blocks = _parse_blocks(text, nested) for block in blocks: if isinstance(block, PlainBlock): - offset = block.start + offset = 0 for line in block.text.splitlines(keepends=True): block.spans += _parse_line(line, offset) block.uris += _parse_uris(line, offset) ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -29,6 +29,7 @@ from gajim.common.i18n import _ from .util import get_cursor +from .util import make_pango_attribute URI_TAGS = ['uri', 'address', 'xmppadr', 'mailadr'] @@ -42,11 +43,38 @@ def __init__(self, account): self._account = account - self._textview = MessageTextview(self._account) - self.add(self._textview) + # self._text_widget = MessageTextview(self._account) + self._text_widget = MessageLabel(self._account) + self.add(self._text_widget) def add_content(self, block): - self._textview.print_text_with_styling(block) + self._text_widget.print_text_with_styling(block) + + +class MessageLabel(Gtk.Label): + def __init__(self, account): + Gtk.Label.__init__(self) + self.set_hexpand(True) + self.set_selectable(True) + self.set_line_wrap(True) + self.set_xalign(0) + self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) + self.set_track_visited_links(False) + + self._account = account + + def print_text_with_styling(self, block): + text = GLib.markup_escape_text(block.text.strip()) + for uri in block.uris: + text = text.replace(uri.text, uri.get_markup_string()) + + attr_list = Pango.AttrList() + for span in block.spans: + attr = make_pango_attribute(span.name, span.start, span.end) + attr_list.insert(attr) + + self.set_markup(text) + self.set_attributes(attr_list) class MessageTextview(Gtk.TextView): ===================================== gajim/gtk/util.py ===================================== @@ -906,3 +906,21 @@ def refresh(self): 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) + + +def make_pango_attribute(name, start, end): + if name == 'strong': + attr = Pango.attr_weight_new(Pango.Weight.BOLD) + if name == 'strike': + attr = Pango.attr_strikethrough_new(True) + if name == 'emphasis': + attr = Pango.attr_style_new(Pango.Style.ITALIC) + if name == 'pre': + attr = Pango.attr_family_new('monospace') + + else: + ValueError('unknown attribute %s', name) + + attr.start_index = start + attr.end_index = end + return attr View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d74e7bf5d74c4dcfd85a27bb1694b3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d74e7bf5d74c4dcfd85a27bb1694b3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: MUCJoinLeft: Use brighter colors in dark mode
by Daniel Brötzmann 29 Apr '21

29 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 74653d70 by wurstsalat at 2021-04-29T22:42:18+02:00 MUCJoinLeft: Use brighter colors in dark mode - - - - - 55009009 by wurstsalat at 2021-04-29T22:44:32+02:00 QuoteWidget: Fix deprecation warning - - - - - d74e7bf5 by wurstsalat at 2021-04-29T23:07:33+02:00 MUCUserStatus: Add styling - - - - - 3 changed files: - gajim/data/style/default-dark.css - gajim/gtk/conversation/quote_widget.py - gajim/gtk/conversation/rows/muc_user_status.py Changes: ===================================== gajim/data/style/default-dark.css ===================================== @@ -28,10 +28,10 @@ color: rgb(80, 95, 230); } .gajim-user-disconnected { - color: rgb(80, 30, 30); + color: rgb(230, 170, 170); } .gajim-user-connected { - color: rgb(30, 80, 50); + color: rgb(160, 200, 170); } .gajim-roster-disconnected { background: rgb(80, 30, 30); ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -23,7 +23,7 @@ def __init__(self, account): self.get_style_context().add_class('conversation-quote') quote_bar = Gtk.Box() quote_bar.set_size_request(3, -1) - quote_bar.set_margin_right(6) + quote_bar.set_margin_end(6) quote_bar.get_style_context().add_class('conversation-quote-bar') self.add(quote_bar) ===================================== gajim/gtk/conversation/rows/muc_user_status.py ===================================== @@ -20,10 +20,15 @@ from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common import helpers +from gajim.common.styling import process from .widgets import SimpleLabel from .base import BaseRow +from ..message_widget import MessageWidget + +from ...avatar import get_show_circle + class MUCUserStatus(BaseRow): def __init__(self, account, user_contact, is_self): @@ -38,15 +43,26 @@ def __init__(self, account, user_contact, is_self): 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) + show_icon = Gtk.Image() + show_icon.set_opacity(0.6) + surface = get_show_circle( + user_contact.show.value, + AvatarSize.SHOW_CIRCLE, + self.get_scale_factor()) + show_icon.set_from_surface(surface) + self.grid.attach(show_icon, 1, 0, 1, 1) self._label = SimpleLabel() - self._label.set_text(self._make_text(user_contact, is_self)) + self._label.set_text(self._make_show_text(user_contact, is_self)) self._label.get_style_context().add_class('gajim-status-message') self.grid.attach(self._label, 2, 0, 1, 1) + if user_contact.status is not None: + result = process(user_contact.status) + message_widget = MessageWidget(account) + message_widget.add_content(result) + self.grid.attach(message_widget, 2, 1, 1, 1) + timestamp_widget = self.create_timestamp_widget(self.timestamp) timestamp_widget.set_hexpand(True) timestamp_widget.set_halign(Gtk.Align.END) @@ -56,18 +72,14 @@ def __init__(self, account, user_contact, is_self): self.show_all() @staticmethod - def _make_text(user_contact, is_self): + def _make_show_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) + message = _('You are now {show}').format(show=show) else: - message = _('{nick} is now {show}{status}').format(nick=nick, - show=show, - status=status) + message = _('{nick} is now {show}').format(nick=nick, + show=show) return message View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e40936f5b1051510a4bb308b189ba93… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e40936f5b1051510a4bb308b189ba93… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2021