Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 42 commits: Icons: Add missing 16px Feather icons
by Philipp Hörist 31 Jan '21

31 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: bb913f53 by wurstsalat at 2021-01-27T22:57:21+01:00 Icons: Add missing 16px Feather icons - - - - - 0e36656c by Philipp Hörist at 2021-01-27T23:34:12+01:00 Revert "Rename feather icons" This reverts commit ab451489ac1ce78d8b5d3e097fec440a7c3e7b3f - - - - - 8178de1a by Daniel Brötzmann at 2021-01-28T09:27:45+01:00 Icons: Generate symbolic feather checkmarks Fixed size symbolic icons have to be generated from SVGs using gtk-encode-symbolic-svg -o outpath feather-check-symbolic.svg 32x32 - - - - - 7ecda265 by Daniel Brötzmann at 2021-01-28T09:38:54+01:00 Icons: Convert feather camera and generate fixed size PNGs - - - - - 63f6a954 by Daniel Brötzmann at 2021-01-28T17:55:59+01:00 Icons: Add missing feather PNG files - - - - - ab324891 by lovetox at 2021-01-31T20:42:39+01:00 Start - - - - - 1709c898 by lovetox at 2021-01-31T20:42:39+01:00 Disable CI - - - - - 1e6d3057 by lovetox at 2021-01-31T20:42:39+01:00 Really disable CI - - - - - 62b9027f by lovetox at 2021-01-31T20:42:39+01:00 Add Workspace settings API - - - - - 22110d6e by lovetox at 2021-01-31T20:42:39+01:00 Store and Open chats - - - - - e07eda0f by lovetox at 2021-01-31T20:42:39+01:00 Add remove_chat() - - - - - e0b258c2 by lovetox at 2021-01-31T20:42:39+01:00 Account Side Bar - - - - - dd0c2c03 by lovetox at 2021-01-31T20:42:39+01:00 Add Workspace Side Bar - - - - - 39327394 by wurstsalat at 2021-01-31T20:42:39+01:00 ChatList: Add basic elements - - - - - f7968740 by wurstsalat at 2021-01-31T20:42:39+01:00 ChatListStack: Add Start Chat - - - - - de5b4a2e by wurstsalat at 2021-01-31T20:42:39+01:00 Add basic Sidebar styling - - - - - ad3d25fd by wurstsalat at 2021-01-31T20:42:39+01:00 Improve styling for Sidebar and ChatList - - - - - 89cff7e3 by lovetox at 2021-01-31T20:42:39+01:00 Store chatlist on remove - - - - - cc819eb1 by lovetox at 2021-01-31T20:42:39+01:00 Add/Remove Workspaces - - - - - a9a7dffc by lovetox at 2021-01-31T20:42:39+01:00 Allow to add chats to different workspaces - - - - - f3e1cae8 by lovetox at 2021-01-31T20:42:39+01:00 Add transparent backgrounds - - - - - 6981a4a1 by wurstsalat at 2021-01-31T20:42:39+01:00 AccountSideBar: Improve styling - - - - - a47c2361 by wurstsalat at 2021-01-31T20:42:39+01:00 WorkspaceSidebar: Improve styling - - - - - 1fee9d4d by lovetox at 2021-01-31T20:42:39+01:00 Improve left sidebar - - - - - 82eaed35 by lovetox at 2021-01-31T20:42:39+01:00 css - - - - - 1e791fcd by lovetox at 2021-01-31T20:42:39+01:00 Dont fail when account is disabled - - - - - a139ebbe by lovetox at 2021-01-31T20:42:39+01:00 CSS - - - - - d57c3637 by wurstsalat at 2021-01-31T20:42:39+01:00 AvatarSelector: Add Load Image button - - - - - c2960145 by Daniel Brötzmann at 2021-01-31T20:42:39+01:00 Workspace: Add Workspace edit dialog - - - - - e03ec397 by wurstsalat at 2021-01-31T20:42:39+01:00 Workspace: Add title and editing functionality - - - - - 8d206111 by wurstsalat at 2021-01-31T20:42:39+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - d9228eb9 by lovetox at 2021-01-31T20:42:39+01:00 Store type for open chats - - - - - 038473e1 by lovetox at 2021-01-31T20:42:39+01:00 Store workspace dialog settings - - - - - cbc0486b by lovetox at 2021-01-31T20:42:39+01:00 Fix adding new Workspace - - - - - f97f4915 by lovetox at 2021-01-31T20:42:39+01:00 Fix some selection bugs - - - - - ac62b6b0 by Daniel Brötzmann at 2021-01-31T20:42:39+01:00 ChatListStack: Wrap in ScrolledWindow - - - - - 6129a85e by lovetox at 2021-01-31T20:42:39+01:00 Move scrolled window into gui xml - - - - - 5025a0ef by lovetox at 2021-01-31T20:42:39+01:00 sytle chatlist - - - - - 4b223e7a by wurstsalat at 2021-01-31T20:42:39+01:00 ChatList: Styling - - - - - 86f1c6f2 by wurstsalat at 2021-01-31T20:42:39+01:00 MainWindow: Styling - - - - - 8d608f18 by wurstsalat at 2021-01-31T20:42:39+01:00 Accounts: Add basic account page - - - - - 7f24a61c by lovetox at 2021-01-31T20:42:39+01:00 Refactor Groupchats - - - - - 30 changed files: - − .gitlab-ci.yml - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/httpupload.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - + gajim/data/gui/main.ui - + gajim/data/gui/workspace_dialog.ui - + gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png - − gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png - − gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png - gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.png → gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8e6c93ce47944b7b9e9c1ad8db27eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8e6c93ce47944b7b9e9c1ad8db27eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Accounts: Add basic account page
by Daniel Brötzmann 31 Jan '21

31 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c8e6c93c by wurstsalat at 2021-01-31T19:19:09+01:00 Accounts: Add basic account page - - - - - 5 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - + gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/main.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -131,230 +131,239 @@ </packing> </child> <child> - <object class="GtkPaned" id="paned"> + <object class="GtkStack" id="main_stack"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="position">250</property> - <property name="position-set">True</property> + <property name="can-focus">False</property> <child> -  - <object class="GtkGrid" id="middle_grid"> + <object class="GtkPaned" id="paned"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> + <property name="can-focus">True</property> + <property name="position">250</property> + <property name="position-set">True</property> <child> -  - <object class="GtkGrid"> +  + <object class="GtkGrid" id="middle_grid"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="row-spacing">3</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox"> +  + <object class="GtkGrid"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">12</property> + <property name="row-spacing">3</property> <child> - <object class="GtkLabel" id="workspace_label"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label">Workspace Label</property> - <property name="ellipsize">end</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="edit_workspace_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Workspace</property> - <property name="relief">none</property> + <property name="spacing">12</property> <child> - <object class="GtkImage"> + <object class="GtkLabel" id="workspace_label"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> + <property name="label">Workspace Label</property> + <property name="ellipsize">end</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="edit_workspace_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Edit Workspace</property> + <property name="relief">none</property> + <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> + <style> + <class name="flat"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> </child> - <style> - <class name="flat"/> - </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">6</property> - <property name="margin-end">6</property> - <property name="margin-top">12</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">12</property> <child> - <object class="GtkSearchEntry" id="search_entry"> + <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="primary-icon-name">edit-find-symbolic</property> - <property name="primary-icon-activatable">False</property> - <property name="primary-icon-sensitive">False</property> - <property name="placeholder-text" translatable="yes">Search…</property> + <property name="can-focus">False</property> + <property name="margin-start">6</property> + <property name="margin-end">6</property> + <property name="margin-top">12</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkButton" id="start_chat_button"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Start Chat</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkImage"> + <object class="GtkSearchEntry" id="search_entry"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">list-add-symbolic</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Search…</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="start_chat_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Start Chat</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> + <style> + <class name="chatlist-top-bar"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="chat_list_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> + <child> + <placeholder/> + </child> + <style> + <class name="no-border"/> + </style> </object> <packing> <property name="left-attach">0</property> <property name="top-attach">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> - <class name="chatlist-top-bar"/> + <class name="middle-grid"/> </style> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="chat_list_scrolled"> +  + <object class="GtkGrid" id="right_grid"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="shadow-type">in</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <child> <placeholder/> </child> - <style> - <class name="no-border"/> - </style> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <style> - <class name="middle-grid"/> - </style> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - <child> -  - <object class="GtkGrid" id="right_grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">True</property> + <property name="name">chats</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -108,6 +108,10 @@ background-color: darker(@theme_bg_color); margin: 0px 12px 0px 12px; } +/* Account Page */ +.account-page { + background: @theme_bg_color; +} /*Middle Grid*/ .middle-grid > scrolledwindow { background: transparent; } ===================================== gajim/gtk/account_page.py ===================================== @@ -0,0 +1,61 @@ +# 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 + +from gajim.common import app +from gajim.common.i18n import _ + +from .status_selector import StatusSelector +from .util import open_window + + +class AccountPage(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self) + self.get_style_context().add_class('account-page') + + self._account = account + + self._account_label = Gtk.Label() + self._account_label.get_style_context().add_class('large-header') + + self._status_selector = StatusSelector() + self._status_selector.set_halign(Gtk.Align.CENTER) + + settings_button = Gtk.Button(label=_('Settings')) + settings_button.set_halign(Gtk.Align.CENTER) + settings_button.connect('clicked', self._on_settings) + + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) + box.set_halign(Gtk.Align.CENTER) + box.set_valign(Gtk.Align.CENTER) + box.set_hexpand(True) + box.add(self._account_label) + box.add(settings_button) + box.add(self._status_selector) + + self.add(box) + self.show_all() + self.update() + + def _on_settings(self, _button): + window = open_window('AccountsWindow') + window.select_account(self._account) + + def update(self): + account_label = app.settings.get_account_setting( + self._account, 'account_label') + self._account_label.set_text(account_label) + self._status_selector.update() ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -1,5 +1,7 @@ +from gi.repository import GLib from gi.repository import Gtk + from gajim.common.const import AvatarSize from gajim.common import app from gajim.common.i18n import _ @@ -11,6 +13,7 @@ def __init__(self): self.set_vexpand(True) self.set_valign(Gtk.Align.END) self.get_style_context().add_class('account-sidebar') + self.connect('row-activated', self._on_row_activated) self._accounts = list(app.connections.keys()) for account in self._accounts: @@ -22,41 +25,71 @@ def add_account(self, account): def remove_account(self, account): pass + def _on_row_activated(self, _listbox, row): + main_window = self.get_toplevel() + main_window.activate_action( + 'activate-account-page', GLib.Variant('s', row.account)) + + def activate_account_page(self, account): + row = self.get_selected_row() + if row is not None and row.account == account: + return + + self.select_row(row) + class Account(Gtk.ListBoxRow): def __init__(self, account): Gtk.ListBoxRow.__init__(self) self.get_style_context().add_class('account-sidebar-item') self.set_selectable(False) - image = AccountAvatar(account) - account_color_bar = Gtk.Box() - account_color_bar.set_size_request(6, -1) - account_class = app.css_config.get_dynamic_class(account) - account_color_bar.get_style_context().add_class(account_class) - account_color_bar.get_style_context().add_class( + self.account = account + self._account_class = None + self._image = AccountAvatar(account) + + self._account_color_bar = Gtk.Box() + self._account_color_bar.set_size_request(6, -1) + self._account_color_bar.get_style_context().add_class( 'account-identifier-bar') account_box = Gtk.Box(spacing=6) account_box.set_tooltip_text( _('Account: %s') % app.get_account_label(account)) - account_box.add(account_color_bar) - account_box.add(image) + account_box.add(self._account_color_bar) + account_box.add(self._image) + self._update_account_color() self.add(account_box) self.show_all() + def _update_account_color(self): + context = self._account_color_bar.get_style_context() + if self._account_class is not None: + context.remove_class(self._account_class) + + self._account_class = app.css_config.get_dynamic_class(self.account) + context.add_class(self._account_class) + + def update(self): + self._update_account_color() + self._image.update() + class AccountAvatar(Gtk.Image): def __init__(self, account): Gtk.Image.__init__(self) + self._account = account + self.update() - jid = app.get_jid_from_account(account) - contact = app.contacts.create_contact(jid, account) + def update(self): + jid = app.get_jid_from_account(self._account) + contact = app.contacts.create_contact(jid, self._account) + client = app.get_client(self._account) - scale = self.get_scale_factor() surface = app.interface.get_avatar(contact, AvatarSize.ACCOUNT_SIDE_BAR, - scale, - style='round-corners') + self.get_scale_factor(), + style='round-corners', + show=client.status) self.set_from_surface(surface) ===================================== gajim/gtk/main.py ===================================== @@ -6,6 +6,7 @@ from gajim.common import app from gajim.gui.util import get_builder from gajim.gui.util import load_icon +from gajim.gui.account_page import AccountPage from gajim.gui.chat_list_stack import ChatListStack from gajim.gui.chat_stack import ChatStack from gajim.gui.account_side_bar import AccountSideBar @@ -58,6 +59,7 @@ def __init__(self): self.show_all() self._load_chats() + self._add_accounts() self._add_actions() def _add_actions(self): @@ -67,6 +69,7 @@ def _add_actions(self): ('activate-workspace', 's', self.activate_workspace), ('add-chat', 'as', self.add_chat), ('remove-chat', 'as', self.remove_chat), + ('activate-account-page', 's', self.activate_account_page), ] for action in actions: @@ -91,6 +94,11 @@ def show_title(self, *args): def get_active_jid(self, *args): pass + def activate_account_page(self, _action, param): + account = param.get_string() + self._account_side_bar.activate_account_page(account) + self._ui.main_stack.set_visible_child_name(account) + def get_workspace_bar(self): return self._workspace_side_bar @@ -121,8 +129,8 @@ def remove_workspace(self, _action, param): self._chat_list_stack.remove_chat_list(workspace_id) app.settings.remove_workspace(workspace_id) - def activate_workspace(self, _action, param): + self._ui.main_stack.set_visible_child_name('chats') workspace_id = param.get_string() self._workspace_side_bar.activate_workspace(workspace_id) self._chat_list_stack.show_chat_list(workspace_id) @@ -147,6 +155,11 @@ def remove_chat(self, _action, param): def get_control(self, account, jid): return self._chat_stack.get_control(account, jid) + def _add_accounts(self): + for account in list(app.connections.keys()): + self._ui.main_stack.add_named( + AccountPage(account), account) + def _load_chats(self): for workspace_id in app.settings.get_workspaces(): self._workspace_side_bar.add_workspace(workspace_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8e6c93ce47944b7b9e9c1ad8db27ebe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8e6c93ce47944b7b9e9c1ad8db27ebe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MainWindow: Styling
by Daniel Brötzmann 31 Jan '21

31 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6a04d049 by wurstsalat at 2021-01-31T15:32:46+01:00 MainWindow: Styling - - - - - 2 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -384,5 +384,8 @@ <child> <placeholder/> </child> + <style> + <class name="mainwindow-grid"/> + </style> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -33,48 +33,31 @@ .link-button { min-height: 0px; } -/* ChatList with Workspace and Account sidebars */ -.chatlist-left-grid { - border-right: 1px solid @unfocused_borders; -} - -.app-image-box { margin: 12px 12px 0px 12px } -.app-image-box > separator { - background-color: darker(@theme_bg_color); +/* Main Window */ +.mainwindow-grid { + background:rgb(255, 255, 255); } - +/* Generic elements */ .account-identifier-bar { border-top-right-radius: 6px; border-bottom-right-radius: 6px; } -/* Account sidebar */ -.account-sidebar { - background: transparent; - margin-right: 12px; - margin-bottom: 6px; -} -.account-sidebar-item { - padding-top: 6px; - padding-bottom: 6px; +.small-label { + font-size: small; } -.account-sidebar-item:hover { - background: transparent; - box-shadow: none; - outline: none; +/* ChatList with Workspace and Account sidebars */ +.chatlist-left-grid { + border-right: 1px solid @unfocused_borders; + background: @theme_bg_color; } -.account-sidebar-item:hover image { - box-shadow: 0 0 6px @theme_selected_bg_color; -} -.account-sidebar-item image { - border-radius: 9px; -} -.account-box > separator { +.app-image-box { margin: 12px 12px 0px 12px; } +.app-image-box > separator { background-color: darker(@theme_bg_color); - margin: 0px 12px 0px 12px; } + /* Workspace sidebar */ .workspace-sidebar { background: transparent; @@ -98,35 +81,50 @@ .workspace-sidebar-item image { border-radius: 9px; } -/* ChatList */ -.small-label { - font-size: small; -} -.revealer-close-button { - padding: 0px; - margin-right: 6px; +/* Account sidebar */ +.account-sidebar { + background: transparent; + margin-right: 12px; + margin-bottom: 6px; } -.unread-counter { - color: rgb(242, 242, 242); - padding-left: 6px; - padding-right: 6px; - border-radius: 10px; - font-size: 80%; - background-color: rgb(22, 100, 169); +.account-sidebar-item { + padding-top: 6px; + padding-bottom: 6px; +} +.account-sidebar-item:hover { + background: transparent; + box-shadow: none; + outline: none; +} +.account-sidebar-item:selected image, +.account-sidebar-item:hover image { + box-shadow: 0 0 6px @theme_selected_bg_color; +} +.account-sidebar-item image { + border-radius: 9px; +} +.account-box > separator { + background-color: darker(@theme_bg_color); + margin: 0px 12px 0px 12px; } + +/*Middle Grid*/ +.middle-grid > scrolledwindow { background: transparent; } + .chatlist-top-bar { padding: 12px; - background: @theme_base_color; + background: transparent; } .chatlist { - background: @theme_base_color; + background: transparent; } .chatlist-row { transition: none; padding: 0px; margin-left: 6px; margin-right: 6px; + margin-bottom: 3px; border-radius: 6px; } .chatlist-row:active, @@ -152,11 +150,18 @@ .chatlist-row overlay > box { padding: 6px; } - - -/*Middle Grid*/ - -.middle-grid > scrolledwindow { background: transparent; } +.revealer-close-button { + padding: 0px; + margin-right: 6px; +} +.unread-counter { + color: rgb(242, 242, 242); + padding-left: 6px; + padding-right: 6px; + border-radius: 10px; + font-size: 80%; + background-color: rgb(22, 100, 169); +} /* VCardWindow */ .VCard-GtkLinkButton { padding-left: 5px; border-left: none; } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6a04d0496448e4c1148e69560b3618d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6a04d0496448e4c1148e69560b3618d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Styling
by Daniel Brötzmann 30 Jan '21

30 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 054a94d7 by wurstsalat at 2021-01-30T19:56:53+01:00 ChatList: Styling - - - - - 3 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -1,30 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> +  <object class="GtkGrid" id="main_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> +  <object class="GtkGrid" id="left_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> - <property name="row_spacing">12</property> + <property name="row-spacing">12</property> <child> <object class="GtkBox" id="account_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">end</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -40,18 +42,18 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="workspace_scrolled"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="vexpand">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="propagate_natural_height">True</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> + <property name="propagate-natural-height">True</property> <child> <placeholder/> </child> @@ -60,20 +62,20 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="app_image"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -84,7 +86,7 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -97,56 +99,69 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> <class name="chatlist-left-grid"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkPaned" id="paned"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="position">250</property> - <property name="position_set">True</property> + <property name="position-set">True</property> <child> +  <object class="GtkGrid" id="middle_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">3</property> + <property name="can-focus">False</property> + <property name="row-spacing">3</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkButton" id="start_chat_button"> + <object class="GtkLabel" id="workspace_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Start Chat</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - </object> - </child> + <property name="can-focus">False</property> + <property name="label">Workspace Label</property> + <property name="ellipsize">end</property> <style> - <class name="suggested-action"/> + <class name="large-header"/> </style> </object> <packing> @@ -156,41 +171,63 @@ </packing> </child> <child> - <object class="GtkSearchEntry" id="search_entry"> + <object class="GtkButton" id="edit_workspace_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="primary_icon_name">edit-find-symbolic</property> - <property name="primary_icon_activatable">False</property> - <property name="primary_icon_sensitive">False</property> - <property name="placeholder_text" translatable="yes">Search…</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Edit Workspace</property> + <property name="relief">none</property> + <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> + <style> + <class name="flat"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">6</property> + <property name="margin-end">6</property> + <property name="margin-top">12</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkLabel" id="workspace_label"> + <object class="GtkSearchEntry" id="search_entry"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">Workspace Label</property> - <property name="ellipsize">end</property> - <style> - <class name="large-header"/> - </style> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Search…</property> </object> <packing> <property name="expand">False</property> @@ -199,34 +236,29 @@ </packing> </child> <child> - <object class="GtkButton" id="edit_workspace_button"> + <object class="GtkButton" id="start_chat_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Edit Workspace</property> - <property name="relief">none</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Start Chat</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">document-edit-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> </object> </child> - <style> - <class name="flat"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <style> @@ -234,15 +266,15 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="chat_list_scrolled"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <placeholder/> </child> @@ -251,10 +283,31 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> <class name="middle-grid"/> </style> @@ -265,9 +318,10 @@ </packing> </child> <child> +  <object class="GtkGrid" id="right_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> @@ -305,9 +359,30 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -102,12 +102,10 @@ .small-label { font-size: small; } -.chatlist-top-bar { - padding: 12px; - border-bottom: 1px solid @unfocused_borders; -} + .revealer-close-button { padding: 0px; + margin-right: 6px; } .unread-counter { color: rgb(242, 242, 242); @@ -117,25 +115,30 @@ font-size: 80%; background-color: rgb(22, 100, 169); } - -.chatlist { background: transparent; } - +.chatlist-top-bar { + padding: 12px; + background: @theme_base_color; +} +.chatlist { + background: @theme_base_color; +} .chatlist-row { - border-top: 1px solid @theme_unfocused_bg_color; transition: none; padding: 0px; + margin-left: 6px; + margin-right: 6px; + border-radius: 6px; } -.chatlist-row:active { - box-shadow: none; -} +.chatlist-row:active, .chatlist-row:selected:active { box-shadow: none; } .chatlist-row:hover { - background-color: @theme_unfocused_bg_color; + background-color: shade(@theme_base_color, 0.95); } .chatlist-row:selected { - background-color: @theme_unfocused_bg_color; + background-color: shade(@theme_base_color, 0.9); + outline: none; } .chatlist-row:selected label { color: @theme_text_color; ===================================== gajim/gtk/chat_list.py ===================================== @@ -109,15 +109,12 @@ def __init__(self, workspace_id, account, jid, type_): name = jid avatar_image = Gtk.Image.new_from_surface(avatar) - rgba = Gdk.RGBA(*text_to_color(jid)) - name_color = convert_rgba_to_hex(rgba) chat_name_label = Gtk.Label() chat_name_label.set_halign(Gtk.Align.START) chat_name_label.set_xalign(0) chat_name_label.set_max_width_chars(18) chat_name_label.set_ellipsize(Pango.EllipsizeMode.END) - chat_name_label.set_markup( - f'<span foreground="{name_color}">{name}</span>') + chat_name_label.set_text(name) last_message_label = Gtk.Label() last_message_label.set_halign(Gtk.Align.START) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/054a94d7b2b83da74268104cb716c4e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/054a94d7b2b83da74268104cb716c4e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] Resolver: Don’t fail on invalid websocket uris
by Philipp Hörist 30 Jan '21

30 Jan '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 82c266e5 by lovetox at 2021-01-30T10:52:40+01:00 Resolver: Don’t fail on invalid websocket uris - - - - - 1 changed file: - nbxmpp/addresses.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -172,6 +172,7 @@ class ServerAddresses(Observable): type_ = ConnectionType.PLAIN else: log.warning('Invalid websocket uri: %s', uri) + self._on_request_resolved() return addr = ServerAddress(domain=self._domain, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/82c266e5bc850be9b3554b3f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/82c266e5bc850be9b3554b3f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Resolver: Don’t fail on invalid websocket uris
by Philipp Hörist 30 Jan '21

30 Jan '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: cf2b471a by lovetox at 2021-01-30T10:44:24+01:00 Resolver: Don’t fail on invalid websocket uris - - - - - 1 changed file: - nbxmpp/addresses.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -172,6 +172,7 @@ class ServerAddresses(Observable): type_ = ConnectionType.PLAIN else: log.warning('Invalid websocket uri: %s', uri) + self._on_request_resolved() return addr = ServerAddress(domain=self._domain, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/cf2b471a6d002f3fa93f4699… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/cf2b471a6d002f3fa93f4699… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] sytle chatlist
by Philipp Hörist 30 Jan '21

30 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7414c57b by lovetox at 2021-01-30T09:23:05+01:00 sytle chatlist - - - - - 3 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -229,20 +229,6 @@ <property name="top_attach">0</property> </packing> </child> - <child> - <object class="GtkScrolledWindow" id="chat_list_scrolled"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> <style> <class name="chatlist-top-bar"/> </style> @@ -252,6 +238,26 @@ <property name="top_attach">0</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="chat_list_scrolled"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + <style> + <class name="no-border"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <style> + <class name="middle-grid"/> + </style> </object> <packing> <property name="resize">True</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -38,7 +38,6 @@ border-right: 1px solid @unfocused_borders; } - .app-image-box { margin: 12px 12px 0px 12px } .app-image-box > separator { background-color: darker(@theme_bg_color); @@ -118,6 +117,9 @@ font-size: 80%; background-color: rgb(22, 100, 169); } + +.chatlist { background: transparent; } + .chatlist-row { border-top: 1px solid @theme_unfocused_bg_color; transition: none; @@ -148,6 +150,11 @@ padding: 6px; } + +/*Middle Grid*/ + +.middle-grid > scrolledwindow { background: transparent; } + /* VCardWindow */ .VCard-GtkLinkButton { padding-left: 5px; border-left: none; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -25,6 +25,8 @@ def __init__(self, workspace_id): self._current_filter_text = '' self._workspace_id = workspace_id + self.get_style_context().add_class('chatlist') + self.show_all() self.set_filter_func(self._filter_func) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7414c57bc0c4dae9ad1f117e8b2f2dd0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7414c57bc0c4dae9ad1f117e8b2f2dd0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Move scrolled window into gui xml
by Philipp Hörist 30 Jan '21

30 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7e062690 by lovetox at 2021-01-30T08:51:47+01:00 Move scrolled window into gui xml - - - - - 2 changed files: - gajim/data/gui/main.ui - gajim/gtk/main.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -1,32 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> -  <object class="GtkGrid" id="main_grid"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> -  <object class="GtkGrid" id="left_grid"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> - <property name="row-spacing">12</property> + <property name="row_spacing">12</property> <child> <object class="GtkBox" id="account_box"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="valign">end</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -42,18 +40,18 @@ </style> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="workspace_scrolled"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="vexpand">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <property name="propagate-natural-height">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <property name="propagate_natural_height">True</property> <child> <placeholder/> </child> @@ -62,20 +60,20 @@ </style> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkImage" id="app_image"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -86,7 +84,7 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -99,72 +97,52 @@ </style> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <style> <class name="chatlist-left-grid"/> </style> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkPaned" id="paned"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="position">250</property> - <property name="position-set">True</property> + <property name="position_set">True</property> <child> -  <object class="GtkGrid" id="middle_grid"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> -  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">3</property> + <property name="can_focus">False</property> + <property name="row_spacing">3</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkButton" id="start_chat_button"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Start Chat</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Start Chat</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">list-add-symbolic</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add-symbolic</property> </object> </child> <style> @@ -180,12 +158,12 @@ <child> <object class="GtkSearchEntry" id="search_entry"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="primary-icon-name">edit-find-symbolic</property> - <property name="primary-icon-activatable">False</property> - <property name="primary-icon-sensitive">False</property> - <property name="placeholder-text" translatable="yes">Search…</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + <property name="placeholder_text" translatable="yes">Search…</property> </object> <packing> <property name="expand">False</property> @@ -195,19 +173,19 @@ </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="workspace_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label">Workspace Label</property> <property name="ellipsize">end</property> <style> @@ -223,15 +201,15 @@ <child> <object class="GtkButton" id="edit_workspace_button"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Workspace</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Edit Workspace</property> <property name="relief">none</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> + <property name="can_focus">False</property> + <property name="icon_name">document-edit-symbolic</property> </object> </child> <style> @@ -241,14 +219,28 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="chat_list_scrolled"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <style> @@ -256,34 +248,10 @@ </style> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="resize">True</property> @@ -291,10 +259,9 @@ </packing> </child> <child> -  <object class="GtkGrid" id="right_grid"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> @@ -332,30 +299,9 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </interface> ===================================== gajim/gtk/main.py ===================================== @@ -36,8 +36,7 @@ def __init__(self): self._chat_stack = ChatStack() self._chat_list_stack = ChatListStack(self._ui, self._chat_stack) - chat_list_scrolled = Gtk.ScrolledWindow() - chat_list_scrolled.add(self._chat_list_stack) + self._ui.chat_list_scrolled.add(self._chat_list_stack) self._account_side_bar = AccountSideBar() self._workspace_side_bar = WorkspaceSideBar() @@ -48,7 +47,6 @@ def __init__(self): self._ui.account_box.add(self._account_side_bar) - self._ui.middle_grid.add(chat_list_scrolled) self._ui.right_grid.add(self._chat_stack) self._ui.edit_workspace_button.connect( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e06269081ca5625d7f00a89e6606abf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7e06269081ca5625d7f00a89e6606abf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatListStack: Wrap in ScrolledWindow
by Daniel Brötzmann 28 Jan '21

28 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 4bd8e239 by Daniel Brötzmann at 2021-01-28T18:34:48+01:00 ChatListStack: Wrap in ScrolledWindow - - - - - 2 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -11,6 +11,7 @@ def __init__(self, ui, chat_stack): Gtk.Stack.__init__(self) self.set_hexpand(True) self.set_vexpand(True) + self.set_vhomogeneous(False) self._ui = ui self._chat_stack = chat_stack ===================================== gajim/gtk/main.py ===================================== @@ -36,6 +36,9 @@ def __init__(self): self._chat_stack = ChatStack() self._chat_list_stack = ChatListStack(self._ui, self._chat_stack) + chat_list_scrolled = Gtk.ScrolledWindow() + chat_list_scrolled.add(self._chat_list_stack) + self._account_side_bar = AccountSideBar() self._workspace_side_bar = WorkspaceSideBar() @@ -45,7 +48,7 @@ def __init__(self): self._ui.account_box.add(self._account_side_bar) - self._ui.middle_grid.add(self._chat_list_stack) + self._ui.middle_grid.add(chat_list_scrolled) self._ui.right_grid.add(self._chat_stack) self._ui.edit_workspace_button.connect( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4bd8e239d65a551715e0268a68647f96… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4bd8e239d65a551715e0268a68647f96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Icons: Add missing feather PNG files
by Daniel Brötzmann 28 Jan '21

28 Jan '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 63f6a954 by Daniel Brötzmann at 2021-01-28T17:55:59+01:00 Icons: Add missing feather PNG files - - - - - 6 changed files: - + gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png - + gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-briefcase-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-hash-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-home-symbolic.symbolic.png Changes: ===================================== gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-briefcase-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-briefcase-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-hash-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-hash-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-home-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-home-symbolic.symbolic.png differ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63f6a954388a04599a7e93340b4d38a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63f6a954388a04599a7e93340b4d38a2… 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