Commits January 2021

commits@gajim.org

1 participants
109 discussions

[Git][gajim/gajim][mainwindow] Stuff
by Philipp Hörist 31 Jan '21

31 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 1634ed6e by lovetox at 2021-01-31T23:06:43+01:00 Stuff - - - - - 8 changed files: - gajim/data/style/gajim.css - gajim/gtk/account_side_bar.py - gajim/gtk/chat_list.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py - gajim/gui_interface.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -35,7 +35,7 @@ /* Main Window */ .mainwindow-grid { - background:rgb(255, 255, 255); + background: @theme_base_color; } /* Generic elements */ ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -25,10 +25,9 @@ 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)) + @staticmethod + def _on_row_activated(_listbox, row): + app.window.show_account_page(row.account) def activate_account_page(self, account): row = self.get_selected_row() ===================================== gajim/gtk/chat_list.py ===================================== @@ -206,9 +206,7 @@ def _on_state_flags_changed(self, _listboxrow, *args): self._revealer.set_reveal_child(False) def _on_close_button_clicked(self, _button): - self.get_toplevel().activate_action( - 'remove-chat', - GLib.Variant('as', [self.workspace_id, self.account, self.jid])) + app.window.remove_chat(self.workspace_id, self.account, self.jid) def set_unread(self, count): log.info('Set unread count: %s (%s)', self.jid, count) ===================================== gajim/gtk/main.py ===================================== @@ -69,13 +69,12 @@ def __init__(self): def _add_actions(self): actions = [ - ('add-workspace', 's', self.add_workspace), - ('remove-workspace', 's', self.remove_workspace), - ('activate-workspace', 's', self.activate_workspace), - ('add-chat', 'as', self.add_chat), - ('add-group-chat', 'as', self.add_group_chat), - ('remove-chat', 'as', self.remove_chat), - ('activate-account-page', 's', self.activate_account_page), + ('add-workspace', 's', self._add_workspace), + ('remove-workspace', 's', self._remove_workspace), + ('activate-workspace', 's', self._activate_workspace), + ('add-chat', 'as', self._add_chat), + ('add-group-chat', 'as', self._add_group_chat), + ('remove-chat', 'as', self._remove_chat), ] for action in actions: @@ -100,8 +99,7 @@ def show_title(self, *args): def get_active_jid(self, *args): pass - def activate_account_page(self, _action, param): - account = param.get_string() + def show_account_page(self, account): self._account_side_bar.activate_account_page(account) self._ui.main_stack.set_visible_child_name(account) @@ -119,16 +117,21 @@ def is_chat_focused(self, account, jid): return False return self._chat_list_stack.is_chat_active(account, jid) - def add_workspace(self, _action, param): + def _add_workspace(self, _action, param): workspace_id = param.get_string() + self.add_workspace(workspace_id) + + def add_workspace(self, workspace_id): self._workspace_side_bar.add_workspace(workspace_id) self._chat_list_stack.add_chat_list(workspace_id) self._workspace_side_bar.activate_workspace(workspace_id) self._chat_list_stack.show_chat_list(workspace_id) - def remove_workspace(self, _action, param): + def _remove_workspace(self, _action, param): workspace_id = param.get_string() + self.remove_workspace(workspace_id) + def remove_workspace(self, workspace_id): was_active = self.get_active_workspace() == workspace_id success = self._workspace_side_bar.remove_workspace(workspace_id) @@ -143,19 +146,28 @@ 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') + def _activate_workspace(self, _action, param): workspace_id = param.get_string() + self.activate_workspace(workspace_id) + + def activate_workspace(self, workspace_id): + self._ui.main_stack.set_visible_child_name('chats') self._workspace_side_bar.activate_workspace(workspace_id) self._chat_list_stack.show_chat_list(workspace_id) - def add_group_chat(self, _action, param): + def _add_group_chat(self, _action, param): account, jid = param.unpack() + self.add_group_chat(account, jid) + + def add_group_chat(self, account, jid): workspace_id = self._workspace_side_bar.get_active_workspace() self.add_chat_for_workspace(workspace_id, account, jid, 'groupchat') - def add_chat(self, _action, param): + def _add_chat(self, _action, param): account, jid, type_ = param.unpack() + self.add_chat(account, jid, type_) + + def add_chat(self, account, jid, type_): workspace_id = self._workspace_side_bar.get_active_workspace() self.add_chat_for_workspace(workspace_id, account, jid, type_) @@ -170,8 +182,11 @@ def add_chat_for_workspace(self, workspace_id, account, jid, type_): self._chat_list_stack.select_chat(workspace_id, account, jid) self._chat_list_stack.store_open_chats(workspace_id) - def remove_chat(self, _action, param): + def _remove_chat(self, _action, param): workspace_id, account, jid = param.unpack() + self.remove_chat(workspace_id, account, jid) + + def remove_chat(self, workspace_id, account, jid): self._chat_list_stack.remove_chat(workspace_id, account, jid) def chat_exists(self, account, jid): ===================================== gajim/gtk/start_chat.py ===================================== @@ -296,9 +296,7 @@ def _start_new_chat(self, row): else: # app.interface.new_chat_from_jid(row.account, row.jid) - app.window.activate_action( - 'add-chat', GLib.Variant('as', - [row.account, row.jid, 'contact'])) + app.window.add_chat(row.account, row.jid, 'contact') self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -14,7 +14,6 @@ from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GLib from gajim.common import app from gajim.common.const import AvatarSize @@ -126,6 +125,5 @@ def _on_save(self, _button): app.settings.set_workspace_setting( workspace_id, 'color', rgba.to_string()) - app.window.activate_action( - 'add-workspace', GLib.Variant('s', workspace_id)) + app.window.add_workspace(workspace_id) self.destroy() ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -37,13 +37,12 @@ def _on_button_press(self, _listbox, button_event): row = self.get_row_at_y(button_event.y) WorspaceMenu(row) - def _on_row_activated(self, _listbox, row): - main_window = self.get_toplevel() + @staticmethod + def _on_row_activated(_listbox, row): if row.workspace_id == 'add': open_window('WorkspaceDialog') else: - main_window.activate_action( - 'activate-workspace', GLib.Variant('s', row.workspace_id)) + app.window.activate_workspace(row.workspace_id) def add_workspace(self, workspace_id): row = Workspace(workspace_id) ===================================== gajim/gui_interface.py ===================================== @@ -1479,16 +1479,14 @@ def show_add_join_groupchat(self, account, jid, nickname=None): client = app.get_client(account) client.get_module('MUC').join(jid, nick=nickname) - app.window.activate_action( - 'add-group-chat', GLib.Variant('as', [account, str(jid)])) + app.window.add_group_chat(account, str(jid)) @staticmethod def _on_muc_added(_muc_manger, _signal_name, account, jid): if app.window.chat_exists(account, jid): return - app.window.activate_action( - 'add-group-chat', GLib.Variant('as', [account, str(jid)])) + app.window.add_group_chat(account, str(jid)) def new_private_chat(self, gc_contact, account, session=None): conn = app.connections[account] @@ -1687,7 +1685,7 @@ def enable_account(self, account): self.instances[account] = { 'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, 'sub_request': {}} - self.minimized_controls[account] = {} + app.groups[account] = {} app.contacts.add_account(account) app.gc_connected[account] = {} @@ -1702,14 +1700,9 @@ def enable_account(self, account): app.block_signed_in_notifications[account] = True app.last_message_time[account] = {} # refresh roster - if len(app.connections) >= 2: - # Do not merge accounts if only one exists - self.roster.regroup = app.settings.get('mergeaccounts') - else: - self.roster.regroup = False - self.roster.setup_and_draw_roster() + gui_menu_builder.build_accounts_menu() - self.roster.send_status(account, 'online', '') + app.connections[account].change_status('online', '') app.settings.set_account_setting(account, 'active', True) app.app.update_app_actions_state() window = get_app_window('AccountsWindow') @@ -1717,11 +1710,6 @@ def enable_account(self, account): GLib.idle_add(window.enable_account, account, True) def disable_account(self, account): - self.roster.close_all(account, force=True) - for jid in self.minimized_controls[account]: - ctrl = self.minimized_controls[account][jid] - ctrl.shutdown() - for win in get_app_windows(account): # Close all account specific windows, except the RemoveAccount # dialog. It shows if the removal was successful. @@ -1734,7 +1722,6 @@ def disable_account(self, account): app.connections[account].cleanup() del app.connections[account] del self.instances[account] - del self.minimized_controls[account] del app.nicks[account] del app.block_signed_in_notifications[account] del app.groups[account] @@ -1744,14 +1731,8 @@ def disable_account(self, account): del app.to_be_removed[account] del app.newly_added[account] del app.last_message_time[account] - if len(app.connections) >= 2: - # Do not merge accounts if only one exists - self.roster.regroup = app.settings.get('mergeaccounts') - else: - self.roster.regroup = False + app.settings.set_account_setting(account, 'roster_version', '') - self.roster.setup_and_draw_roster() - self.roster.update_status_selector() gui_menu_builder.build_accounts_menu() app.settings.set_account_setting(account, 'active', False) app.app.update_app_actions_state() @@ -2176,10 +2157,10 @@ def __init__(self): for account in app.settings.get_accounts(): if (not app.settings.get_account_setting(account, 'is_zeroconf') and app.settings.get_account_setting(account, 'active')): - app.connections[account] = Client(account) - - muc_manager = app.connections[account].get_module('MUC').get_manager() - muc_manager.connect('muc-added', self._on_muc_added) + client = Client(account) + app.connections[account] = client + muc_manager = client.get_module('MUC').get_manager() + muc_manager.connect('muc-added', self._on_muc_added) self.instances = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1634ed6e28abf7eb19a908fbe0305d13… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1634ed6e28abf7eb19a908fbe0305d13… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Make quit work
by Philipp Hörist 31 Jan '21

31 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 2e264d42 by lovetox at 2021-01-31T22:25:45+01:00 Make quit work - - - - - 4 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gtk/main.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -66,7 +66,7 @@ def on_bookmarks(_action, param): def on_quit(_action, _param): - interface.roster.on_quit_request() + app.window.quit() def on_new_chat(_action, param): ===================================== gajim/application.py ===================================== @@ -590,3 +590,27 @@ def _on_feature_discovered(self, event): elif event.feature == Namespace.BLOCKING: action = '%s-blocking' % event.account self.lookup_action(action).set_enabled(True) + + def start_shutdown(self, *args, **kwargs): + accounts_to_disconnect = {} + + for account, client in app.connections.items(): + if app.account_is_available(account): + accounts_to_disconnect[account] = client + + if not accounts_to_disconnect: + self.quit() + return + + def _on_disconnect(event): + accounts_to_disconnect.pop(event.account) + if not accounts_to_disconnect: + self.quit() + return + + app.ged.register_event_handler('account-disconnected', + ged.CORE, + _on_disconnect) + + for client in accounts_to_disconnect.values(): + client.change_status('offline', kwargs.get('message', '')) ===================================== gajim/gtk/main.py ===================================== @@ -4,6 +4,7 @@ from gi.repository import Gio from gajim.common import app +from gajim.common.i18n import _ from gajim.gui.util import get_builder from gajim.gui.util import load_icon from gajim.gui.account_page import AccountPage @@ -12,6 +13,10 @@ from gajim.gui.account_side_bar import AccountSideBar from gajim.gui.workspace_side_bar import WorkspaceSideBar +from gajim.common.helpers import ask_for_status_message +from gajim.gui.dialogs import DialogButton +from gajim.gui.dialogs import ConfirmationDialog + from .util import open_window @@ -215,3 +220,77 @@ def _on_start_chat_clicked(self, _button): def _on_edit_workspace_clicked(self, _button): open_window('WorkspaceDialog', workspace_id=self.get_active_workspace()) + + def quit(self): + accounts = list(app.connections.keys()) + get_msg = False + for acct in accounts: + if app.account_is_available(acct): + get_msg = True + break + + def on_continue2(message): + if 'file_transfers' not in app.interface.instances: + app.app.start_shutdown(message=message) + return + # check if there is an active file transfer + from gajim.common.modules.bytestream import is_transfer_active + files_props = app.interface.instances['file_transfers'].\ + files_props + transfer_active = False + for x in files_props: + for y in files_props[x]: + if is_transfer_active(files_props[x][y]): + transfer_active = True + break + + if transfer_active: + ConfirmationDialog( + _('Stop File Transfers'), + _('You still have running file transfers'), + _('If you quit now, the file(s) being transferred will ' + 'be lost.\n' + 'Do you still want to quit?'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=app.app.start_shutdown, + kwargs={'message': message})]).show() + return + app.app.start_shutdown(message=message) + + def on_continue(message): + if message is None: + # user pressed Cancel to change status message dialog + return + # check if we have unread messages + unread = app.events.get_nb_events() + + for event in app.events.get_all_events(['printed_gc_msg']): + contact = app.contacts.get_groupchat_contact(event.account, + event.jid) + if contact is None or not contact.can_notify(): + unread -= 1 + + if unread: + ConfirmationDialog( + _('Unread Messages'), + _('You still have unread messages'), + _('Messages will only be available for reading them later ' + 'if storing chat history is enabled and if the contact ' + 'is in your contact list.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=on_continue2, + args=[message])]).show() + return + on_continue2(message) + + if get_msg and ask_for_status_message('offline'): + open_window('StatusChange', + status='offline', + callback=on_continue, + show_pep=False) + else: + on_continue('') ===================================== gajim/roster_window.py ===================================== @@ -2235,121 +2235,6 @@ def prepare_quit(self): app.interface.hide_systray() self.save_done = True - def quit_gtkgui_interface(self): - """ - When we quit the gtk interface - exit gtk - """ - self.prepare_quit() - self.application.quit() - - def on_quit_request(self, widget=None): - """ - User wants to quit. Check if he should be warned about messages pending. - Terminate all sessions and send offline to all connected account. We do - NOT really quit gajim here - """ - accounts = list(app.connections.keys()) - get_msg = False - for acct in accounts: - if app.account_is_available(acct): - get_msg = True - break - - def on_continue3(message): - self.quit_on_next_offline = 0 - accounts_to_disconnect = [] - for acct in accounts: - if app.account_is_available(acct): - self.quit_on_next_offline += 1 - accounts_to_disconnect.append(acct) - - if not self.quit_on_next_offline: - # all accounts offline, quit - self.quit_gtkgui_interface() - return - - for acct in accounts_to_disconnect: - self.send_status(acct, 'offline', message) - - def on_continue2(message): - if 'file_transfers' not in app.interface.instances: - on_continue3(message) - return - # check if there is an active file transfer - from gajim.common.modules.bytestream import is_transfer_active - files_props = app.interface.instances['file_transfers'].\ - files_props - transfer_active = False - for x in files_props: - for y in files_props[x]: - if is_transfer_active(files_props[x][y]): - transfer_active = True - break - - if transfer_active: - ConfirmationDialog( - _('Stop File Transfers'), - _('You still have running file transfers'), - _('If you quit now, the file(s) being transferred will ' - 'be lost.\n' - 'Do you still want to quit?'), - [DialogButton.make('Cancel'), - DialogButton.make('Remove', - text=_('_Quit'), - callback=on_continue3, - args=[message])]).show() - return - on_continue3(message) - - def on_continue(message): - if message is None: - # user pressed Cancel to change status message dialog - return - # check if we have unread messages - unread = app.events.get_nb_events() - - for event in app.events.get_all_events(['printed_gc_msg']): - contact = app.contacts.get_groupchat_contact(event.account, - event.jid) - if contact is None or not contact.can_notify(): - unread -= 1 - - # check if we have recent messages - # recent = False - # for win in app.interface.msg_win_mgr.windows(): - # for ctrl in win.controls(): - # fjid = ctrl.get_full_jid() - # if fjid in app.last_message_time[ctrl.account]: - # if time.time() - app.last_message_time[ctrl.account][ - # fjid] < 2: - # recent = True - # break - # if recent: - # break - - if unread: - ConfirmationDialog( - _('Unread Messages'), - _('You still have unread messages'), - _('Messages will only be available for reading them later ' - 'if storing chat history is enabled and if the contact ' - 'is in your contact list.'), - [DialogButton.make('Cancel'), - DialogButton.make('Remove', - text=_('_Quit'), - callback=on_continue2, - args=[message])]).show() - return - on_continue2(message) - - if get_msg and ask_for_status_message('offline'): - open_window('StatusChange', - status='offline', - callback=on_continue, - show_pep=False) - else: - on_continue('') - def _nec_presence_received(self, obj): account = obj.conn.name jid = obj.jid View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2e264d42e51ee4b652f6d0487a186b94… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2e264d42e51ee4b652f6d0487a186b94… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Disable Roster
by Philipp Hörist 31 Jan '21

31 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7bfebb23 by lovetox at 2021-01-31T21:32:45+01:00 Disable Roster - - - - - 2 changed files: - gajim/common/modules/roster.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -50,15 +50,16 @@ def load_roster(self): self.set_raw(data) for jid, item in self._data.items(): self._log.debug('%s: %s', jid, item) - app.nec.push_incoming_event(NetworkEvent( - 'roster-info', - conn=self._con, + contact = app.contacts.create_contact( jid=jid, - nickname=item['name'], + account=self._account, + name=item['name'], + groups=item['groups'], + show='offline', sub=item['subscription'], ask=item['ask'], - groups=item['groups'], - avatar_sha=item['avatar_sha'])) + avatar_sha=item['avatar_sha']) + app.contacts.add_contact(self._account, contact) else: self._log.info('Database empty, reset roster version') app.settings.set_account_setting( ===================================== gajim/gui_interface.py ===================================== @@ -1116,7 +1116,7 @@ def create_core_handlers_list(self): 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection], 'presence-received': [self.handle_event_presence], - 'roster-info': [self.handle_event_roster_info], + # 'roster-info': [self.handle_event_roster_info], 'roster-item-exchange-received': \ [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], @@ -1789,7 +1789,8 @@ def autoconnect(self): account, 'last_status_msg') status_message = helpers.from_one_line(status_message) - self.roster.send_status(account, status, status_message) + app.connections[account].change_status(status, status_message) + # self.roster.send_status(account, status, status_message) def change_status(self, status=None): # status=None means we want to change the message only @@ -2077,7 +2078,7 @@ def run(self, application): if app.settings.get('trayicon') != 'never': self.show_systray() - self.roster = roster_window.RosterWindow(application) + # self.roster = roster_window.RosterWindow(application) # if self.msg_win_mgr.mode == \ # MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: # self.msg_win_mgr.create_window(None, None, None) @@ -2087,10 +2088,10 @@ def run(self, application): app.plugin_manager = plugins.PluginManager() app.plugin_manager.init_plugins() - self.roster._before_fill() + # self.roster._before_fill() for account in app.connections: app.connections[account].get_module('Roster').load_roster() - self.roster._after_fill() + # self.roster._after_fill() # get instances for windows/dialogs that will show_all()/hide() self.instances['file_transfers'] = FileTransfersWindow() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7bfebb2380168dbcb792ab8ad148096d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7bfebb2380168dbcb792ab8ad148096d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Start Chat: Destroy after joining MUC
by Philipp Hörist 31 Jan '21

31 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a1fc55fd by lovetox at 2021-01-31T20:56:45+01:00 Start Chat: Destroy after joining MUC - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -354,6 +354,7 @@ def _on_join_clicked(self, _button=None): app.interface.show_add_join_groupchat(account, jid, nickname=nickname) self.ready_to_destroy = True + self.destroy() def _on_back_clicked(self, _button=None): self._ui.stack.set_visible_child_name('search') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1fc55fdcbb68de8f3390fd06d55540c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1fc55fdcbb68de8f3390fd06d55540c… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2021