Commits January 2021

commits@gajim.org

1 participants
109 discussions

[Git][gajim/gajim][mainwindow] Fix adding new Workspace
by Philipp Hörist 26 Jan '21

26 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 0646b45c by lovetox at 2021-01-26T22:46:45+01:00 Fix adding new Workspace - - - - - 3 changed files: - gajim/data/gui/workspace_dialog.ui - gajim/gtk/main.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -190,7 +190,7 @@ </packing> </child> <child> - <object class="GtkButton"> + <object class="GtkButton" id="save_button"> <property name="label" translatable="yes">_Save</property> <property name="visible">True</property> <property name="can_focus">True</property> ===================================== gajim/gtk/main.py ===================================== @@ -97,10 +97,11 @@ def get_active_workspace(self): return self._workspace_side_bar.get_active_workspace() def add_workspace(self, _action, param): - name = param.get_string() - workspace_id = app.settings.add_workspace(name) + workspace_id = param.get_string() 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): workspace_id = param.get_string() ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -79,11 +79,12 @@ def _on_cancel(self, _button): def _on_color_set(self, _button): self._update_avatar() - def _on_text_changed(self, _entry, _param): + def _on_text_changed(self, entry, _param): + self._ui.save_button.set_sensitive(bool(entry.get_text())) self._update_avatar() def _update_avatar(self): - name = self._ui.entry.get_text() or 'M' + name = self._ui.entry.get_text() rgba = self._ui.color_chooser.get_rgba() scale = self.get_scale_factor() surface = make_workspace_avatar( @@ -121,6 +122,10 @@ def _on_save(self, _button): self.destroy() return + workspace_id = app.settings.add_workspace(name) + app.settings.set_workspace_setting( + workspace_id, 'color', rgba.to_string()) + app.window.activate_action( - 'add-workspace', GLib.Variant('s', name)) + 'add-workspace', GLib.Variant('s', workspace_id)) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0646b45c142fa919fcc8901a1f1e1aed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0646b45c142fa919fcc8901a1f1e1aed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Store type for open chats
by Philipp Hörist 26 Jan '21

26 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 5e1c93c6 by lovetox at 2021-01-26T22:34:17+01:00 Store type for open chats - - - - - 0c15cef3 by lovetox at 2021-01-26T22:34:17+01:00 Store workspace dialog settings - - - - - 13 changed files: - gajim/common/client.py - gajim/common/const.py - gajim/common/setting_values.py - gajim/data/gui/workspace_dialog.ui - gajim/gtk/avatar.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/util.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/common/client.py ===================================== @@ -450,7 +450,7 @@ def _finish_connect(self): # We did not resume the stream, so we are not joined any MUCs self.update_presence(include_muc=False) - self.get_module('Bookmarks').request_bookmarks() + # self.get_module('Bookmarks').request_bookmarks() self.get_module('SoftwareVersion').set_enabled(True) self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() ===================================== gajim/common/const.py ===================================== @@ -19,6 +19,7 @@ class AvatarSize(IntEnum): ROSTER = 32 ACCOUNT_SIDE_BAR = 40 WORKSPACE = 40 + WORKSPACE_EDIT = 100 CHAT = 48 NOTIFICATION = 48 GROUP_INFO = 100 ===================================== gajim/common/setting_values.py ===================================== @@ -287,6 +287,8 @@ class _ACCOUNT_DEFAULT: WORKSPACE_SETTINGS = { 'name': _('My Workspace'), + 'color': '', + 'avatar_sha': '', 'open_chats': [], } ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> <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="preview"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -21,8 +21,9 @@ <child> <object class="GtkEntry" id="entry"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="halign">center</property> + <signal name="notify::text" handler="_on_text_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -33,10 +34,10 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Choose a color or select an image</property> <property name="wrap">True</property> - <property name="max-width-chars">40</property> + <property name="max_width_chars">40</property> <style> <class name="dim-label"/> </style> @@ -50,7 +51,7 @@ <child> <object class="GtkStackSwitcher"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">center</property> <property name="stack">style_stack</property> </object> @@ -63,21 +64,21 @@ <child> <object class="GtkStack" id="style_stack"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="transition-duration">100</property> - <property name="transition-type">slide-left-right</property> + <property name="can_focus">False</property> + <property name="transition_duration">100</property> + <property name="transition_type">slide-left-right</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">start</property> - <property name="margin-top">6</property> + <property name="margin_top">6</property> <property name="spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="valign">center</property> <property name="label" translatable="yes">Color</property> <style> @@ -93,9 +94,10 @@ <child> <object class="GtkColorButton" id="color_chooser"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="valign">center</property> + <signal name="color-set" handler="_on_color_set" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -112,19 +114,19 @@ <child> <object class="GtkBox" id="image_box"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">center</property> <property name="orientation">vertical</property> <property name="spacing">12</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">6</property> <child> <object class="GtkSwitch" id="use_image"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> </object> <packing> <property name="expand">False</property> @@ -135,7 +137,7 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Use Image instead of Color</property> </object> <packing> @@ -171,14 +173,14 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <child> <object class="GtkButton"> <property name="label" translatable="yes">_Cancel</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> <signal name="clicked" handler="_on_cancel" swapped="no"/> </object> <packing> @@ -191,9 +193,9 @@ <object class="GtkButton"> <property name="label" translatable="yes">_Save</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> <signal name="clicked" handler="_on_save" swapped="no"/> <style> <class name="suggested-action"/> @@ -202,7 +204,7 @@ <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> @@ -210,7 +212,7 @@ <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">7</property> </packing> </child> ===================================== gajim/gtk/avatar.py ===================================== @@ -29,11 +29,14 @@ from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr +from .const import DEFAULT_WORKSPACE_COLOR from .util import load_pixbuf from .util import text_to_color from .util import scale_with_ratio from .util import get_css_show_class from .util import convert_rgb_string_to_float +from .util import rgba_to_float +from .util import make_rgba log = logging.getLogger('gajim.gui.avatar') @@ -79,7 +82,7 @@ def generate_avatar(letters, color, size, scale): return context.get_target() -@lru_cache(maxsize=2048) +@lru_cache(maxsize=None) def generate_default_avatar(letter, color_string, size, scale, style='circle'): color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) @@ -91,6 +94,17 @@ def generate_default_avatar(letter, color_string, size, scale, style='circle'): return surface +@lru_cache(maxsize=None) +def make_workspace_avatar(letter, color, size, scale, style='round-corners'): + surface = generate_avatar(letter, color, size, scale) + if style == 'circle': + surface = clip_circle(surface) + elif style == 'round-corners': + surface = round_corners(surface) + surface.set_device_scale(scale, scale) + return surface + + def add_status_to_avatar(surface, show): width = surface.get_width() height = surface.get_height() @@ -308,6 +322,23 @@ def get_muc_surface(self, account, jid, size, scale, default=False): self._cache[jid][(size, scale)] = surface return surface + def get_workspace_surface(self, workspace_id, size, scale): + surface = self._cache[workspace_id].get((size, scale)) + if surface is not None: + return surface + + name = app.settings.get_workspace_setting(workspace_id, 'name') + color = app.settings.get_workspace_setting(workspace_id, 'color') + avatar_sha = app.settings.get_workspace_setting( + workspace_id, 'avatar_sha') + if not avatar_sha: + rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) + letter = name[:1].upper() + surface = make_workspace_avatar( + letter, rgba_to_float(rgba), size, scale) + self._cache[workspace_id][(size, scale)] = surface + return surface + def prepare_for_publish(self, path): success, data = self._load_for_publish(path) if not success: ===================================== gajim/gtk/chat_list.py ===================================== @@ -38,12 +38,12 @@ def set_filter_text(self, text): self._current_filter_text = text self.invalidate_filter() - def add_chat(self, account, jid): + def add_chat(self, account, jid, type_): if self._chats.get((account, jid)) is not None: # Chat is already in the List return - row = ChatRow(self._workspace_id, account, jid) + row = ChatRow(self._workspace_id, account, jid, type_) self._chats[(account, jid)] = row self.add(row) @@ -60,16 +60,20 @@ def contains_chat(self, account, jid): return self._chats.get((account, jid)) is not None def get_open_chats(self): - return list(self._chats.keys()) + open_chats = [] + for key, value in self._chats.items(): + open_chats.append(key + (value.type,)) + return open_chats class ChatRow(Gtk.ListBoxRow): - def __init__(self, workspace_id, account, jid): + def __init__(self, workspace_id, account, jid, type_): Gtk.ListBoxRow.__init__(self) self.account = account self.jid = jid self.workspace_id = workspace_id + self.type = type_ self._unread_count = 0 self.get_style_context().add_class('chatlist-row') ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -52,20 +52,21 @@ def show_chat_list(self, workspace_id): self._ui.workspace_label.set_text( app.settings.get_workspace_setting(workspace_id, 'name')) - def add_chat(self, workspace_id, *args): + def add_chat(self, workspace_id, account, jid, type_): chat_list = self._chat_lists.get(workspace_id) if chat_list is None: chat_list = self.add_chat_list(workspace_id) - chat_list.add_chat(*args) + chat_list.add_chat(account, jid, type_) - def select_chat(self, workspace_id, *args): + def select_chat(self, workspace_id, account, jid): self.show_chat_list(workspace_id) chat_list = self._chat_lists.get(workspace_id) - chat_list.select_chat(*args) + chat_list.select_chat(account, jid) def store_open_chats(self, workspace_id): chat_list = self._chat_lists[workspace_id] open_chats = chat_list.get_open_chats() + print('store', open_chats) app.settings.set_workspace_setting( workspace_id, 'open_chats', open_chats) ===================================== gajim/gtk/const.py ===================================== @@ -25,6 +25,10 @@ 'bind inverted enabled_func props') Setting.__new__.__defaults__ = (None,) * len(Setting._fields) # type: ignore + +DEFAULT_WORKSPACE_COLOR = 'rgb(191,15,167)' + + @unique class Theme(IntEnum): NOT_DARK = 0 ===================================== gajim/gtk/main.py ===================================== @@ -64,6 +64,7 @@ def _add_actions(self): ('add-workspace', 's', self.add_workspace), ('remove-workspace', 's', self.remove_workspace), ('activate-workspace', 's', self.activate_workspace), + ('add-chat', 'as', self.add_chat), ('remove-chat', 'as', self.remove_chat), ] @@ -89,6 +90,9 @@ def show_title(self, *args): def get_active_jid(self, *args): pass + def get_workspace_bar(self): + return self._workspace_side_bar + def get_active_workspace(self): return self._workspace_side_bar.get_active_workspace() @@ -109,13 +113,14 @@ def activate_workspace(self, _action, param): self._workspace_side_bar.activate_workspace(workspace_id) self._chat_list_stack.show_chat_list(workspace_id) - def add_chat(self, account, jid): + def add_chat(self, _action, param): + account, jid, type_ = param.unpack() workspace_id = self._workspace_side_bar.get_active_workspace() - self.add_chat_for_workspace(workspace_id, account, jid) + self.add_chat_for_workspace(workspace_id, account, jid, type_) - def add_chat_for_workspace(self, workspace_id, account, jid): + def add_chat_for_workspace(self, workspace_id, account, jid, type_): self._chat_stack.add_chat(account, jid) - self._chat_list_stack.add_chat(workspace_id, account, jid) + self._chat_list_stack.add_chat(workspace_id, account, jid, type_) if self._startup_finished: self._chat_list_stack.select_chat(workspace_id, account, jid) @@ -134,10 +139,10 @@ def _load_chats(self): self._chat_list_stack.add_chat_list(workspace_id) open_chats = app.settings.get_workspace_setting(workspace_id, 'open_chats') - for account, jid in open_chats: + for account, jid, type_ in open_chats: if account not in app.connections: continue - self.add_chat_for_workspace(workspace_id, account, jid) + self.add_chat_for_workspace(workspace_id, account, jid, type_) self._startup_finished = True ===================================== gajim/gtk/start_chat.py ===================================== @@ -296,7 +296,9 @@ def _start_new_chat(self, row): else: # app.interface.new_chat_from_jid(row.account, row.jid) - app.window.add_chat(row.account, row.jid) + app.window.activate_action( + 'add-chat', GLib.Variant('as', + [row.account, row.jid, 'contact'])) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/util.py ===================================== @@ -458,6 +458,16 @@ def convert_rgb_string_to_float(rgb_string: str) -> Tuple[float, float, float]: return (rgba.red, rgba.green, rgba.blue) +def rgba_to_float(rgba): + return (rgba.red, rgba.green, rgba.blue) + + +def make_rgba(color_string): + rgba = Gdk.RGBA() + rgba.parse(color_string) + return rgba + + def get_monitor_scale_factor() -> int: display = Gdk.Display.get_default() monitor = display.get_primary_monitor() ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -20,10 +20,12 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from .avatar import generate_default_avatar +from .avatar import make_workspace_avatar from .avatar_selector import AvatarSelector from .util import get_builder -from .util import text_to_color +from .util import rgba_to_float +from .util import make_rgba +from .const import DEFAULT_WORKSPACE_COLOR class WorkspaceDialog(Gtk.ApplicationWindow): @@ -46,17 +48,21 @@ def __init__(self, workspace_id=None): self._avatar_selector.set_size_request(200, 200) self._ui.image_box.add(self._avatar_selector) + name = _('My Workspace') + color = None + avatar_sha = None + if workspace_id is not None: name = app.settings.get_workspace_setting( workspace_id, 'name') - rgba = Gdk.RGBA() # TODO: Load setting - else: - name = _('My Workspace') - rgba = Gdk.RGBA(*text_to_color(name)) + color = app.settings.get_workspace_setting( + workspace_id, 'color') + + rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) self._ui.entry.set_text(name) self._ui.color_chooser.set_rgba(rgba) - self._generate_avatar() + self._update_avatar() self._ui.connect_signals(self) @@ -70,14 +76,21 @@ def _on_key_press_event(self, _widget, event): def _on_cancel(self, _button): self.destroy() - def _generate_avatar(self): - name = self._ui.entry.get_text() - if not name: - return - letter = name[:1].upper() + def _on_color_set(self, _button): + self._update_avatar() + + def _on_text_changed(self, _entry, _param): + self._update_avatar() + + def _update_avatar(self): + name = self._ui.entry.get_text() or 'M' + rgba = self._ui.color_chooser.get_rgba() scale = self.get_scale_factor() - surface = generate_default_avatar( - letter, name, AvatarSize.GROUP_INFO, scale, style='round-corners') + surface = make_workspace_avatar( + name[:1].upper(), + rgba_to_float(rgba), + AvatarSize.WORKSPACE_EDIT, + scale) self._ui.preview.set_from_surface(surface) def _get_avatar_data(self): @@ -92,14 +105,19 @@ def _get_avatar_data(self): def _on_save(self, _button): name = self._ui.entry.get_text() - # rgba = self._ui.color_chooser.get_rgba() - # color = rgba.to_string() + rgba = self._ui.color_chooser.get_rgba() # avatar = self._get_avatar_data() # use_image = self._ui.use_image.get_active() if self._workspace_id is not None: app.settings.set_workspace_setting( self._workspace_id, 'name', name) + app.settings.set_workspace_setting( + self._workspace_id, 'color', rgba.to_string()) + + app.interface.avatar_storage.invalidate_cache(self._workspace_id) + workspace_bar = app.window.get_workspace_bar() + workspace_bar.update_avatar(self._workspace_id) self.destroy() return ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -6,7 +6,6 @@ from gajim.common.i18n import _ -from .avatar import generate_default_avatar from .util import open_window @@ -69,6 +68,10 @@ def get_active_workspace(self): return None return row.workspace_id + def update_avatar(self, workspace_id): + row = self._workspaces[workspace_id] + row.update_avatar() + class CommonWorkspace(Gtk.ListBoxRow): def __init__(self, workspace_id): @@ -84,11 +87,14 @@ def __init__(self, workspace_id): self.sort_index = 0 - image = WorkspaceAvatar(workspace_id) - image.set_halign(Gtk.Align.CENTER) - self.add(image) + self._image = WorkspaceAvatar(workspace_id) + self._image.set_halign(Gtk.Align.CENTER) + self.add(self._image) self.show_all() + def update_avatar(self): + self._image.update() + class AddWorkspace(CommonWorkspace): def __init__(self, workspace_id): @@ -136,10 +142,11 @@ def _on_click(self, _button, action): class WorkspaceAvatar(Gtk.Image): def __init__(self, workspace_id): Gtk.Image.__init__(self) + self._workspace_id = workspace_id + self.update() - name = app.settings.get_workspace_setting(workspace_id, 'name') - letter = name[:1].upper() + def update(self): scale = self.get_scale_factor() - surface = generate_default_avatar( - letter, name, AvatarSize.WORKSPACE, scale, style='round-corners') + surface = app.interface.avatar_storage.get_workspace_surface( + self._workspace_id, AvatarSize.WORKSPACE, scale) self.set_from_surface(surface) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9d47f9bc57e972e3324a47709911041… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9d47f9bc57e972e3324a47709911041… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] MainWindow: Add Paned for chat list and chat controls
by Daniel Brötzmann 26 Jan '21

26 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9d47f9bc by wurstsalat at 2021-01-26T21:09:54+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - 4 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -8,200 +8,6 @@ <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <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="left-attach">2</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> -  - <object class="GtkGrid" id="middle_grid"> - <property name="visible">True</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">6</property> - <child> - <object class="GtkBox"> - <property name="visible">True</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> - <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> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="width-request">200</property> - <property name="visible">True</property> - <property name="can-focus">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">1</property> - </packing> - </child> - </object> - <packing> - <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="spacing">12</property> - <child> - <object class="GtkLabel" id="workspace_label"> - <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> - <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">0</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> - <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="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> <child>  <object class="GtkGrid" id="left_grid"> @@ -324,6 +130,215 @@ <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="position">250</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="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> + <child> + <object class="GtkBox"> + <property name="visible">True</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> + <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> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <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="spacing">12</property> + <child> + <object class="GtkLabel" id="workspace_label"> + <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> + <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">0</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> + <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> + </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> + </packing> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> <child> <placeholder/> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -105,12 +105,8 @@ } .chatlist-top-bar { padding: 12px; - border-right: 1px solid @unfocused_borders; border-bottom: 1px solid @unfocused_borders; } -.chatlist-stack { - border-right: 1px solid @unfocused_borders; -} .revealer-close-button { padding: 0px; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -24,7 +24,6 @@ def __init__(self, workspace_id): self._chats = {} self._current_filter_text = '' self._workspace_id = workspace_id - self.set_size_request(250, -1) self.show_all() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -1,5 +1,4 @@ -from gi.repository import GLib from gi.repository import Gtk from gajim.common import app @@ -10,8 +9,7 @@ class ChatListStack(Gtk.Stack): def __init__(self, ui, chat_stack): Gtk.Stack.__init__(self) - self.get_style_context().add_class('chatlist-stack') - + self.set_hexpand(True) self.set_vexpand(True) self._ui = ui View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d47f9bc57e972e3324a47709911041d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d47f9bc57e972e3324a47709911041d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Workspace: Add title and editing functionality
by Daniel Brötzmann 26 Jan '21

26 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 20b9fded by wurstsalat at 2021-01-26T20:15:00+01:00 Workspace: Add title and editing functionality - - - - - 6 changed files: - gajim/data/gui/main.ui - gajim/data/gui/workspace_dialog.ui - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -1,16 +1,18 @@ <?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="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> @@ -42,56 +44,123 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <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="column_spacing">6</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="width_request">200</property> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">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="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> + <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> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">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">1</property> + </packing> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">1</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="GtkLabel" id="workspace_label"> <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="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="suggested-action"/> - </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> <style> @@ -99,34 +168,59 @@ </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="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> +  <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> @@ -142,18 +236,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> @@ -162,21 +256,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="stock">gtk-missing-image</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -187,7 +280,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> @@ -200,18 +293,54 @@ </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> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -94,7 +94,7 @@ <object class="GtkColorButton" id="color_chooser"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="receives-default">False</property> <property name="valign">center</property> </object> <packing> @@ -192,7 +192,7 @@ <property name="label" translatable="yes">_Save</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="receives-default">False</property> <property name="use-underline">True</property> <signal name="clicked" handler="_on_save" swapped="no"/> <style> ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -19,14 +19,9 @@ def __init__(self, ui, chat_stack): self._chat_lists = {} self.show_all() - self._ui.start_chat_button.connect( - 'clicked', self._on_start_chat_clicked) self._ui.search_entry.connect( 'search-changed', self._on_search_changed) - def _on_start_chat_clicked(self, _button): - app.app.activate_action('start-chat', GLib.Variant('s', '')) - def _on_search_changed(self, search_entry): chat_list = self.get_visible_child() chat_list.set_filter_text(search_entry.get_text()) @@ -56,6 +51,8 @@ def _on_row_selected(self, _chat_list, row): def show_chat_list(self, workspace_id): self.set_visible_child_name(workspace_id) + self._ui.workspace_label.set_text( + app.settings.get_workspace_setting(workspace_id, 'name')) def add_chat(self, workspace_id, *args): chat_list = self._chat_lists.get(workspace_id) ===================================== gajim/gtk/main.py ===================================== @@ -11,6 +11,8 @@ from gajim.gui.account_side_bar import AccountSideBar from gajim.gui.workspace_side_bar import WorkspaceSideBar +from .util import open_window + class MainWindow(Gtk.ApplicationWindow): def __init__(self): @@ -45,6 +47,11 @@ def __init__(self): self._ui.middle_grid.add(self._chat_list_stack) self._ui.right_grid.add(self._chat_stack) + + self._ui.edit_workspace_button.connect( + 'clicked', self._on_edit_workspace_clicked) + self._ui.start_chat_button.connect( + 'clicked', self._on_start_chat_clicked) self._ui.connect_signals(self) self.show_all() @@ -133,3 +140,10 @@ def _load_chats(self): self.add_chat_for_workspace(workspace_id, account, jid) self._startup_finished = True + + def _on_start_chat_clicked(self, _button): + app.app.activate_action('start-chat', GLib.Variant('s', '')) + + def _on_edit_workspace_clicked(self, _button): + open_window('WorkspaceDialog', + workspace_id=self.get_active_workspace()) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -27,7 +27,7 @@ class WorkspaceDialog(Gtk.ApplicationWindow): - def __init__(self, edit_mode=True): + def __init__(self, workspace_id=None): Gtk.ApplicationWindow.__init__(self) self.set_name('WorkspaceDialog') self.set_application(app.app) @@ -37,7 +37,7 @@ def __init__(self, edit_mode=True): self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_size_request(350, -1) - self._edit_mode = edit_mode + self._workspace_id = workspace_id self._ui = get_builder('workspace_dialog.ui') self.add(self._ui.box) @@ -46,8 +46,14 @@ def __init__(self, edit_mode=True): self._avatar_selector.set_size_request(200, 200) self._ui.image_box.add(self._avatar_selector) - name = _('My Workspace') - rgba = Gdk.RGBA(*text_to_color(name)) + if workspace_id is not None: + name = app.settings.get_workspace_setting( + workspace_id, 'name') + rgba = Gdk.RGBA() # TODO: Load setting + else: + name = _('My Workspace') + rgba = Gdk.RGBA(*text_to_color(name)) + self._ui.entry.set_text(name) self._ui.color_chooser.set_rgba(rgba) self._generate_avatar() @@ -91,9 +97,11 @@ def _on_save(self, _button): # avatar = self._get_avatar_data() # use_image = self._ui.use_image.get_active() - if self._edit_mode: - # TODO: Edit action + if self._workspace_id is not None: + app.settings.set_workspace_setting( + self._workspace_id, 'name', name) self.destroy() + return app.window.activate_action( 'add-workspace', GLib.Variant('s', name)) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -41,7 +41,7 @@ def _on_button_press(self, _listbox, button_event): def _on_row_activated(self, _listbox, row): main_window = self.get_toplevel() if row.workspace_id == 'add': - open_window('WorkspaceDialog', edit_mode=False) + open_window('WorkspaceDialog') else: main_window.activate_action( 'activate-workspace', GLib.Variant('s', row.workspace_id)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/20b9fded18b0001992262a6506251494… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/20b9fded18b0001992262a6506251494… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: AvatarSelector: Add Load Image button
by Daniel Brötzmann 26 Jan '21

26 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 11cf3af1 by wurstsalat at 2021-01-26T19:12:44+01:00 AvatarSelector: Add Load Image button - - - - - 42245a96 by Daniel Brötzmann at 2021-01-26T19:15:00+01:00 Workspace: Add Workspace edit dialog - - - - - 5 changed files: - + gajim/data/gui/workspace_dialog.ui - gajim/gtk/avatar_selector.py - gajim/gtk/const.py - + gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -0,0 +1,221 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="preview"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="halign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Choose a color or select an image</property> + <property name="wrap">True</property> + <property name="max-width-chars">40</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkStackSwitcher"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="stack">style_stack</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkStack" id="style_stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-duration">100</property> + <property name="transition-type">slide-left-right</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="margin-top">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="label" translatable="yes">Color</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="color_chooser"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">color</property> + <property name="title" translatable="yes">Color</property> + </packing> + </child> + <child> + <object class="GtkBox" id="image_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkSwitch" id="use_image"> + <property name="visible">True</property> + <property name="can-focus">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Use Image instead of Color</property> + </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">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="name">image</property> + <property name="title" translatable="yes">Image</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_cancel" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Save</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_save" swapped="no"/> + <style> + <class name="suggested-action"/> + </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="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">7</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> +</interface> ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import get_file_path_from_dnd_dropped_uri +from .filechoosers import AvatarChooserDialog from .util import scale_with_ratio log = logging.getLogger('gajim.gui.avatar_selector') @@ -60,8 +61,8 @@ class Range(IntEnum): class AvatarSelector(Gtk.Box): def __init__(self): - Gtk.Box.__init__(self) - self.set_orientation(Gtk.Orientation.VERTICAL) + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, + spacing=12) self.get_style_context().add_class('padding-18') uri_entry = Gtk.TargetEntry.new( @@ -80,8 +81,16 @@ def __init__(self): # self._crop_area.set_min_size(200, 200) self.add(self._crop_area) + self._load_button = Gtk.Button() + self._load_button.set_label(_('Load Image')) + self._load_button.set_halign(Gtk.Align.CENTER) + self._load_button.set_no_show_all(True) + self._load_button.connect('clicked', self._on_load_clicked) + self._load_button.show() + self.add(self._load_button) + self._helper_label = Gtk.Label( - label=_('Select a picture or drop it here')) + label=_('…or drop it here')) self._helper_label.get_style_context().add_class('bold') self._helper_label.get_style_context().add_class('dim-label') self._helper_label.set_vexpand(True) @@ -94,9 +103,18 @@ def __init__(self): def prepare_crop_area(self, path): pixbuf = self._get_pixbuf_from_path(path) self._crop_area.set_pixbuf(pixbuf) + self._load_button.hide() self._helper_label.hide() self._crop_area.show() + def _on_load_clicked(self, _button): + def _on_file_selected(path): + self.prepare_crop_area(path) + + AvatarChooserDialog(_on_file_selected, + transient_for=self.get_toplevel(), + modal=True) + def _on_drag_data_received(self, _widget, _context, _x_coord, _y_coord, selection, target_type, _timestamp): if not selection.get_data(): ===================================== gajim/gtk/const.py ===================================== @@ -131,4 +131,5 @@ def __str__(self): 'Features': 'gajim.gui.features', 'StatusChange': 'gajim.gui.status_change', 'GroupChatInvitation': 'gajim.gui.groupchat_invitation', + 'WorkspaceDialog': 'gajim.gui.workspace_dialog', } ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -0,0 +1,100 @@ +# 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 gi.repository import Gdk +from gi.repository import GLib + +from gajim.common import app +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ + +from .avatar import generate_default_avatar +from .avatar_selector import AvatarSelector +from .util import get_builder +from .util import text_to_color + + +class WorkspaceDialog(Gtk.ApplicationWindow): + def __init__(self, edit_mode=True): + Gtk.ApplicationWindow.__init__(self) + self.set_name('WorkspaceDialog') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Workspace')) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_size_request(350, -1) + + self._edit_mode = edit_mode + + self._ui = get_builder('workspace_dialog.ui') + self.add(self._ui.box) + + self._avatar_selector = AvatarSelector() + self._avatar_selector.set_size_request(200, 200) + self._ui.image_box.add(self._avatar_selector) + + name = _('My Workspace') + rgba = Gdk.RGBA(*text_to_color(name)) + self._ui.entry.set_text(name) + self._ui.color_chooser.set_rgba(rgba) + self._generate_avatar() + + self._ui.connect_signals(self) + + self.connect('key-press-event', self._on_key_press_event) + self.show_all() + + def _on_key_press_event(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _on_cancel(self, _button): + self.destroy() + + def _generate_avatar(self): + name = self._ui.entry.get_text() + if not name: + return + letter = name[:1].upper() + scale = self.get_scale_factor() + surface = generate_default_avatar( + letter, name, AvatarSize.GROUP_INFO, scale, style='round-corners') + self._ui.preview.set_from_surface(surface) + + def _get_avatar_data(self): + if not self._avatar_selector.get_prepared(): + return None + + success, data, width, height = self._avatar_selector.get_avatar_bytes() + if not success: + return None + + return data + + def _on_save(self, _button): + name = self._ui.entry.get_text() + # rgba = self._ui.color_chooser.get_rgba() + # color = rgba.to_string() + # avatar = self._get_avatar_data() + # use_image = self._ui.use_image.get_active() + + if self._edit_mode: + # TODO: Edit action + self.destroy() + + app.window.activate_action( + 'add-workspace', GLib.Variant('s', name)) + self.destroy() ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -6,7 +6,8 @@ from gajim.common.i18n import _ -from gajim.gui.avatar import generate_default_avatar +from .avatar import generate_default_avatar +from .util import open_window class WorkspaceSideBar(Gtk.ListBox): @@ -40,8 +41,7 @@ def _on_button_press(self, _listbox, button_event): def _on_row_activated(self, _listbox, row): main_window = self.get_toplevel() if row.workspace_id == 'add': - main_window.activate_action( - 'add-workspace', GLib.Variant('s', 'test')) + open_window('WorkspaceDialog', edit_mode=False) else: main_window.activate_action( 'activate-workspace', GLib.Variant('s', row.workspace_id)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d9de03e4ebfc00dfef98f9776da5cab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d9de03e4ebfc00dfef98f9776da5cab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] CSS
by Philipp Hörist 24 Jan '21

24 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d9de03e4 by lovetox at 2021-01-24T23:27:44+01:00 CSS - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -53,9 +53,11 @@ .account-sidebar { background: transparent; margin-right: 12px; + margin-bottom: 6px; } .account-sidebar-item { - padding-bottom: 12px; + padding-top: 6px; + padding-bottom: 6px; } .account-sidebar-item:hover { @@ -69,7 +71,6 @@ } .account-sidebar-item image { border-radius: 9px; - border: 1px solid @borders; } .account-box > separator { background-color: darker(@theme_bg_color); @@ -82,7 +83,8 @@ margin-right: 12px; } .workspace-sidebar-item { - padding-bottom: 12px; + padding-top: 6px; + padding-bottom: 6px; } .workspace-sidebar-item:selected, .workspace-sidebar-item:hover { @@ -96,7 +98,6 @@ } .workspace-sidebar-item image { border-radius: 9px; - border: 1px solid @borders; } /* ChatList */ .small-label { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d9de03e4ebfc00dfef98f9776da5cab7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d9de03e4ebfc00dfef98f9776da5cab7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Dont fail when account is disabled
by Philipp Hörist 24 Jan '21

24 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 3444737c by lovetox at 2021-01-24T23:10:36+01:00 Dont fail when account is disabled - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -128,6 +128,8 @@ def _load_chats(self): open_chats = app.settings.get_workspace_setting(workspace_id, 'open_chats') for account, jid in open_chats: + if account not in app.connections: + continue self.add_chat_for_workspace(workspace_id, account, jid) self._startup_finished = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3444737c87d3937e62d5658c7d35f252… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3444737c87d3937e62d5658c7d35f252… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] css
by Philipp Hörist 24 Jan '21

24 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 6c36f415 by lovetox at 2021-01-24T23:08:01+01:00 css - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -58,13 +58,12 @@ padding-bottom: 12px; } -/*.account-sidebar-item:selected,*/ .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; } @@ -97,6 +96,7 @@ } .workspace-sidebar-item image { border-radius: 9px; + border: 1px solid @borders; } /* ChatList */ .small-label { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6c36f4156a115c49ced10be9003da2c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6c36f4156a115c49ced10be9003da2c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Improve left sidebar
by Philipp Hörist 24 Jan '21

24 Jan '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: ee17c524 by lovetox at 2021-01-24T23:04:06+01:00 Improve left sidebar - - - - - 8 changed files: - gajim/common/const.py - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/account_side_bar.py - gajim/gtk/avatar.py - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py - gajim/gui_interface.py Changes: ===================================== gajim/common/const.py ===================================== @@ -17,8 +17,8 @@ class AvatarSize(IntEnum): TAB = 16 ROSTER = 32 - ACCOUNT_SIDE_BAR = 32 - WORKSPACE = 32 + ACCOUNT_SIDE_BAR = 40 + WORKSPACE = 40 CHAT = 48 NOTIFICATION = 48 GROUP_INFO = 100 ===================================== gajim/data/gui/main.ui ===================================== @@ -115,6 +115,37 @@ <property name="can_focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</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="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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="account-box"/> + </style> + </object> + <packing> + <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> @@ -132,23 +163,45 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkBox" id="account_box"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">end</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <placeholder/> + <object class="GtkImage" id="app_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="app-image-box"/> + </style> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <style> ===================================== gajim/data/style/gajim.css ===================================== @@ -35,8 +35,16 @@ /* ChatList with Workspace and Account sidebars */ .chatlist-left-grid { - border-right: 1px solid @unfocused_borders; + border-right: 1px solid @unfocused_borders; +} + + +.app-image-box { margin: 12px 12px 0px 12px } +.app-image-box > separator { + background-color: darker(@theme_bg_color); } + + .account-identifier-bar { border-top-right-radius: 6px; border-bottom-right-radius: 6px; @@ -44,32 +52,38 @@ /* Account sidebar */ .account-sidebar { background: transparent; - padding-top: 3px; - border-top: 1px solid @borders; + margin-right: 12px; } .account-sidebar-item { - padding-top: 3px; - padding-bottom: 3px; + padding-bottom: 12px; } -.account-sidebar-item:selected { - background-color: @borders; + +/*.account-sidebar-item:selected,*/ +.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 { - margin-left: 3px; - margin-right: 3px; - padding: 3px; - background-color: @theme_unfocused_bg_color; - box-shadow: inset 0 0 6px @borders; - border-radius: 6px; - border: 1px solid @borders; + border-radius: 9px; + border: 1px solid @borders; +} +.account-box > separator { + background-color: darker(@theme_bg_color); + margin: 0px 12px 0px 12px; } /* Workspace sidebar */ .workspace-sidebar { background: transparent; + margin-left: 12px; + margin-right: 12px; } .workspace-sidebar-item { - padding-top: 3px; - padding-bottom: 3px; + padding-bottom: 12px; } .workspace-sidebar-item:selected, .workspace-sidebar-item:hover { @@ -82,8 +96,7 @@ box-shadow: 0 0 6px @theme_selected_bg_color; } .workspace-sidebar-item image { - padding: 3px; - border-radius: 6px; + border-radius: 9px; } /* ChatList */ .small-label { ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -27,16 +27,8 @@ class Account(Gtk.ListBoxRow): def __init__(self, account): Gtk.ListBoxRow.__init__(self) self.get_style_context().add_class('account-sidebar-item') - - self._account = account - self._jid = app.get_jid_from_account(account) - contact = app.contacts.create_contact(self._jid, account) - - scale = self.get_scale_factor() - surface = app.interface.get_avatar(contact, - AvatarSize.ACCOUNT_SIDE_BAR, - scale) - self._image = Gtk.Image.new_from_surface(surface) + self.set_selectable(False) + image = AccountAvatar(account) account_color_bar = Gtk.Box() account_color_bar.set_size_request(6, -1) @@ -45,11 +37,26 @@ def __init__(self, account): account_color_bar.get_style_context().add_class( 'account-identifier-bar') - account_box = Gtk.Box() + 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(self._image) + account_box.add(image) self.add(account_box) self.show_all() + + +class AccountAvatar(Gtk.Image): + def __init__(self, account): + Gtk.Image.__init__(self) + + jid = app.get_jid_from_account(account) + contact = app.contacts.create_contact(jid, account) + + scale = self.get_scale_factor() + surface = app.interface.get_avatar(contact, + AvatarSize.ACCOUNT_SIDE_BAR, + scale, + style='round-corners') + self.set_from_surface(surface) ===================================== gajim/gtk/avatar.py ===================================== @@ -80,10 +80,13 @@ def generate_avatar(letters, color, size, scale): @lru_cache(maxsize=2048) -def generate_default_avatar(letter, color_string, size, scale): +def generate_default_avatar(letter, color_string, size, scale, style='circle'): color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) - surface = clip_circle(surface) + if style == 'circle': + surface = clip_circle(surface) + elif style == 'round-corners': + surface = round_corners(surface) surface.set_device_scale(scale, scale) return surface @@ -183,6 +186,34 @@ def clip_circle(surface): return context.get_target() +def round_corners(surface): + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, + surface.get_width(), + surface.get_height()) + + new_surface.set_device_scale(*surface.get_device_scale()) + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + + width = surface.get_width() + height = surface.get_height() + scale = surface.get_device_scale()[0] + radius = 9 * scale + degrees = pi / 180 + + context.new_sub_path() + context.arc(width - radius, radius, radius, -90 * degrees, 0 * degrees) + context.arc(width - radius, height - radius, radius, 0 * degrees, 90 * degrees) + context.arc(radius, height - radius, radius, 90 * degrees, 180 * degrees) + context.arc(radius, radius, radius, 180 * degrees, 270 * degrees) + context.close_path() + context.clip() + + context.paint() + + return context.get_target() + + def get_avatar_from_pixbuf(pixbuf, scale, show=None): size = max(pixbuf.get_width(), pixbuf.get_height()) size *= scale @@ -207,11 +238,23 @@ def __init__(self): def invalidate_cache(self, jid): self._cache.pop(jid, None) - def get_pixbuf(self, contact, size, scale, show=None, default=False): - surface = self.get_surface(contact, size, scale, show, default) + def get_pixbuf(self, + contact, + size, + scale, + show=None, + default=False, + style='circle'): + surface = self.get_surface(contact, size, scale, show, default, style) return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) - def get_surface(self, contact, size, scale, show=None, default=False): + def get_surface(self, + contact, + size, + scale, + show=None, + default=False, + style='circle'): jid = contact.jid if contact.is_gc_contact: jid = contact.get_full_jid() @@ -237,7 +280,7 @@ def get_surface(self, contact, size, scale, show=None, default=False): letter = self._generate_letter(name) surface = generate_default_avatar( - letter, color_string, size, scale) + letter, color_string, size, scale, style=style) if show is not None: surface = add_status_to_avatar(surface, show) self._cache[jid][(size, scale, show)] = surface ===================================== gajim/gtk/main.py ===================================== @@ -5,6 +5,7 @@ from gajim.common import app from gajim.gui.util import get_builder +from gajim.gui.util import load_icon from gajim.gui.chat_list_stack import ChatListStack from gajim.gui.chat_stack import ChatStack from gajim.gui.account_side_bar import AccountSideBar @@ -35,6 +36,9 @@ def __init__(self): self._chat_list_stack = ChatListStack(self._ui, self._chat_stack) self._account_side_bar = AccountSideBar() self._workspace_side_bar = WorkspaceSideBar() + + surface = load_icon('org.gajim.Gajim', self, 40) + self._ui.app_image.set_from_surface(surface) self._ui.workspace_scrolled.add(self._workspace_side_bar) self._ui.account_box.add(self._account_side_bar) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -84,13 +84,7 @@ def __init__(self, workspace_id): self.sort_index = 0 - name = app.settings.get_workspace_setting(workspace_id, 'name') - letter = name[:2] - - scale = self.get_scale_factor() - surface = generate_default_avatar( - letter, name, AvatarSize.WORKSPACE, scale) - image = Gtk.Image.new_from_surface(surface) + image = WorkspaceAvatar(workspace_id) image.set_halign(Gtk.Align.CENTER) self.add(image) self.show_all() @@ -137,3 +131,15 @@ def _on_click(self, _button, action): self.set_relative_to(None) app.window.activate_action(action, GLib.Variant('s', self._workspace_id)) + + +class WorkspaceAvatar(Gtk.Image): + def __init__(self, workspace_id): + Gtk.Image.__init__(self) + + name = app.settings.get_workspace_setting(workspace_id, 'name') + letter = name[:1].upper() + scale = self.get_scale_factor() + surface = generate_default_avatar( + letter, name, AvatarSize.WORKSPACE, scale, style='round-corners') + self.set_from_surface(surface) ===================================== gajim/gui_interface.py ===================================== @@ -1882,10 +1882,18 @@ def update_avatar(self, account=None, jid=None, def save_avatar(self, data): return self.avatar_storage.save_avatar(data) - def get_avatar(self, contact, size, scale, show=None, pixbuf=False): + def get_avatar(self, + contact, + size, + scale, + show=None, + pixbuf=False, + style='circle'): if pixbuf: - return self.avatar_storage.get_pixbuf(contact, size, scale, show) - return self.avatar_storage.get_surface(contact, size, scale, show) + return self.avatar_storage.get_pixbuf( + contact, size, scale, show, style=style) + return self.avatar_storage.get_surface( + contact, size, scale, show, style=style) def avatar_exists(self, filename): return self.avatar_storage.get_avatar_path(filename) is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ee17c5244211091a8a92d0f4ea1f386e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ee17c5244211091a8a92d0f4ea1f386e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] WorkspaceSidebar: Improve styling
by Daniel Brötzmann 24 Jan '21

24 Jan '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 7eb1c456 by wurstsalat at 2021-01-24T20:36:54+01:00 WorkspaceSidebar: Improve styling - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -64,24 +64,26 @@ border: 1px solid @borders; } /* Workspace sidebar */ - .workspace-sidebar { - background: transparent; + background: transparent; } - .workspace-sidebar-item { padding-top: 3px; padding-bottom: 3px; } -.workspace-sidebar-item:selected { - background-color: @borders; +.workspace-sidebar-item:selected, +.workspace-sidebar-item:hover { + background: transparent; + box-shadow: none; + outline: none; +} +.workspace-sidebar-item:selected image, +.workspace-sidebar-item:hover image { + box-shadow: 0 0 6px @theme_selected_bg_color; } .workspace-sidebar-item image { - padding: 6px; - background-color: @theme_unfocused_bg_color; - box-shadow: inset 0 0 6px @borders; + padding: 3px; border-radius: 6px; - border: 1px solid @borders; } /* ChatList */ .small-label { ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -107,6 +107,7 @@ def __init__(self, workspace_id): image = Gtk.Image.new_from_icon_name('list-add-symbolic', Gtk.IconSize.DND) image.set_halign(Gtk.Align.CENTER) + image.get_style_context().add_class('dim-label') self.add(image) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7eb1c456f856fbb47cf026f53653da5b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7eb1c456f856fbb47cf026f53653da5b… 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