Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_1.2] 1.1.99
by Philipp Hörist 27 Apr '20

27 Apr '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 0a638ee7 by lovetox at 2020-04-27T14:47:05+02:00 1.1.99 Beta release - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.95" +__version__ = "1.1.99" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a638ee7f06a0a6da1f62362541507b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0a638ee7f06a0a6da1f62362541507b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] Revert "1.2.91"
by Philipp Hörist 27 Apr '20

27 Apr '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: dec2f0f2 by Philipp Hörist at 2020-04-27T14:46:12+02:00 Revert "1.2.91" This reverts commit b35ad01cde5ebc1964e5bd27b8beb836c53ae995 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.2.91" +__version__ = "1.1.95" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dec2f0f2320a17facbd998de72370005… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dec2f0f2320a17facbd998de72370005… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 1.2.91
by Philipp Hörist 27 Apr '20

27 Apr '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: b35ad01c by lovetox at 2020-04-27T14:43:42+02:00 1.2.91 Start of 1.3 development cycle - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.95" +__version__ = "1.2.91" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b35ad01cde5ebc1964e5bd27b8beb836… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b35ad01cde5ebc1964e5bd27b8beb836… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch gajim_1.2
by Philipp Hörist 26 Apr '20

26 Apr '20

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

1 0

[Git][gajim/gajim][master] Roster: Fix comment
by Philipp Hörist 26 Apr '20

26 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7d5ee612 by lovetox at 2020-04-26T20:49:11+02:00 Roster: Fix comment - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -2257,7 +2257,7 @@ class RosterWindow: liststore = self.status_combobox.get_model() # Check if a desync'ed status entry and separator is currently - # in the liststore remove it. + # in the liststore and remove it. while len(liststore) > 9: titer = liststore.get_iter_first() liststore.remove(titer) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7d5ee6122e8618cdda52067f78accde5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7d5ee6122e8618cdda52067f78accde5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Show correct status after status change
by Philipp Hörist 26 Apr '20

26 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: aa931580 by lovetox at 2020-04-26T20:45:51+02:00 Roster: Show correct status after status change Fixes #10077 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -2243,13 +2243,22 @@ class RosterWindow: def update_status_combobox(self): # table to change index in connection.connected to index in combobox - table = {'offline':8, 'connecting':8, 'error': 8, 'online':0, 'chat':1, 'away':2, - 'xa':3, 'dnd':4} + table = { + 'offline':8, + 'connecting':8, + 'error': 8, + 'online':0, + 'chat':1, + 'away':2, + 'xa':3, + 'dnd':4 + } liststore = self.status_combobox.get_model() - # we check if there are more options in the combobox that it should - # if yes, we remove the first ones - while len(liststore) > len(table)+2: + + # Check if a desync'ed status entry and separator is currently + # in the liststore remove it. + while len(liststore) > 9: titer = liststore.get_iter_first() liststore.remove(titer) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa931580b4d0f048c7c281333182c2a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa931580b4d0f048c7c281333182c2a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: GroupchatInvite: Use icon to display account
by Philipp Hörist 26 Apr '20

26 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 80cb70b1 by Daniel Brötzmann at 2020-04-26T12:35:11+02:00 GroupchatInvite: Use icon to display account - - - - - 2073080a by Daniel Brötzmann at 2020-04-26T12:36:48+02:00 StartChat: Use icon to display account - - - - - 30efb17d by Daniel Brötzmann at 2020-04-26T12:48:20+02:00 ChatControlBase: Add account icon if multiple accounts are enabled - - - - - 5 changed files: - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/groupchat_invite.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -138,6 +138,14 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.on_banner_label_populate_popup) self.handlers[id_] = self.xml.banner_label + 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() + # Init DND self.TARGET_TYPE_URI_LIST = 80 uri_entry = Gtk.TargetEntry.new( ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> @@ -547,7 +547,18 @@ </packing> </child> <child> - <placeholder/> + <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> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -150,6 +150,23 @@ <object class="GtkActionBar" id="banner_actionbar"> <property name="visible">True</property> <property name="can_focus">False</property> + <child> + <object class="GtkImage" id="account_image"> + <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="hexpand">True</property> + <property name="icon_name">org.gajim.Gajim-symbolic</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> <style> <class name="actionbar-no-border"/> </style> ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -305,15 +305,16 @@ class ContactRow(Gtk.ListBoxRow): self.name_label = Gtk.Label(label=self.name) self.name_label.set_ellipsize(Pango.EllipsizeMode.END) self.name_label.set_xalign(0) - self.name_label.set_width_chars(25) + 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) self.jid_label = Gtk.Label(label=jid) + self.jid_label.set_tooltip_text(jid) self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) self.jid_label.set_xalign(0) - self.jid_label.set_width_chars(25) + 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) @@ -321,13 +322,16 @@ class ContactRow(Gtk.ListBoxRow): grid.add(middle_box) if show_account: - account_label = Gtk.Label(label=self.account_label) - account_label.set_halign(Gtk.Align.START) - account_label.set_valign(Gtk.Align.START) + 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_label) + right_box.add(account_icon) grid.add(right_box) self.add(grid) ===================================== gajim/gtk/start_chat.py ===================================== @@ -621,15 +621,16 @@ class ContactRow(Gtk.ListBoxRow): self.name_label = Gtk.Label(label=self.name) self.name_label.set_ellipsize(Pango.EllipsizeMode.END) self.name_label.set_xalign(0) - self.name_label.set_width_chars(25) + 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) self.jid_label = Gtk.Label(label=jid) + self.jid_label.set_tooltip_text(jid) self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) self.jid_label.set_xalign(0) - self.jid_label.set_width_chars(25) + 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) @@ -637,13 +638,15 @@ class ContactRow(Gtk.ListBoxRow): grid.add(middle_box) if show_account: - account_label = Gtk.Label(label=self.account_label) - account_label.set_halign(Gtk.Align.START) - account_label.set_valign(Gtk.Align.START) - + 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_label) + right_box.add(account_icon) grid.add(right_box) self.add(grid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2c2c058e3a44f814c1a460fea2f16ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2c2c058e3a44f814c1a460fea2f16ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CSSConfig: Generate dynamic classes
by Philipp Hörist 26 Apr '20

26 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c2c058e by lovetox at 2020-04-26T12:17:22+02:00 CSSConfig: Generate dynamic classes CSSConfig now generates classes for account colors at start so we can use them later easily - - - - - 3 changed files: - gajim/gtk/css_config.py - gajim/gtk/settings.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/css_config.py ===================================== @@ -85,6 +85,16 @@ class CSSConfig(): # User Theme CSS Provider self._provider = Gtk.CssProvider() + # Used for dynamic classes like account colors + self._dynamic_provider = Gtk.CssProvider() + self._dynamic_dict = {} + self.refresh() + + Gtk.StyleContext.add_provider_for_screen( + Gdk.Screen.get_default(), + self._dynamic_provider, + CSSPriority.APPLICATION) + # Cache of recently requested values self._cache = {} @@ -97,6 +107,7 @@ class CSSConfig(): self._load_default() self._load_selected() self._activate_theme() + Gtk.StyleContext.add_provider_for_screen( Gdk.Screen.get_default(), self._provider, @@ -520,3 +531,17 @@ class CSSConfig(): def _invalidate_cache(self): self._cache = {} + + def refresh(self): + css = '' + accounts = app.get_accounts_sorted() + 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) + self._dynamic_dict[account] = css_class + + self._dynamic_provider.load_from_data(css.encode()) + + def get_dynamic_class(self, name): + return self._dynamic_dict[name] ===================================== gajim/gtk/settings.py ===================================== @@ -362,6 +362,7 @@ class ColorSetting(GenericSetting): def on_color_set(self, button): rgba = button.get_rgba() self.set_value(rgba.to_string()) + app.css_config.refresh() def on_row_activated(self): self.color_button.grab_focus() ===================================== gajim/gui_interface.py ===================================== @@ -1695,6 +1695,7 @@ class Interface: for opt in config: app.config.set_per('accounts', account, opt, config[opt]) + app.css_config.refresh() # refresh accounts window # Action must be added before account window is updated app.app.add_account_actions(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c2c058e3a44f814c1a460fea2f16ad1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c2c058e3a44f814c1a460fea2f16ad1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Settings: Add color setting
by Philipp Hörist 25 Apr '20

25 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0ee3674 by Daniel Brötzmann at 2020-04-25T14:36:18+02:00 Settings: Add color setting - - - - - 1ebe0d0d by Daniel Brötzmann at 2020-04-25T14:45:51+02:00 Accounts: Add account colors - - - - - 962e10f5 by Daniel Brötzmann at 2020-04-25T14:45:54+02:00 Migration: Add color for each account - - - - - 39acfc20 by Daniel Brötzmann at 2020-04-25T14:45:54+02:00 Raise Gajim version to 1.1.95 - - - - - 8 changed files: - gajim/__init__.py - gajim/common/config.py - gajim/common/optparser.py - gajim/gtk/accounts.py - gajim/gtk/const.py - gajim/gtk/settings.py - gajim/gtk/util.py - gajim/gui_interface.py Changes: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.1.94" +__version__ = "1.1.95" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): ===================================== gajim/common/config.py ===================================== @@ -270,6 +270,7 @@ class Config: 'accounts': ({ 'name': [opt_str, '', '', True], 'account_label': [opt_str, '', '', False], + 'account_color': [opt_color, 'rgb(85, 85, 85)'], 'hostname': [opt_str, '', '', True], 'anonymous_auth': [opt_bool, False], 'avatar_sha': [opt_str, '', '', False], ===================================== gajim/common/optparser.py ===================================== @@ -29,10 +29,12 @@ import re import logging from pathlib import Path +from gi.repository import Gdk +from nbxmpp.util import text_to_color + from gajim.common import app from gajim.common.i18n import _ - log = logging.getLogger('gajim.c.optparser') @@ -149,6 +151,8 @@ class OptionsParser: self.update_config_to_1193() if old < [1, 1, 94] and new >= [1, 1, 94]: self.update_config_to_1194() + if old < [1, 1, 95] and new >= [1, 1, 95]: + self.update_config_to_1195() app.config.set('version', new_version) @@ -230,3 +234,18 @@ class OptionsParser: app.config.del_per('accounts', account, 'proxy') app.config.set('version', '1.1.94') + + def update_config_to_1195(self): + # Add account color for every account + for account in self.old_values['accounts'].keys(): + username = self.old_values['accounts'][account]['name'] + domain = self.old_values['accounts'][account]['hostname'] + if not (username is None or domain is None): + account_string = '%s@%s' % (username, domain) + # We cannot get the preferred theme at this point + background = (1, 1, 1) + col_r, col_g, col_b = text_to_color(account_string, background) + rgba = Gdk.RGBA(red=col_r, green=col_g, blue=col_b) + color = rgba.to_string() + app.config.set_per('accounts', account, 'account_color', color) + app.config.set('version', '1.1.95') ===================================== gajim/gtk/accounts.py ===================================== @@ -604,6 +604,10 @@ class GeneralPage(GenericSettingPage): SettingType.ACCOUNT_CONFIG, 'account_label', callback=self._on_account_name_change), + Setting(SettingKind.COLOR, _('Color'), + SettingType.ACCOUNT_CONFIG, 'account_color', + desc=_('Recognize your account by color')), + Setting(SettingKind.LOGIN, _('Login'), SettingType.DIALOG, props={'dialog': LoginDialog}), ===================================== gajim/gtk/const.py ===================================== @@ -58,6 +58,7 @@ class SettingKind(IntEnum): CHANGEPASSWORD = 11 COMBO = 12 CHATSTATE_COMBO = 13 + COLOR = 14 @unique ===================================== gajim/gtk/settings.py ===================================== @@ -88,6 +88,7 @@ class SettingsBox(Gtk.ListBox): SettingKind.SPIN: SpinSetting, SettingKind.DIALOG: DialogSetting, SettingKind.ENTRY: EntrySetting, + SettingKind.COLOR: ColorSetting, SettingKind.ACTION: ActionSetting, SettingKind.LOGIN: LoginSetting, SettingKind.FILECHOOSER: FileChooserSetting, @@ -98,7 +99,7 @@ class SettingsBox(Gtk.ListBox): SettingKind.CHANGEPASSWORD: ChangePasswordSetting, SettingKind.COMBO: ComboSetting, SettingKind.CHATSTATE_COMBO: ChatstateComboSetting, - } + } if extend is not None: for setting, callback in extend: @@ -336,6 +337,36 @@ class EntrySetting(GenericSetting): self.entry.grab_focus() +class ColorSetting(GenericSetting): + + __gproperties__ = { + "setting-value": (str, 'Color Value', '', '', + GObject.ParamFlags.READWRITE), + } + + def __init__(self, *args): + GenericSetting.__init__(self, *args) + + rgba = Gdk.RGBA() + rgba.parse(self.setting_value) + self.color_button = Gtk.ColorButton() + self.color_button.set_rgba(rgba) + self.color_button.connect('color-set', self.on_color_set) + self.color_button.set_valign(Gtk.Align.CENTER) + self.color_button.set_halign(Gtk.Align.END) + + self.setting_box.pack_end(self.color_button, True, True, 0) + + self.show_all() + + def on_color_set(self, button): + rgba = button.get_rgba() + self.set_value(rgba.to_string()) + + def on_row_activated(self): + self.color_button.grab_focus() + + class DialogSetting(GenericSetting): __gproperties__ = { ===================================== gajim/gtk/util.py ===================================== @@ -646,6 +646,12 @@ def text_to_color(text): return nbxmpp.util.text_to_color(text, background) +def get_color_for_account(account: str) -> str: + col_r, col_g, col_b = text_to_color(account) + rgba = Gdk.RGBA(red=col_r, green=col_g, blue=col_b) + return rgba.to_string() + + def scale_with_ratio(size, width, height): if height == width: return size, size ===================================== gajim/gui_interface.py ===================================== @@ -106,6 +106,7 @@ from gajim.gtk.util import get_show_in_systray from gajim.gtk.util import open_window from gajim.gtk.util import get_app_window from gajim.gtk.util import get_app_windows +from gajim.gtk.util import get_color_for_account from gajim.gtk.const import ControlType @@ -1669,6 +1670,8 @@ class Interface: config['name'] = username config['resource'] = 'gajim.%s' % helpers.get_random_string(8) config['account_label'] = '%s@%s' % (username, domain) + config['account_color'] = get_color_for_account( + '%s@%s' % (username, domain)) config['hostname'] = domain config['savepass'] = True config['password'] = password View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24d89658f6e0502d0dd101ac28509fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24d89658f6e0502d0dd101ac28509fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] EntityCaps: Correctly handle disco info without node attribute
by Philipp Hörist 25 Apr '20

25 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ac3f42d4 by lovetox at 2020-04-25T15:25:04+02:00 EntityCaps: Correctly handle disco info without node attribute - - - - - 1 changed file: - nbxmpp/modules/entity_caps.py Changes: ===================================== nbxmpp/modules/entity_caps.py ===================================== @@ -52,12 +52,15 @@ class EntityCaps(BaseModule): if self._caps is None: return - if self._node is not None: - if self._node != stanza.getQuerynode(): + node = stanza.getQuerynode() + if node is not None: + if self._node != node: return iq = stanza.buildReply('result') - iq.setQuerynode(self._node) + if node is not None: + iq.setQuerynode(node) + query = iq.getQuery() for identity in self._caps.identities: query.addChild(node=identity.get_node()) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ac3f42d49bb4221e073138c8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ac3f42d49bb4221e073138c8… 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