Commits February 2021

commits@gajim.org

1 participants
124 discussions

[Git][gajim/gajim][mainwindow] WorkspaceSidebar: Improve item highlighting
by Daniel Brötzmann 20 Feb '21

20 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fb7c6c6f by wurstsalat at 2021-02-20T14:03:37+01:00 WorkspaceSidebar: Improve item highlighting - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -43,6 +43,12 @@ border-top-right-radius: 6px; border-bottom-right-radius: 6px; } +.selection-bar { + border-top-right-radius: 6px; + border-bottom-right-radius: 6px; + margin-top: 6px; + margin-bottom: 6px; +} .small-label { font-size: small; } @@ -61,7 +67,6 @@ /* Workspace sidebar */ .workspace-sidebar { background: transparent; - margin-left: 6px; margin-right: 6px; } .workspace-sidebar-item { @@ -69,14 +74,17 @@ padding-bottom: 0px; } .workspace-sidebar-item:selected, -.workspace-sidebar-item:hover { +.workspace-sidebar-item:hover, +.workspace-sidebar-item:focus { 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:selected .selection-bar { + background-color: lighter(@theme_selected_bg_color); +} +.workspace-sidebar-item:hover .selection-bar { + background-color: @theme_selected_bg_color; } .workspace-sidebar-item image { border-radius: 9px; @@ -88,6 +96,13 @@ .workspace-sidebar-item.drag-hover-bottom { border-bottom: 1px solid #4e9a06; } +.workspace-add { + padding-left: 6px; + color: alpha(@theme_text_color, 0.7); +} +.workspace-sidebar-item:hover .workspace-add { + -gtk-icon-shadow: 0 0 3px @theme_selected_bg_color; +} /* Account sidebar */ .account-sidebar { ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -1,7 +1,6 @@ from gi.repository import Gdk from gi.repository import Gtk -from gi.repository import GLib from gajim.common import app from gajim.common.const import AvatarSize @@ -206,8 +205,16 @@ def __init__(self, workspace_id): self._image = WorkspaceAvatar(workspace_id) self._image.set_halign(Gtk.Align.CENTER) + selection_bar = Gtk.Box() + selection_bar.set_size_request(6, -1) + selection_bar.get_style_context().add_class('selection-bar') + + item_box = Gtk.Box() + item_box.add(selection_bar) + item_box.add(self._image) + overlay = Gtk.Overlay() - overlay.add(self._image) + overlay.add(item_box) overlay.add_overlay(self._unread_label) # Drag and Drop @@ -257,11 +264,12 @@ class AddWorkspace(CommonWorkspace): def __init__(self, workspace_id): CommonWorkspace.__init__(self, workspace_id) self.set_selectable(False) + self.set_tooltip_text(_('Add Workspace')) 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') + image.get_style_context().add_class('workspace-add') self.add(image) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fb7c6c6fdf01166b643c2d92204a14d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fb7c6c6fdf01166b643c2d92204a14d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Change servers.json format
by Philipp Hörist 20 Feb '21

20 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9678acc3 by mimi89999 at 2021-02-19T19:27:14+01:00 Change servers.json format - - - - - 2 changed files: - gajim/data/other/servers.json - gajim/gtk/account_wizard.py Changes: ===================================== gajim/data/other/servers.json ===================================== @@ -1,28 +1,26 @@ -{ - "servers":[ - "0nl1ne.at", - "blabber.im", - "creep.im", - "deshalbfrei.org", - "draugr.de", - "jabber.ccc.de", - "jabber.cz", - "jabber.meta.net.nz", - "jabber.no", - "jabber.sk", - "jabberes.org", - "jabbim.com", - "jabbim.cz", - "jabbim.pl", - "jabbim.sk", - "jabster.pl", - "lightwitch.org", - "linuxlovers.at", - "njs.netlab.cz", - "tigase.im", - "ubuntu-jabber.de", - "ubuntu-jabber.net", - "verdammung.org", - "xabber.de" - ] -} +[ + "0nl1ne.at", + "blabber.im", + "creep.im", + "deshalbfrei.org", + "draugr.de", + "jabber.ccc.de", + "jabber.cz", + "jabber.meta.net.nz", + "jabber.no", + "jabber.sk", + "jabberes.org", + "jabbim.com", + "jabbim.cz", + "jabbim.pl", + "jabbim.sk", + "jabster.pl", + "lightwitch.org", + "linuxlovers.at", + "njs.netlab.cz", + "tigase.im", + "ubuntu-jabber.de", + "ubuntu-jabber.net", + "verdammung.org", + "xabber.de" +] ===================================== gajim/gtk/account_wizard.py ===================================== @@ -559,7 +559,7 @@ def _on_signup(self, *args): def _create_server_completion(self): # Parse servers.json file_path = configpaths.get('DATA') / 'other' / 'servers.json' - self._servers = helpers.load_json(file_path, 'servers', []) + self._servers = helpers.load_json(file_path, default=[]) # Create a separate model for the address entry, because it will # be updated with our localpart@ @@ -658,7 +658,7 @@ def focus(self): def _create_server_completion(self): # Parse servers.json file_path = configpaths.get('DATA') / 'other' / 'servers.json' - servers = helpers.load_json(file_path, 'servers', []) + servers = helpers.load_json(file_path, default=[]) # Create servers_model for comboboxes and entries servers_model = Gtk.ListStore(str) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9678acc3c7124b0d2318726f65ba709b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9678acc3c7124b0d2318726f65ba709b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Add basic list headers
by Daniel Brötzmann 19 Feb '21

19 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 57b9f5e7 by wurstsalat at 2021-02-19T23:16:45+01:00 ChatList: Add basic list headers - - - - - 3 changed files: - gajim/common/const.py - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/common/const.py ===================================== @@ -14,6 +14,12 @@ Entity = namedtuple('Entity', 'jid node hash method') +class RowHeaderType(IntEnum): + ACTIVE = 0 + CONVERSATIONS = 1 + PINNED = 2 + + class AvatarSize(IntEnum): TAB = 16 ROSTER = 32 ===================================== gajim/data/style/gajim.css ===================================== @@ -197,6 +197,12 @@ padding-right: 6px; border-radius: 10px; } +.header-box label { + padding: 0px 18px 0px 18px; + font-weight: bold; + color:@insensitive_fg_color; + font-size: small; +} /* VCardWindow */ .VCard-GtkLinkButton { padding-left: 5px; border-left: none; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -6,6 +6,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.const import KindConstant +from gajim.common.const import RowHeaderType from gajim.common.i18n import _ from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_group_chat_nick @@ -29,6 +30,7 @@ def __init__(self, workspace_id): self.get_style_context().add_class('chatlist') self.set_filter_func(self._filter_func) + self.set_header_func(self._header_func) self.set_sort_func(self._sort_func) self.set_has_tooltip(True) @@ -94,6 +96,33 @@ def _filter_func(self, row): return True return self._current_filter_text in row.jid + @staticmethod + def _header_func(row, before): + if before is None: + if row.is_pinned: + row.header = RowHeaderType.PINNED + # elif row.is_active(): + # row.header = RowHeaderType.ACTIVE + else: + row.header = None + else: + if row.is_pinned: + if before.is_pinned: + row.header = None + else: + row.header = RowHeaderType.PINNED + # elif row.is_active(): + # if before.is_active() and not before.is_pinned: + # row.header = None + # else: + # row.header = RowHeaderType.ACTIVE + else: + # if before.is_active() or before.is_pinned: + if before.is_pinned: + row.header = RowHeaderType.CONVERSATIONS + else: + row.header = None + @staticmethod def _sort_func(row1, row2): if row1.is_pinned > row2.is_pinned: @@ -245,6 +274,10 @@ def __init__(self, workspace_id, account, jid, type_): self.workspace_id = workspace_id self.type = type_ + self.active_label = ActiveHeader() + self.conversations_label = ConversationsHeader() + self.pinned_label = PinnedHeader() + self._timestamp = None self._unread_count = 0 self._pinned = False # TODO: Load from settings @@ -296,6 +329,26 @@ def __init__(self, workspace_id, account, jid, type_): self.show_all() + @property + def header(self): + header = self.get_header() + if header is None: + return None + return header.type + + @header.setter + def header(self, type_): + if type_ == self.header: + return + if type_ is None: + self.set_header(None) + elif type_ is RowHeaderType.PINNED: + self.set_header(self.pinned_label) + elif type_ == RowHeaderType.ACTIVE: + self.set_header(self.active_label) + else: + self.set_header(self.conversations_label) + @property def is_pinned(self): return self._pinned @@ -441,3 +494,38 @@ def set_last_message_text(self, nickname, text): self._ui.message_label.set_text(text) self._ui.nick_label.set_visible(bool(nickname)) self._ui.nick_label.set_text(nickname) + + +class BaseHeader(Gtk.Box): + def __init__(self, row_type, text): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.type = row_type + label = Gtk.Label(label=text) + label.set_halign(Gtk.Align.START) + self.add(label) + self.get_style_context().add_class('header-box') + self.show_all() + + +class ActiveHeader(BaseHeader): + + def __init__(self): + BaseHeader.__init__(self, + RowHeaderType.ACTIVE, + _('Active')) + + +class ConversationsHeader(BaseHeader): + + def __init__(self): + BaseHeader.__init__(self, + RowHeaderType.CONVERSATIONS, + _('Conversations')) + + +class PinnedHeader(BaseHeader): + + def __init__(self): + BaseHeader.__init__(self, + RowHeaderType.PINNED, + _('Pinned')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57b9f5e7e3d8e94f07aa4c5b84c461af… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57b9f5e7e3d8e94f07aa4c5b84c461af… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ChatList: Improve chatstate icon
by Daniel Brötzmann 19 Feb '21

19 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 667ae2a7 by wurstsalat at 2021-02-18T21:14:32+01:00 ChatList: Improve chatstate icon - - - - - 4dfd764a by wurstsalat at 2021-02-19T22:08:37+01:00 ChatList: Add context menu and pinning - - - - - 6 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -2,89 +2,148 @@  <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkOverlay" id="overlay"> + <object class="GtkEventBox" id="eventbox"> <property name="visible">True</property> <property name="can-focus">False</property> <child> - <object class="GtkBox"> + <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can-focus">False</property> - <child> - <object class="GtkBox" id="account_identifier"> - <property name="width-request">6</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="margin-end">6</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <style> - <class name="account-identifier-bar"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="avatar_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-end">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="account_identifier"> + <property name="width-request">6</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="margin-end">6</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="account-identifier-bar"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-end">12</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="spacing">3</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="group_chat_indicator"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">system-users-symbolic</property> + <property name="icon_size">1</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="GtkLabel" id="name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</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> - <object class="GtkImage" id="group_chat_indicator"> + <object class="GtkImage" id="chatstate_image"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="icon-name">system-users-symbolic</property> - <property name="icon_size">1</property> + <property name="valign">end</property> + <property name="icon-name">content-loading-symbolic</property> <style> - <class name="dim-label"/> + <class name="chatstate-icon"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkLabel" id="name_label"> + <object class="GtkLabel" id="timestamp_label"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> + <property name="valign">end</property> + <style> + <class name="small-label"/> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="unread_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <style> + <class name="unread-counter"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">3</property> </packing> </child> </object> @@ -95,94 +154,46 @@ </packing> </child> <child> - <object class="GtkImage" id="chatstate_image"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="valign">end</property> - <property name="icon-name">content-loading-symbolic</property> - <style> - <class name="chatstate-icon"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="timestamp_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">end</property> - <style> - <class name="small-label"/> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="unread_label"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <style> - <class name="unread-counter"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkLabel" id="nick_label"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">start</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> - <style> - <class name="small-label"/> - <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="GtkLabel" id="message_label"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> - <style> - <class name="small-label"/> - </style> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="nick_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">start</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + <style> + <class name="small-label"/> + <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="GtkLabel" id="message_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> + <style> + <class name="small-label"/> + </style> + </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> @@ -192,41 +203,36 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="index">-1</property> </packing> </child> - </object> - <packing> - <property name="index">-1</property> - </packing> - </child> - <child type="overlay"> - <object class="GtkRevealer" id="revealer"> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="transition-type">crossfade</property> - <property name="transition-duration">100</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="valign">center</property> - <property name="margin-end">3</property> + <child type="overlay"> + <object class="GtkRevealer" id="revealer"> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="transition-type">crossfade</property> + <property name="transition-duration">100</property> <child> - <object class="GtkImage"> + <object class="GtkButton" id="close_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">window-close-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="valign">center</property> + <property name="margin-end">3</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-symbolic</property> + </object> + </child> </object> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -167,17 +167,20 @@ } @keyframes composing { 0% { - -gtk-icon-transform: translate(0px, 0px); + -gtk-icon-transform: translate(0px, 2px); } 10% { - -gtk-icon-transform: translate(0px, -3px) rotate(20deg); + -gtk-icon-transform: translate(0px, -1px) rotate(20deg); } 30% { - -gtk-icon-transform: translate(0px, -3px) rotate(-20deg); + -gtk-icon-transform: translate(0px, -1px) rotate(-20deg); } 40% { - -gtk-icon-transform: translate(0px, 0px); + -gtk-icon-transform: translate(0px, 2px); } + 100% { + -gtk-icon-transform: translate(0px, 2px); + } } .chatstate-icon { animation-name: composing; ===================================== gajim/gtk/chat_list.py ===================================== @@ -11,6 +11,8 @@ from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_uf_relative_time +from gajim.gui_menu_builder import get_chat_list_row_menu + from .tooltips import RosterTooltip from .util import get_builder @@ -94,6 +96,11 @@ def _filter_func(self, row): @staticmethod def _sort_func(row1, row2): + if row1.is_pinned > row2.is_pinned: + return -1 + if row2.is_pinned > row1.is_pinned: + return 1 + if row1.is_recent == row2.is_recent: return 0 return -1 if row1.is_recent else 1 @@ -119,6 +126,11 @@ def select_chat(self, account, jid): row = self._chats[(account, jid)] self.select_row(row) + def toggle_chat_pinned(self, account, jid): + row = self._chats[(account, jid)] + row.toggle_pinned() + self.invalidate_sort() + def remove_chat(self, account, jid): row = self._chats.pop((account, jid)) self.remove(row) @@ -235,13 +247,15 @@ def __init__(self, workspace_id, account, jid, type_): self._timestamp = None self._unread_count = 0 + self._pinned = False # TODO: Load from settings self.get_style_context().add_class('chatlist-row') self._ui = get_builder('chat_list_row.ui') - self.add(self._ui.overlay) + self.add(self._ui.eventbox) self.connect('state-flags-changed', self._on_state_flags_changed) + self._ui.eventbox.connect('button-press-event', self._on_button_press) self._ui.close_button.connect('clicked', self._on_close_button_clicked) account_class = app.css_config.get_dynamic_class(account) @@ -282,6 +296,24 @@ def __init__(self, workspace_id, account, jid, type_): self.show_all() + @property + def is_pinned(self): + return self._pinned + + def _on_button_press(self, _widget, event): + if event.button == 3: # right click + self._popup_menu() + + def _popup_menu(self): + menu = get_chat_list_row_menu( + self.workspace_id, self.account, self.jid, self._pinned) + popover = Gtk.Popover.new_from_model(self, menu) + popover.set_position(Gtk.PositionType.BOTTOM) + popover.popup() + + def toggle_pinned(self): + self._pinned = not self._pinned + def update_avatar(self): scale = self.get_scale_factor() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -132,6 +132,10 @@ def store_open_chats(self, workspace_id): app.settings.set_workspace_setting( workspace_id, 'open_chats', open_chats) + def toggle_chat_pinned(self, workspace_id, account, jid): + chat_list = self._chat_lists[workspace_id] + chat_list.toggle_chat_pinned(account, jid) + def remove_chat(self, workspace_id, account, jid): chat_list = self._chat_lists[workspace_id] type_ = chat_list.get_chat_type(account, jid) ===================================== gajim/gtk/main.py ===================================== @@ -161,6 +161,7 @@ def _add_actions(self): ('add-chat', 'as', self._add_chat), ('add-group-chat', 'as', self._add_group_chat), ('remove-chat', 'as', self._remove_chat), + ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), ] for action in actions: @@ -281,7 +282,6 @@ def _on_action(self, action, _param): # self.notebook.set_current_page(number - 1) # return - def get_widget(self, name): return getattr(self._ui, name) @@ -427,6 +427,13 @@ def add_chat_for_workspace(self, self._chat_list_stack.select_chat(account, jid) self._chat_list_stack.store_open_chats(workspace_id) + def _toggle_chat_pinned(self, _action, param): + workspace_id, account, jid = param.unpack() + self.toggle_chat_pinned(workspace_id, account, jid) + + def toggle_chat_pinned(self, workspace_id, account, jid): + self._chat_list_stack.toggle_chat_pinned(workspace_id, account, jid) + def _remove_chat(self, _action, param): workspace_id, account, jid = param.unpack() self.remove_chat(workspace_id, account, jid) ===================================== gajim/gui_menu_builder.py ===================================== @@ -796,6 +796,20 @@ def get_conv_context_menu(account, uri): return menu +def get_chat_list_row_menu(workspace_id, account, jid, pinned): + menu = Gio.Menu() + action = 'win.toggle-chat-pinned' + if not pinned: + label = _('Pin Conversation') + else: + label = _('Unpin Conversation') + menuitem = Gio.MenuItem.new(label, action) + variant_list = GLib.Variant('as', [workspace_id, account, jid]) + menuitem.set_action_and_target_value(action, variant_list) + menu.append_item(menuitem) + return menu + + def get_groupchat_roster_menu(account, control_id, self_contact, contact): menu = Gtk.Menu() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4a5125627706d7aa87750f81ef7890… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4a5125627706d7aa87750f81ef7890… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-2.0.2
by Philipp Hörist 18 Feb '21

18 Feb '21

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

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 2.0.2
by Philipp Hörist 18 Feb '21

18 Feb '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 99530609 by lovetox at 2021-02-18T22:51:55+01:00 2.0.2 - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,12 @@ +python-nbxmpp 2.0.2 (18 February 2021) + + Bugfixes + + * Add get_text() for Error Base class + * Client: Remove GSSAPI from default mechanisms + * Presence: Fix is_nickname_changed check + * UserAvatar: Add default argument + python-nbxmpp 2.0.1 (07 February 2021) New ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "2.0.1" +__version__ = "2.0.2" ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 2.0.1 +version = 2.0.2 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/99530609dcf9022fccf2a0a1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/99530609dcf9022fccf2a0a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 6 commits: Add Namespace
by Philipp Hörist 18 Feb '21

18 Feb '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: a8a240a2 by lovetox at 2021-02-18T22:47:07+01:00 Add Namespace - - - - - 184a22e1 by lovetox at 2021-02-18T22:47:44+01:00 Errors: Add get_text() for base class - - - - - 9557bd31 by lovetox at 2021-02-18T22:47:44+01:00 Protocol: Always return string - - - - - 623b1fb2 by lovetox at 2021-02-18T22:47:44+01:00 Client: Remove GSSAPI from default mechanisms - - - - - 53b6d5d9 by lovetox at 2021-02-18T22:48:26+01:00 Presence: Fix is_nickname_changed check Check if status code is there before checking nickname, otherwise we get a attribute error when muc_user is None - - - - - 3dff5d1f by lovetox at 2021-02-18T22:48:26+01:00 UserAvatar: Add default argument The SHA of the default avatar will be set as item id attr Fixes #118 - - - - - 6 changed files: - nbxmpp/client.py - nbxmpp/errors.py - nbxmpp/modules/user_avatar.py - nbxmpp/namespaces.py - nbxmpp/protocol.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -280,9 +280,6 @@ class Client(Observable): def mechs(self): return set(self._allowed_mechs or set(['SCRAM-SHA-256', 'SCRAM-SHA-1', - 'GSSAPI', - # 'SCRAM-SHA-256-PLUS', - # 'SCRAM-SHA-1-PLUS', 'PLAIN'])) def set_mechs(self, mechs): ===================================== nbxmpp/errors.py ===================================== @@ -32,6 +32,9 @@ class BaseError(Exception): def __str__(self): return self.text + def get_text(self): + return self.text + class StanzaError(BaseError): ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -80,7 +80,7 @@ class UserAvatar(BaseModule): return try: - data = AvatarMetaData.from_node(metadata) + data = AvatarMetaData.from_node(metadata, item.getAttr('id')) except Exception as error: self._log.warning('Malformed user avatar data: %s', error) self._log.warning(stanza) @@ -128,7 +128,7 @@ class UserAvatar(BaseModule): if not metadata.getChildren(): yield task.set_result(None) - yield AvatarMetaData.from_node(metadata) + yield AvatarMetaData.from_node(metadata, item.getAttr('id')) @iq_request_task def set_avatar(self, avatar, public=False): @@ -190,7 +190,7 @@ class UserAvatar(BaseModule): result = yield self.publish(Namespace.AVATAR_METADATA, metadata.to_node(), - id_='current', + id_=metadata.default, options=options, force_node_options=True) @@ -310,9 +310,10 @@ class AvatarData: @dataclass class AvatarMetaData: infos: List[AvatarInfo] = field(default_factory=list) + default: AvatarInfo = None @classmethod - def from_node(cls, node): + def from_node(cls, node, default=None): infos = [] info_nodes = node.getTags('info') for info in info_nodes: @@ -324,10 +325,12 @@ class AvatarMetaData: height=info.getAttr('height'), width=info.getAttr('width') )) - return cls(infos=infos) + return cls(infos=infos, default=default) - def add_avatar_info(self, avatar_info): + def add_avatar_info(self, avatar_info, make_default=False): self.infos.append(avatar_info) + if make_default: + self.default = avatar_info.id def to_node(self): return _make_metadata_node(self.infos) @@ -342,7 +345,14 @@ class Avatar: metadata: AvatarMetaData = field(default_factory=AvatarMetaData) data: Dict[AvatarInfo, bytes] = field(init=False, default_factory=dict) - def add_image_source(self, data, type_, height, width, url=None): + def add_image_source(self, + data, + type_, + height, + width, + url=None, + make_default=True): + sha = hashlib.sha1(data).hexdigest() info = AvatarInfo(bytes=len(data), id=sha, @@ -350,7 +360,7 @@ class Avatar: height=height, width=width, url=url) - self.metadata.add_avatar_info(info) + self.metadata.add_avatar_info(info, make_default=make_default) self.data[info] = AvatarData(data=data, sha=sha) def pubsub_avatar_info(self): ===================================== nbxmpp/namespaces.py ===================================== @@ -129,6 +129,7 @@ class _Namespaces: PUBSUB_EVENT: str = 'http://jabber.org/protocol/pubsub#event' PUBSUB_OWNER: str = 'http://jabber.org/protocol/pubsub#owner' PUBSUB_PUBLISH_OPTIONS: str = 'http://jabber.org/protocol/pubsub#publish-options' + PUBSUB_NODE_MAX: str = 'http://jabber.org/protocol/pubsub#config-node-max' RECEIPTS: str = 'urn:xmpp:receipts' REGISTER: str = 'jabber:iq:register' REGISTER_FEATURE: str = 'http://jabber.org/features/iq-register' ===================================== nbxmpp/protocol.py ===================================== @@ -1344,7 +1344,7 @@ class Presence(Protocol): """ Return the status string of the message """ - return self.getTagData('status') + return self.getTagData('status') or '' def setPriority(self, val): """ ===================================== nbxmpp/structs.py ===================================== @@ -906,8 +906,8 @@ class PresenceProperties: def is_nickname_changed(self): return (self.from_muc and self.muc_status_codes is not None and - self.muc_user.nick is not None and StatusCode.NICKNAME_CHANGE in self.muc_status_codes and + self.muc_user.nick is not None and self.type == PresenceType.UNAVAILABLE) @property View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5fcbb2d1fdcf69b84fa6855… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5fcbb2d1fdcf69b84fa6855… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] UserAvatar: Add default argument
by Philipp Hörist 18 Feb '21

18 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 932cdc77 by lovetox at 2021-02-18T22:06:24+01:00 UserAvatar: Add default argument The SHA of the default avatar will be set as item id attr Fixes #118 - - - - - 1 changed file: - nbxmpp/modules/user_avatar.py Changes: ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -80,7 +80,7 @@ class UserAvatar(BaseModule): return try: - data = AvatarMetaData.from_node(metadata) + data = AvatarMetaData.from_node(metadata, item.getAttr('id')) except Exception as error: self._log.warning('Malformed user avatar data: %s', error) self._log.warning(stanza) @@ -128,7 +128,7 @@ class UserAvatar(BaseModule): if not metadata.getChildren(): yield task.set_result(None) - yield AvatarMetaData.from_node(metadata) + yield AvatarMetaData.from_node(metadata, item.getAttr('id')) @iq_request_task def set_avatar(self, avatar, public=False): @@ -190,7 +190,7 @@ class UserAvatar(BaseModule): result = yield self.publish(Namespace.AVATAR_METADATA, metadata.to_node(), - id_='current', + id_=metadata.default, options=options, force_node_options=True) @@ -310,9 +310,10 @@ class AvatarData: @dataclass class AvatarMetaData: infos: List[AvatarInfo] = field(default_factory=list) + default: AvatarInfo = None @classmethod - def from_node(cls, node): + def from_node(cls, node, default=None): infos = [] info_nodes = node.getTags('info') for info in info_nodes: @@ -324,10 +325,12 @@ class AvatarMetaData: height=info.getAttr('height'), width=info.getAttr('width') )) - return cls(infos=infos) + return cls(infos=infos, default=default) - def add_avatar_info(self, avatar_info): + def add_avatar_info(self, avatar_info, make_default=False): self.infos.append(avatar_info) + if make_default: + self.default = avatar_info.id def to_node(self): return _make_metadata_node(self.infos) @@ -342,7 +345,14 @@ class Avatar: metadata: AvatarMetaData = field(default_factory=AvatarMetaData) data: Dict[AvatarInfo, bytes] = field(init=False, default_factory=dict) - def add_image_source(self, data, type_, height, width, url=None): + def add_image_source(self, + data, + type_, + height, + width, + url=None, + make_default=True): + sha = hashlib.sha1(data).hexdigest() info = AvatarInfo(bytes=len(data), id=sha, @@ -350,7 +360,7 @@ class Avatar: height=height, width=width, url=url) - self.metadata.add_avatar_info(info) + self.metadata.add_avatar_info(info, make_default=make_default) self.data[info] = AvatarData(data=data, sha=sha) def pubsub_avatar_info(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/932cdc77c1651454a67ccb8a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/932cdc77c1651454a67ccb8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Add chatstate icon
by Daniel Brötzmann 18 Feb '21

18 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e4a51256 by Daniel Brötzmann at 2021-02-18T19:13:59+01:00 ChatList: Add chatstate icon - - - - - 4 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -95,17 +95,18 @@ </packing> </child> <child> - <object class="GtkLabel" id="unread_label"> + <object class="GtkImage" id="chatstate_image"> <property name="can-focus">False</property> <property name="no-show-all">True</property> + <property name="valign">end</property> + <property name="icon-name">content-loading-symbolic</property> <style> - <class name="unread-counter"/> + <class name="chatstate-icon"/> </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> @@ -126,6 +127,21 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkLabel" id="unread_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <style> + <class name="unread-counter"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -165,7 +165,26 @@ .chatlist-row overlay > box { padding: 6px; } - +@keyframes composing { + 0% { + -gtk-icon-transform: translate(0px, 0px); + } + 10% { + -gtk-icon-transform: translate(0px, -3px) rotate(20deg); + } + 30% { + -gtk-icon-transform: translate(0px, -3px) rotate(-20deg); + } + 40% { + -gtk-icon-transform: translate(0px, 0px); + } +} +.chatstate-icon { + animation-name: composing; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; +} .unread-counter { background-color: rgb(22, 100, 169); color: rgb(242, 242, 242); ===================================== gajim/gtk/chat_list.py ===================================== @@ -152,6 +152,8 @@ def process_event(self, event): self._on_presence_received(event) elif event.name == 'message-sent': self._on_message_sent(event) + elif event.name == 'chatstate-received': + self._on_chatstate_received(event) else: log.warning('Unhandled Event: %s', event.name) @@ -202,6 +204,15 @@ def _on_presence_received(self, event): row = self._chats.get((event.account, event.jid)) row.update_avatar() + def _on_chatstate_received(self, event): + row = self._chats.get((event.account, event.jid)) + if event.contact.is_gc_contact: + chatstate = event.contact.chatstate + else: + chatstate = app.contacts.get_combined_chatstate( + row.account, row.jid) + row.set_chatstate(chatstate) + @staticmethod def _add_unread(row, properties): if properties.is_carbon_message and properties.carbon.is_sent: @@ -329,6 +340,12 @@ def update_name(self): self._ui.name_label.set_text(name) + def set_chatstate(self, chatstate): + if chatstate == 'composing': + self._ui.chatstate_image.show() + else: + self._ui.chatstate_image.hide() + @property def unread_count(self): return self._unread_count ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -13,6 +13,7 @@ 'gc-message-received', 'presence-received', 'message-sent', + 'chatstate-received', ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4a5125627706d7aa87750f81ef78909… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e4a5125627706d7aa87750f81ef78909… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Show error if avatar upload fails
by Philipp Hörist 17 Feb '21

17 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: b543f1ab by lovetox at 2021-02-17T22:05:26+01:00 Profile: Show error if avatar upload fails - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -236,8 +236,10 @@ def _on_save_clicked(self, _widget): else: # Only update avatar if it changed - con.get_module('UserAvatar').set_avatar(self._new_avatar, - public=public) + con.get_module('UserAvatar').set_avatar( + self._new_avatar, + public=public, + callback=self._on_set_avatar) nick = GLib.markup_escape_text(self._ui.nickname_entry.get_text()) con.get_module('UserNickname').set_nickname(nick, public=public) @@ -247,6 +249,28 @@ def _on_save_clicked(self, _widget): self.account, 'name') app.nicks[self.account] = nick + def _on_set_avatar(self, task): + try: + task.finish() + except StanzaError as error: + if self._new_avatar is None: + # Trying to remove the avatar but the node does not exist + if error.condition == 'item-not-found': + return + + title = _('Error while uploading avatar') + text = error.get_text() + + if (error.condition == 'not-acceptable' and + error.app_condition == 'payload-too-big'): + text = _('Avatar file size too big') + + ErrorDialog(title, text) + + self._ui.avatar_image.set_from_surface(self._current_avatar) + self._new_avatar = False + return + def _on_remove_avatar(self, _button): contact = app.contacts.create_contact(self._jid, self.account) scale = self.get_scale_factor() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b543f1ab31b022bb5e1326a25486401f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b543f1ab31b022bb5e1326a25486401f… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
...
13
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2021