Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Start Chat: Introduce account badges
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 368c2923 by Daniel Brötzmann at 2020-05-16T11:16:36+02:00 Start Chat: Introduce account badges - - - - - d03a45ce by Daniel Brötzmann at 2020-05-16T11:16:38+02:00 Groupchat Invite: Use account badge - - - - - 59f0403f by Daniel Brötzmann at 2020-05-16T11:16:38+02:00 ChatControl: Use account badge - - - - - 8 changed files: - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css - gajim/gtk/css_config.py - gajim/gtk/groupchat_invite.py - gajim/gtk/start_chat.py - gajim/gtk/util.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -60,6 +60,7 @@ from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray from gajim.gtk.util import get_hardware_key_codes from gajim.gtk.util import get_builder +from gajim.gtk.util import generate_account_badge from gajim.gtk.const import ControlType # pylint: disable=unused-import from gajim.gtk.emoji_chooser import emoji_chooser @@ -140,11 +141,11 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self._accounts = app.get_enabled_accounts_with_labels() if len(self._accounts) > 1: - self.xml.account_image.set_tooltip_text( - app.get_account_label(self.account)) - account_class = app.css_config.get_dynamic_class(self.account) - self.xml.account_image.get_style_context().add_class(account_class) - self.xml.account_image.show() + 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() # Init DND self.TARGET_TYPE_URI_LIST = 80 ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">110</property> <property name="step_increment">1</property> @@ -449,6 +449,25 @@ <property name="top_attach">1</property> </packing> </child> + <child> + <object class="GtkBox" id="account_badge"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -546,20 +565,6 @@ <property name="position">5</property> </packing> </child> - <child> - <object class="GtkImage" id="account_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> - <property name="icon_name">org.gajim.Gajim-symbolic</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -567,9 +572,6 @@ <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> <style> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkMenu" id="formattings_menu"> @@ -151,14 +151,17 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkImage" id="account_image"> + <object class="GtkBox" id="account_badge"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> <property name="halign">end</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> + <property name="valign">center</property> + <property name="margin_end">6</property> <property name="hexpand">True</property> - <property name="icon_name">org.gajim.Gajim-symbolic</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">0</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -260,6 +260,18 @@ button.flat.link { padding: 0; border: 0; } /*Image Preview*/ .preview-image { box-shadow: 0px 0px 3px 0px alpha(@theme_text_color, 0.2); } +/* Badge */ +.badge { + color: rgb(242, 242, 242); + padding-left: 6px; + padding-right: 6px; + padding-top: 2px; + padding-bottom: 2px; + border-radius: 4px; + font-size: 80%; + font-weight: bold; +} + /* Treeview */ .adhoc-treeview { padding: 5px; } .adhoc-scrolled { border: 1px solid; border-color:@unfocused_borders; } ===================================== gajim/gtk/css_config.py ===================================== @@ -538,7 +538,7 @@ class CSSConfig(): for index, account in enumerate(accounts): color = app.config.get_per('accounts', account, 'account_color') css_class = 'gajim_class_%s' % index - css += '.%s { color: %s }\n' % (css_class, color) + css += '.%s { background-color: %s }\n' % (css_class, color) self._dynamic_dict[account] = css_class self._dynamic_provider.load_from_data(css.encode()) ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -26,6 +26,7 @@ from gajim.common.const import AvatarSize from gajim.common.helpers import validate_jid from gajim.gtk.util import get_builder +from gajim.gtk.util import generate_account_badge class GroupChatInvite(Gtk.Box): @@ -296,8 +297,8 @@ class ContactRow(Gtk.ListBoxRow): image.set_size_request(AvatarSize.ROSTER, AvatarSize.ROSTER) grid.add(image) - middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) - middle_box.set_hexpand(True) + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + box.set_hexpand(True) if self.name is None: self.name = _('Invite New Contact') @@ -308,7 +309,18 @@ class ContactRow(Gtk.ListBoxRow): self.name_label.set_width_chars(20) self.name_label.set_halign(Gtk.Align.START) self.name_label.get_style_context().add_class('bold16') - middle_box.add(self.name_label) + 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.set_halign(Gtk.Align.END) + account_badge.set_valign(Gtk.Align.START) + account_badge.set_hexpand(True) + name_box.add(account_badge) + box.add(name_box) self.jid_label = Gtk.Label(label=jid) self.jid_label.set_tooltip_text(jid) @@ -317,22 +329,9 @@ class ContactRow(Gtk.ListBoxRow): self.jid_label.set_width_chars(22) self.jid_label.set_halign(Gtk.Align.START) self.jid_label.get_style_context().add_class('dim-label') - middle_box.add(self.jid_label) - - grid.add(middle_box) - - if show_account: - account_icon = Gtk.Image.new_from_icon_name( - 'org.gajim.Gajim-symbolic', Gtk.IconSize.MENU) - account_icon.set_tooltip_text( - _('Account: %s' % self.account_label)) - account_class = app.css_config.get_dynamic_class(account) - account_icon.get_style_context().add_class(account_class) + box.add(self.jid_label) - right_box = Gtk.Box() - right_box.set_vexpand(True) - right_box.add(account_icon) - grid.add(right_box) + grid.add(box) self.add(grid) self.show_all() ===================================== gajim/gtk/start_chat.py ===================================== @@ -37,6 +37,7 @@ from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.util import get_builder from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import get_icon_name +from gajim.gtk.util import generate_account_badge class Search(IntEnum): @@ -136,8 +137,8 @@ class StartChatDialog(Gtk.ApplicationWindow): for bookmark in bookmarks: jid = str(bookmark.jid) name = get_groupchat_name(con, jid) - rows.append(ContactRow(account, None, jid, - name, show_account, True)) + rows.append(ContactRow(account, None, jid, name, show_account, + groupchat=True)) def _load_contacts(self, rows): generator = self._incremental_add(rows) @@ -401,7 +402,8 @@ class StartChatDialog(Gtk.ApplicationWindow): show_account = len(self._accounts) > 1 row = ContactRow(account, None, '', None, show_account) self.new_contact_rows[account] = row - group_row = ContactRow(account, None, '', None, show_account, True) + group_row = ContactRow(account, None, '', None, show_account, + groupchat=True) self.new_groupchat_rows[account] = group_row self._ui.listbox.add(row) self._ui.listbox.add(group_row) @@ -609,8 +611,8 @@ class ContactRow(Gtk.ListBoxRow): image.set_size_request(AvatarSize.CHAT, AvatarSize.CHAT) grid.add(image) - middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) - middle_box.set_hexpand(True) + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + box.set_hexpand(True) if self.name is None: if self.groupchat: @@ -624,7 +626,17 @@ class ContactRow(Gtk.ListBoxRow): self.name_label.set_width_chars(20) self.name_label.set_halign(Gtk.Align.START) self.name_label.get_style_context().add_class('bold16') - middle_box.add(self.name_label) + 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.set_halign(Gtk.Align.END) + account_badge.set_valign(Gtk.Align.START) + account_badge.set_hexpand(True) + name_box.add(account_badge) + box.add(name_box) self.jid_label = Gtk.Label(label=jid) self.jid_label.set_tooltip_text(jid) @@ -633,21 +645,9 @@ class ContactRow(Gtk.ListBoxRow): self.jid_label.set_width_chars(22) self.jid_label.set_halign(Gtk.Align.START) self.jid_label.get_style_context().add_class('dim-label') - middle_box.add(self.jid_label) - - grid.add(middle_box) + box.add(self.jid_label) - if show_account: - account_icon = Gtk.Image.new_from_icon_name( - 'org.gajim.Gajim-symbolic', Gtk.IconSize.MENU) - account_icon.set_tooltip_text( - _('Account: %s' % self.account_label)) - account_class = app.css_config.get_dynamic_class(account) - account_icon.get_style_context().add_class(account_class) - right_box = Gtk.Box() - right_box.set_vexpand(True) - right_box.add(account_icon) - grid.add(right_box) + grid.add(box) self.add(grid) self.show_all() ===================================== gajim/gtk/util.py ===================================== @@ -660,6 +660,19 @@ 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'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0eef5cc126fcd80b144873f7389c88… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0eef5cc126fcd80b144873f7389c88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] IPython: Simplify code
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c0eef5cc by André Apitzsch at 2020-05-16T06:55:21+02:00 IPython: Simplify code IPython 6.5 is the first version that is Python 3.7 compatible. https://ipython.readthedocs.io/en/stable/whatsnew/version6.html#ipython-6-5… - - - - - 1 changed file: - gajim/dev/ipython_view.py Changes: ===================================== gajim/dev/ipython_view.py ===================================== @@ -61,7 +61,6 @@ import sys import os from io import StringIO from functools import reduce -from pkg_resources import parse_version from gi.repository import Gtk from gi.repository import Gdk @@ -170,12 +169,6 @@ class IterableIPShell: # Workaround for updating namespace with sys.modules # self.__update_namespace() - - # Avoid using input splitter when not really needed. - # Perhaps it could work even before 5.8.0 - # But it definitely does not work any more with >= 7.0.0 - self.no_input_splitter = parse_version(IPython.release.version) >= \ - parse_version('5.8.0') self.lines = [] def __update_namespace(self): @@ -208,28 +201,21 @@ class IterableIPShell: self.IP.rl_do_indent = True try: - line = self.IP.raw_input(self.prompt) + self.IP.raw_input(self.prompt) except KeyboardInterrupt: self.IP.write('\nKeyboardInterrupt\n') self.IP.input_splitter.reset() except Exception: self.IP.showtraceback() else: - if self.no_input_splitter: - self.lines.append(self.IP.raw_input(self.prompt)) - self.iter_more = self.IP.check_complete( - '\n'.join(self.lines))[0] == 'incomplete' - else: - self.IP.input_splitter.push(line) - self.iter_more = self.IP.input_splitter.push_accepts_more() + self.lines.append(self.IP.raw_input(self.prompt)) + self.iter_more = self.IP.check_complete( + '\n'.join(self.lines))[0] == 'incomplete' self.prompt = self.generatePrompt(self.iter_more) if not self.iter_more: - if self.no_input_splitter: - source_raw = '\n'.join(self.lines) - self.lines = [] - else: - source_raw = self.IP.input_splitter.raw_reset() + source_raw = '\n'.join(self.lines) + self.lines = [] self.IP.run_cell(source_raw, store_history=True) self.IP.rl_do_indent = False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0eef5cc126fcd80b144873f7389c88c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0eef5cc126fcd80b144873f7389c88c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add shortcut for shortcuts window
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f3c8630 by André Apitzsch at 2020-05-16T00:15:34+02:00 Add shortcut for shortcuts window Follow https://gitlab.gnome.org/GNOME/Initiatives/-/issues/14 - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -545,6 +545,7 @@ class GajimApplication(Gtk.Application): def _set_shortcuts(self): shortcuts = { 'app.quit': ['<Primary>Q'], + 'app.shortcuts': ['<Primary>question'], 'app.preferences': ['<Primary>P'], 'app.plugins': ['<Primary>E'], 'app.xml-console': ['<Primary><Shift>X'], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f3c86305c1342e83f03324d1a8053fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f3c86305c1342e83f03324d1a8053fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove legacy cairo code
by Philipp Hörist 14 May '20

14 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e450ec35 by André Apitzsch at 2020-05-14T23:08:55+02:00 Remove legacy cairo code - - - - - 3 changed files: - gajim/gajim.py - gajim/gtk/avatar.py - setup.cfg Changes: ===================================== gajim/gajim.py ===================================== @@ -28,7 +28,7 @@ from gajim.common import i18n _MIN_NBXMPP_VER = '0.9.94' _MIN_GTK_VER = '3.22.27' -_MIN_CAIRO_VER = '1.14.0' +_MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== gajim/gtk/avatar.py ===================================== @@ -52,7 +52,7 @@ def generate_avatar(letters, color, size, scale): font_size = size * 0.5 # Set up surface - surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) context = cairo.Context(surface) context.set_source_rgb(color_r, color_g, color_b) @@ -61,26 +61,20 @@ def generate_avatar(letters, color, size, scale): # Draw letters context.select_font_face('sans-serif', - cairo.FONT_SLANT_NORMAL, - cairo.FONT_WEIGHT_NORMAL) + cairo.FontSlant.NORMAL, + cairo.FontWeight.NORMAL) context.set_font_size(font_size) extends = context.text_extents(letters) - if isinstance(extends, tuple): - # For cairo < 1.15 - x_bearing, y_bearing, ex_width, ex_height = extends[0:4] - else: - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height + x_bearing = extends.x_bearing + y_bearing = extends.y_bearing + ex_width = extends.width + ex_height = extends.height x_pos = width / 2 - (ex_width / 2 + x_bearing) y_pos = height / 2 - (ex_height / 2 + y_bearing) context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) - # use cairo.OPERATOR_OVER legacy constant because its - # compatible with cairo < 1.13 - context.set_operator(cairo.OPERATOR_OVER) + context.set_operator(cairo.Operator.OVER) context.show_text(letters) return context.get_target() @@ -90,7 +84,7 @@ def add_status_to_avatar(surface, show): width = surface.get_width() height = surface.get_height() - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) new_surface.set_device_scale(*surface.get_device_scale()) scale = surface.get_device_scale()[0] @@ -128,7 +122,7 @@ def square(surface, size): if width == height: return surface - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, size, size) + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, size, size) new_surface.set_device_scale(*surface.get_device_scale()) context = cairo.Context(new_surface) @@ -147,7 +141,7 @@ def square(surface, size): def clip_circle(surface): - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, surface.get_width(), surface.get_height()) ===================================== setup.cfg ===================================== @@ -25,7 +25,7 @@ install_requires = nbxmpp>=0.9.94 precis-i18n>=1.0.0 pyOpenSSL>=16.2 - pycairo>=1.14.0 + pycairo>=1.16.0 [options.package_data] gajim = View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e450ec352e1a763d33e5455d258e2eb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e450ec352e1a763d33e5455d258e2eb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add DTLS-SRTP namespace (XEP-320)
by Philipp Hörist 13 May '20

13 May '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ae1ebadd by André Apitzsch at 2020-05-12T23:30:50+02:00 Add DTLS-SRTP namespace (XEP-320) - - - - - 1 changed file: - nbxmpp/namespaces.py Changes: ===================================== nbxmpp/namespaces.py ===================================== @@ -81,6 +81,7 @@ class _Namespaces: IDLE: str = 'urn:xmpp:idle:1' JINGLE: str = 'urn:xmpp:jingle:1' JINGLE_BYTESTREAM: str = 'urn:xmpp:jingle:transports:s5b:1' + JINGLE_DTLS: str = 'urn:xmpp:jingle:apps:dtls:0' JINGLE_ERRORS: str = 'urn:xmpp:jingle:errors:1' JINGLE_FILE_TRANSFER: str = 'urn:xmpp:jingle:apps:file-transfer:3' JINGLE_FILE_TRANSFER_5: str = 'urn:xmpp:jingle:apps:file-transfer:5' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ae1ebaddb949e5b74c34e22f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ae1ebaddb949e5b74c34e22f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Add a codespell ignore list
by Philipp Hörist 13 May '20

13 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8dcf632f by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Add a codespell ignore list - - - - - c3511db9 by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Add a CI pass for codespell This avoids future typos. - - - - - c0785403 by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Remove � characters from emoji data - - - - - e23cbe36 by Emmanuel Gil Peyrot at 2020-05-13T23:25:21+02:00 Fix typos Thanks codespell! - - - - - 30 changed files: - .gitlab-ci.yml - + codespell.conf - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/contacts.py - gajim/common/exceptions.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/jingle_xtls.py - gajim/common/logger.py - gajim/common/logging_helpers.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/base.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/blocking.py - gajim/common/modules/bytestream.py - gajim/common/modules/chatstates.py - gajim/common/modules/entity_time.py - gajim/common/modules/httpupload.py - gajim/common/modules/jingle.py - gajim/common/modules/message.py - gajim/common/modules/misc.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/privacylists.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f261b49561adda5e5c9785f1e863a66… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f261b49561adda5e5c9785f1e863a66… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Contacts: Don't delete list while reading it
by Philipp Hörist 13 May '20

13 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f261b495 by André Apitzsch at 2020-05-13T22:17:33+02:00 Contacts: Don't delete list while reading it - - - - - 1 changed file: - gajim/common/contacts.py Changes: ===================================== gajim/common/contacts.py ===================================== @@ -670,7 +670,7 @@ class Contacts(): for _contact in self._contacts[old_jid]: _contact.jid = new_jid self._contacts[new_jid].append(_contact) - del self._contacts[old_jid] + del self._contacts[old_jid] def get_combined_chatstate(self, jid): if jid not in self._contacts: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f261b49561adda5e5c9785f1e863a66a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f261b49561adda5e5c9785f1e863a66a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove obsolete method
by Philipp Hörist 13 May '20

13 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 71b2936c by lovetox at 2020-05-13T21:07:50+02:00 Remove obsolete method - - - - - b43f5bc6 by lovetox at 2020-05-13T21:12:32+02:00 RosterTooltip: Show correct account status Fixes #10100 - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -374,11 +374,6 @@ def get_file_path_from_dnd_dropped_uri(uri): path = path[5:] # 5 is len('file:') return path -def get_xmpp_show(show): - if show in ('online', 'offline'): - return None - return show - def sanitize_filename(filename): """ Make sure the filename we will write does contain only acceptable and latin @@ -888,7 +883,8 @@ def get_accounts_info(): accounts = [] accounts_list = sorted(app.contacts.get_accounts()) for account in accounts_list: - status = app.connections[account].status + + status = get_connection_status(account) message = app.connections[account].status_message single_line = get_uf_show(status) if message is None: ===================================== gajim/gtk/tooltips.py ===================================== @@ -35,6 +35,7 @@ from gi.repository import Pango from gajim.common import app from gajim.common import helpers +from gajim.common.helpers import get_connection_status from gajim.common.const import AvatarSize from gajim.common.const import PEPEventType from gajim.common.i18n import Q_ @@ -308,7 +309,7 @@ class RosterTooltip(StatusTable): jid=jid, account=account, name=account_name, - show=connection.status, + show=get_connection_status(account), status=connection.status_message, resource=connection.get_own_jid().getResource(), priority=connection.priority) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e28a70ac8b47a181099e05dc8e7886b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e28a70ac8b47a181099e05dc8e7886b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Reintroduce merge accounts setting
by Philipp Hörist 12 May '20

12 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e28a70ac by Daniel Brötzmann at 2020-05-12T19:10:31+02:00 Preferences: Reintroduce merge accounts setting - - - - - 2 changed files: - gajim/data/gui/preferences_window.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment_status_auto_away"> @@ -398,6 +398,24 @@ <property name="margin_top">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="merge_accounts_checkbutton"> + <property name="label" translatable="yes">Me_rge accounts</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Displays all your accounts merged into a single one</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_merge_accounts_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> <property name="label" translatable="yes">Show a_vatars of contacts in contact list</property> @@ -413,7 +431,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -431,7 +449,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -449,7 +467,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -507,7 +525,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> ===================================== gajim/gtk/preferences.py ===================================== @@ -100,6 +100,10 @@ class Preferences(Gtk.ApplicationWindow): self._ui.tabs_placement.set_active(3) ## Contact List Appearance + # Merge accounts + st = app.config.get('mergeaccounts') + self._ui.merge_accounts_checkbutton.set_active(st) + # Display avatars in roster st = app.config.get('show_avatars_in_roster') self._ui.show_avatars_in_roster_checkbutton.set_active(st) @@ -590,6 +594,10 @@ class Preferences(Gtk.ApplicationWindow): else: # right app.config.set('tabs_position', 'right') + def on_merge_accounts_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'mergeaccounts') + app.app.activate_action('merge') + def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') app.interface.roster.setup_and_draw_roster() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e28a70ac8b47a181099e05dc8e7886b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e28a70ac8b47a181099e05dc8e7886b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Start Chat: Use Start Chat instead of Add Contact
by Philipp Hörist 12 May '20

12 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52d0da5a by Daniel Brötzmann at 2020-05-12T18:12:36+02:00 Start Chat: Use Start Chat instead of Add Contact - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -616,7 +616,7 @@ class ContactRow(Gtk.ListBoxRow): if self.groupchat: self.name = _('Join Group Chat') else: - self.name = _('Add Contact') + self.name = _('Start Chat') self.name_label = Gtk.Label(label=self.name) self.name_label.set_ellipsize(Pango.EllipsizeMode.END) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52d0da5a89fbee6ac6fc62ee7e3fff3b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/52d0da5a89fbee6ac6fc62ee7e3fff3b… 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