Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Remove module mock
by Philipp Hörist 10 Mar '21

10 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 135e8063 by lovetox at 2021-03-10T20:39:41+01:00 Remove module mock - - - - - 1 changed file: - gajim/common/modules/__init__.py Changes: ===================================== gajim/common/modules/__init__.py ===================================== @@ -20,7 +20,6 @@ import sys import logging from importlib import import_module -from unittest.mock import MagicMock from gajim.common.types import ConnectionT @@ -91,28 +90,6 @@ ] # type: List[str] -class ModuleMock: - def __init__(self, name: str) -> None: - self._name = name - - # HTTPUpload, .. - self.available = False - - # Blocking - self.blocked = [] # type: List[Any] - - # Delimiter - self.delimiter = '::' - - # Bookmarks - self.bookmarks = {} # type: Dict[Any, Any] - - # Various Modules - self.supported = False - - def __getattr__(self, key: str) -> MagicMock: - return MagicMock() - def register_modules(con: ConnectionT, *args: Any, **kwargs: Any) -> None: if con in _modules: @@ -153,10 +130,7 @@ def send_stored_publish(account: str) -> None: def get(account: str, name: str) -> Any: - try: - return _modules[account][name] - except KeyError: - return ModuleMock(name) + return _modules[account][name] def _load_module(name: str, con: ConnectionT, *args: Any, **kwargs: Any) -> Any: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/135e80639665628f44066632bb1a057a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/135e80639665628f44066632bb1a057a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix add to contact list
by Philipp Hörist 10 Mar '21

10 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7151f8f5 by lovetox at 2021-03-10T20:38:06+01:00 Fix add to contact list - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -821,7 +821,7 @@ def get_roster_menu(account, jid): def get_chat_list_row_menu(workspace_id, account, jid, pinned): client = app.get_client(account) - contact = client.get_module('Contact').get_contact(jid) + contact = client.get_module('Contacts').get_contact(jid) toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') @@ -830,7 +830,8 @@ def get_chat_list_row_menu(workspace_id, account, jid, pinned): (_('Move Chat'), []), ] - if not contact.is_in_roster(): + + if not contact.is_in_roster: menu_items.append(('add-to-roster', _('Add to contact list'))) menu = Gio.Menu() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7151f8f58745cf3bb4102fc2af1ad560… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7151f8f58745cf3bb4102fc2af1ad560… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StatusSelector: Use 'show circles' for icons
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a3946bd2 by wurstsalat at 2021-03-10T18:08:30+01:00 StatusSelector: Use 'show circles' for icons - - - - - 4 changed files: - gajim/common/const.py - gajim/gtk/avatar.py - gajim/gtk/status_selector.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/common/const.py ===================================== @@ -24,7 +24,7 @@ class RowHeaderType(IntEnum): class AvatarSize(IntEnum): TAB = 16 - STATUS_CIRCLE = 24 + SHOW_CIRCLE = 24 ROSTER = 32 ACCOUNT_SIDE_BAR = 40 WORKSPACE = 40 ===================================== gajim/gtk/avatar.py ===================================== @@ -150,6 +150,9 @@ def add_status_to_avatar(surface, show): @lru_cache(maxsize=128) def get_show_circle(show, size, scale): + if not isinstance(show, str): + show = show.value + size = size * scale center = size / 2 radius = size / 3 @@ -157,7 +160,7 @@ def get_show_circle(show, size, scale): surface = cairo.ImageSurface(cairo.Format.ARGB32, size, size) context = cairo.Context(surface) - css_color = get_css_show_class(show.value) + css_color = get_css_show_class(show) color = convert_rgb_string_to_float( app.css_config.get_value(css_color, StyleAttr.COLOR)) @@ -166,7 +169,7 @@ def get_show_circle(show, size, scale): context.arc(center, center, radius, 0, 2 * pi) context.fill() - if show.value == 'dnd': + if show == 'dnd': line_length = radius * 0.65 context.move_to(center - line_length, center) context.line_to(center + line_length, center) ===================================== gajim/gtk/status_selector.py ===================================== @@ -17,12 +17,13 @@ from gajim.common import app from gajim.common import ged +from gajim.common.const import AvatarSize from gajim.common.helpers import get_uf_show from gajim.common.helpers import get_global_show from gajim.common.helpers import statuses_unified from gajim.common.i18n import _ -from .util import get_icon_name +from .avatar import get_show_circle class StatusSelector(Gtk.MenuButton): @@ -33,8 +34,11 @@ def __init__(self, compact=False): self._create_popover() self._current_show_icon = Gtk.Image() - self._current_show_icon.set_from_icon_name( - get_icon_name('offline'), Gtk.IconSize.MENU) + surface = get_show_circle( + 'offline', + AvatarSize.SHOW_CIRCLE, + self.get_scale_factor()) + self._current_show_icon.set_from_surface(surface) box = Gtk.Box(spacing=6) box.add(self._current_show_icon) @@ -77,8 +81,9 @@ def _create_popover(self): Gtk.IconSize.MENU) show_label.set_text_with_mnemonic(_('_Change Status Message')) else: - show_icon.set_from_icon_name(get_icon_name(item), - Gtk.IconSize.MENU) + surface = get_show_circle( + item, AvatarSize.SHOW_CIRCLE, self.get_scale_factor()) + show_icon.set_from_surface(surface) show_label.set_text_with_mnemonic( get_uf_show(item, use_mnemonic=True)) @@ -118,8 +123,10 @@ def update(self, *args, **kwargs): # self.show() show = get_global_show() uf_show = get_uf_show(show) - self._current_show_icon.set_from_icon_name( - get_icon_name(show), Gtk.IconSize.MENU) + + surface = get_show_circle( + show, AvatarSize.SHOW_CIRCLE, self.get_scale_factor()) + self._current_show_icon.set_from_surface(surface) if statuses_unified(): self._current_show_icon.set_tooltip_text(_('Status: %s') % uf_show) if not self._compact: ===================================== gajim/gtk/tooltips.py ===================================== @@ -197,7 +197,7 @@ def _build_resource_grid(self, resources, scale): row_num = 0 for contact in resources: show_surface = get_show_circle( - contact.show, AvatarSize.STATUS_CIRCLE, scale) + contact.show, AvatarSize.SHOW_CIRCLE, scale) show_image = Gtk.Image.new_from_surface(show_surface) show_image.set_halign(Gtk.Align.START) show_image.set_valign(Gtk.Align.CENTER) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3946bd20e51014cf437867d2dfbca89… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3946bd20e51014cf437867d2dfbca89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Implement Add to roster menu entry
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e4ea33fc by Daniel Brötzmann at 2021-03-10T17:49:55+01:00 ChatList: Implement Add to roster menu entry - - - - - 2 changed files: - gajim/gtk/main.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -140,6 +140,7 @@ def _add_actions(self): ('remove-chat', 'as', self._remove_chat), ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), ('move-chat-to-workspace', 'as', self._move_chat_to_workspace), + ('add-to-roster', 'as', self._add_to_roster), ] for action in actions: @@ -441,6 +442,11 @@ def remove_chat(self, account, jid): self._chat_list_stack.remove_chat(workspace_id, account, jid) return + @staticmethod + def _add_to_roster(_action, param): + _workspace, account, jid = param.unpack() + open_window('AddNewContactWindow', account=account, contact_jid=jid) + def chat_exists(self, account, jid): return self._chat_list_stack.contains_chat(account, jid) ===================================== gajim/gui_menu_builder.py ===================================== @@ -820,12 +820,19 @@ def get_roster_menu(account, jid): def get_chat_list_row_menu(workspace_id, account, jid, pinned): + client = app.get_client(account) + contact = client.get_module('Contact').get_contact(jid) + toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') + menu_items = [ ('toggle-chat-pinned', toggle_label), (_('Move Chat'), []), ] + if not contact.is_in_roster(): + menu_items.append(('add-to-roster', _('Add to contact list'))) + menu = Gio.Menu() for item in menu_items: if isinstance(item[1], str): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4ea33fc2fa7ffec174d15e068014833… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4ea33fc2fa7ffec174d15e068014833… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AccountPage: Add avatar and profile button
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 04d02dc3 by Daniel Brötzmann at 2021-03-10T17:05:04+01:00 AccountPage: Add avatar and profile button - - - - - 3 changed files: - gajim/common/const.py - gajim/data/gui/account_page.ui - gajim/gtk/account_page.py Changes: ===================================== gajim/common/const.py ===================================== @@ -33,6 +33,7 @@ class AvatarSize(IntEnum): NOTIFICATION = 48 GROUP_INFO = 100 TOOLTIP = 100 + ACCOUNT_PAGE = 150 VCARD = 200 PUBLISH = 200 ===================================== gajim/data/gui/account_page.ui ===================================== @@ -128,11 +128,54 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkOverlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">missging-image</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + <child type="overlay"> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Edit Profile…</property> + <property name="halign">end</property> + <property name="valign">start</property> + <signal name="clicked" handler="_on_edit_profile" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="account_label"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="label"><name></property> <style> <class name="large-header"/> </style> @@ -140,15 +183,29 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="account_action_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="spacing">12</property> <child> <object class="GtkButton" id="account_settings"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes">Account Settings…</property> + <property name="halign">end</property> <signal name="clicked" handler="_on_account_settings" swapped="no"/> <child> <object class="GtkImage"> @@ -161,19 +218,19 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> <style> <class name="account-page-box"/> </style> ===================================== gajim/gtk/account_page.py ===================================== @@ -16,6 +16,7 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common.const import AvatarSize from gajim.common.i18n import _ from .roster import Roster @@ -32,13 +33,16 @@ class AccountPage(Gtk.Box): def __init__(self, account): Gtk.Box.__init__(self) self._account = account + self._jid = app.get_jid_from_account(account) + client = app.get_client(account) + self._contact = client.get_module('Contacts').get_contact(self._jid) self._ui = get_builder('account_page.ui') self.add(self._ui.paned) self._status_selector = StatusSelector() self._status_selector.set_halign(Gtk.Align.CENTER) - self._ui.account_box.add(self._status_selector) + self._ui.account_action_box.add(self._status_selector) self._roster = Roster(account) self._ui.roster_box.add(self._roster) @@ -56,6 +60,9 @@ def __init__(self, account): self.update() + def _on_edit_profile(self, _button): + open_window('ProfileWindow', account=self._account) + def _on_account_settings(self, _button): window = open_window('AccountsWindow') window.select_account(self._account) @@ -78,6 +85,12 @@ def update(self): account_label = app.settings.get_account_setting( self._account, 'account_label') self._ui.account_label.set_text(account_label) + + surface = self._contact.get_avatar(AvatarSize.ACCOUNT_PAGE, + self.get_scale_factor(), + add_show=False) + self._ui.avatar_image.set_from_surface(surface) + self._status_selector.update() def process_event(self, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/04d02dc3e0b1ab867c1a7fa56fcaa393… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/04d02dc3e0b1ab867c1a7fa56fcaa393… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Improve headers
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b34fceb4 by Daniel Brötzmann at 2021-03-10T12:26:57+01:00 ChatList: Improve headers - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -233,9 +233,12 @@ .header-box label { padding: 12px 18px 6px 18px; font-weight: bold; - color:@insensitive_fg_color; + color: @insensitive_fg_color; font-size: small; } +.header-box-first label { + padding: 0px 18px 6px 18px; +} /* VCardWindow */ .VCard-GtkLinkButton { padding-left: 5px; border-left: none; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -488,3 +488,4 @@ def __init__(self): BaseHeader.__init__(self, RowHeaderType.PINNED, _('Pinned')) + self.get_style_context().add_class('header-box-first') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b34fceb4968cc4f684feab61ab1424fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b34fceb4968cc4f684feab61ab1424fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] WorkspaceSidebar: Add name to tooltip
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9cff8f97 by Daniel Brötzmann at 2021-03-10T12:17:54+01:00 WorkspaceSidebar: Add name to tooltip - - - - - 1 changed file: - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -292,3 +292,5 @@ def update(self): surface = app.interface.avatar_storage.get_workspace_surface( self._workspace_id, AvatarSize.WORKSPACE, scale) self.set_from_surface(surface) + name = app.settings.get_workspace_setting(self._workspace_id, 'name') + self.set_tooltip_text(name) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9cff8f9751f48684e450875f86f46dfa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9cff8f9751f48684e450875f86f46dfa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Improve style for account identifier bar
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 48fe77ad by Daniel Brötzmann at 2021-03-10T12:10:40+01:00 Improve style for account identifier bar - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -40,8 +40,7 @@ /* Generic elements */ .account-identifier-bar { - border-top-right-radius: 6px; - border-bottom-right-radius: 6px; + border-radius: 6px; } .selection-bar { border-top-right-radius: 6px; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48fe77ad86586429ea481048205612b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48fe77ad86586429ea481048205612b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AccountSidebar: Improve icons
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f764114c by Daniel Brötzmann at 2021-03-10T11:47:30+01:00 AccountSidebar: Improve icons - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/account_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -107,13 +107,13 @@ /* Account sidebar */ .account-sidebar { - background: transparent; - margin-right: 12px; + background: transparent; + margin-right: 6px; margin-bottom: 6px; } .account-sidebar-item { - padding-top: 6px; - padding-bottom: 6px; + padding-top: 3px; + padding-bottom: 3px; } .account-sidebar-item:hover, .account-sidebar-item:selected, @@ -124,10 +124,15 @@ } .account-sidebar-item:selected image, .account-sidebar-item:hover image { - box-shadow: 0 0 5px @theme_selected_bg_color; + background-color: shade(@theme_base_color, 0.8); } .account-sidebar-item image { border-radius: 9px; + padding: 3px; +} +.account-sidebar-item .account-identifier-bar { + padding: 0 3px; + margin: 3px 0; } .account-box > separator { background-color: darker(@theme_bg_color); ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -52,7 +52,7 @@ def __init__(self, account): self._account_color_bar.get_style_context().add_class( 'account-identifier-bar') - account_box = Gtk.Box(spacing=6) + account_box = Gtk.Box(spacing=3) account_box.set_tooltip_text( _('Account: %s') % app.get_account_label(account)) account_box.add(self._account_color_bar) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f764114cfa9875244d9ceb1977e9df11… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f764114cfa9875244d9ceb1977e9df11… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Main: Use popover menu
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3221cdcb by Daniel Brötzmann at 2021-03-10T09:24:33+01:00 Main: Use popover menu - - - - - 6b08a106 by Daniel Brötzmann at 2021-03-10T09:56:50+01:00 WorkspaceSidebar: Improve Add button styling - - - - - 4 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -180,7 +180,6 @@ <property name="can-focus">True</property> <property name="focus-on-click">False</property> <property name="receives-default">True</property> - <property name="use-popover">False</property> <child> <object class="GtkImage"> <property name="visible">True</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -97,11 +97,12 @@ border-bottom: 1px solid #4e9a06; } .workspace-add { - padding-left: 6px; + padding-left: 3px; color: alpha(@theme_text_color, 0.7); + background-color: shade(@theme_base_color, 0.9); } .workspace-sidebar-item:hover .workspace-add { - -gtk-icon-shadow: 0 0 3px @theme_selected_bg_color; + background-color: shade(@theme_base_color, 0.85); } /* Account sidebar */ ===================================== gajim/gtk/main.py ===================================== @@ -8,7 +8,6 @@ from gajim.common import app from gajim.common import ged from gajim.common.helpers import ask_for_status_message -from gajim.common.helpers import jid_is_blocked from gajim.common.i18n import _ from gajim.common.nec import EventHelper @@ -555,7 +554,8 @@ def _load_chats(self): self._startup_finished = True - def _on_start_chat_clicked(self, _button): + @staticmethod + def _on_start_chat_clicked(_button): app.app.activate_action('start-chat', GLib.Variant('s', '')) def _on_event(self, event): ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -275,6 +275,7 @@ def __init__(self, workspace_id): image = Gtk.Image.new_from_icon_name('list-add-symbolic', Gtk.IconSize.DND) image.set_halign(Gtk.Align.CENTER) + image.set_margin_left(6) image.get_style_context().add_class('workspace-add') self.add(image) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5ffb2902d2b01512d95d9660719dc53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5ffb2902d2b01512d95d9660719dc53… 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