Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Profile: Check for PubSub instead of vcard-temp
by Philipp Hörist 15 Feb '21

15 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 944600eb by lovetox at 2021-02-15T16:14:49+01:00 Profile: Check for PubSub instead of vcard-temp - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -554,7 +554,7 @@ def _set_shortcuts(self): self.set_accels_for_action(action, accels) def _on_feature_discovered(self, event): - if event.feature == Namespace.VCARD: + if event.feature == Namespace.PUBSUB: action = '%s-profile' % event.account self.lookup_action(action).set_enabled(True) elif event.feature == Namespace.MAM_2: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/944600ebee34e71ca80e224f7ef40619… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/944600ebee34e71ca80e224f7ef40619… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Stop early when handling connection-failed in handle_event
by Daniel Brötzmann 14 Feb '21

14 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a8111619 by wurstsalat at 2021-02-14T21:39:15+01:00 Stop early when handling connection-failed in handle_event Fixes: #10436 - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -1185,16 +1185,16 @@ def add_event(self, account, jid, event): self.roster.select_contact(bb_jid, bb_account) def handle_event(self, account, fjid, type_): + if type_ in ('connection-lost', 'connection-failed'): + app.interface.roster.window.present() + return + w = None ctrl = None resource = app.get_resource_from_jid(fjid) jid = app.get_jid_without_resource(fjid) - if type_ == 'connection-lost': - app.interface.roster.window.present() - return - if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): w = self.msg_win_mgr.get_window(jid, account) if jid in self.minimized_controls[account]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8111619c2b0d1674ebf3b8bcb21193d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8111619c2b0d1674ebf3b8bcb21193d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatInvitation: Show account badge
by Daniel Brötzmann 14 Feb '21

14 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a9b2922b by wurstsalat at 2021-02-14T20:56:31+01:00 GroupChatInvitation: Show account badge Fixes: #10424 - - - - - 1 changed file: - gajim/gtk/groupchat_invitation.py Changes: ===================================== gajim/gtk/groupchat_invitation.py ===================================== @@ -21,6 +21,7 @@ from .groupchat_info import GroupChatInfoScrolled from .groupchat_nick import NickChooser +from .util import generate_account_badge class GroupChatInvitation(Gtk.ApplicationWindow): @@ -50,9 +51,18 @@ def __init__(self, account, event): separator = Gtk.Separator() contact_label = Gtk.Label(label=event.get_inviter_name()) contact_label.get_style_context().add_class('bold16') - contact_label.set_halign(Gtk.Align.CENTER) - contact_label.set_justify(Gtk.Justification.CENTER) contact_label.set_line_wrap(True) + contact_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6) + contact_box.set_halign(Gtk.Align.CENTER) + contact_box.add(contact_label) + + enabled_accounts = app.get_enabled_accounts_with_labels() + if len(enabled_accounts) > 1: + account_badge = generate_account_badge(account) + account_badge.set_tooltip_text( + _('Account: %s') % app.get_account_label(account)) + contact_box.add(account_badge) + invitation_label = Gtk.Label( label=_('has invited you to a group chat.\nDo you want to join?')) invitation_label.set_halign(Gtk.Align.CENTER) @@ -61,7 +71,7 @@ def __init__(self, account, event): invitation_label.set_line_wrap(True) main_box.add(separator) - main_box.add(contact_label) + main_box.add(contact_box) main_box.add(invitation_label) decline_button = Gtk.Button.new_with_mnemonic(_('_Decline')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9b2922b08140d901483022ae41753aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a9b2922b08140d901483022ae41753aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Set message nick, process message-sent event
by Daniel Brötzmann 14 Feb '21

14 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 64d7f342 by wurstsalat at 2021-02-14T20:27:48+01:00 ChatList: Set message nick, process message-sent event - - - - - 3 changed files: - gajim/data/gui/chat_list_row.ui - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -140,8 +140,8 @@ <property name="spacing">3</property> <child> <object class="GtkLabel" id="nick_label"> - <property name="visible">True</property> <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> ===================================== gajim/gtk/chat_list.py ===================================== @@ -140,7 +140,7 @@ def get_open_chats(self): return open_chats def update_time(self): - for _, row in self._chats.items(): + for _key, row in self._chats.items(): row.update_time() def process_event(self, event): @@ -150,6 +150,8 @@ def process_event(self, event): self._on_message_received(event) elif event.name == 'presence-received': self._on_presence_received(event) + elif event.name == 'message-sent': + self._on_message_sent(event) else: log.warning('Unhandled Event: %s', event.name) @@ -158,10 +160,42 @@ def _on_message_received(self, event): return row = self._chats.get((event.account, event.jid)) - row.set_last_message_text('Me', event.msgtxt) + nick = self._get_nick_for_received_message(event) + row.set_last_message_text(nick, event.msgtxt) self._add_unread(row, event.properties) + def _on_message_sent(self, event): + msgtext = event.message + if not msgtext: + return + + row = self._chats.get((event.account, event.jid)) + con = app.get_client(event.account) + own_jid = con.get_own_jid() + + if own_jid.bare_match(event.jid): + nick = '' + else: + nick = _('Me: ') + row.set_last_message_text(nick, msgtext) + + @staticmethod + def _get_nick_for_received_message(event): + nick = _('Me: ') + if event.properties.type.is_groupchat: + event_nick = event.properties.muc_nickname + our_nick = get_group_chat_nick(event.account, event.jid) + if event_nick != our_nick: + nick = _('%(incoming_nick)s: ') % {'incoming_nick': event_nick} + else: + con = app.get_client(event.account) + own_jid = con.get_own_jid() + if not own_jid.bare_match(event.properties.from_): + nick = '' + + return nick + def _on_presence_received(self, event): row = self._chats.get((event.account, event.jid)) row.update_avatar() @@ -350,4 +384,5 @@ def reset_unread(self): 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) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -12,6 +12,7 @@ 'mam-message-received', 'gc-message-received', 'presence-received', + 'message-sent', ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/64d7f342f703359f4b40cb3eb7034adb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/64d7f342f703359f4b40cb3eb7034adb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Presence: Fix is_nickname_changed check
by Philipp Hörist 14 Feb '21

14 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a62ab333 by lovetox at 2021-02-14T20:13:19+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 - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -916,8 +916,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/-/commit/a62ab33329be1f341295ba34… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/a62ab33329be1f341295ba34… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add update_workspace method
by Daniel Brötzmann 14 Feb '21

14 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2811fe9c by wurstsalat at 2021-02-14T16:04:47+01:00 Add update_workspace method - - - - - 2 changed files: - gajim/gtk/main.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -360,6 +360,12 @@ def activate_workspace(self, workspace_id): self._workspace_side_bar.activate_workspace(workspace_id) self._chat_list_stack.show_chat_list(workspace_id) + def update_workspace(self, workspace_id): + name = app.settings.get_workspace_setting(workspace_id, 'name') + self._ui.workspace_label.set_text(name) + app.interface.avatar_storage.invalidate_cache(workspace_id) + self._workspace_side_bar.update_avatar(workspace_id) + def _add_group_chat(self, _action, param): account, jid = param.unpack() self.add_group_chat(account, jid) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -115,9 +115,7 @@ def _on_save(self, _button): 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) + app.window.update_workspace(self._workspace_id) self.destroy() return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2811fe9c8ef85c5f8772e532a949c0fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2811fe9c8ef85c5f8772e532a949c0fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] VcardWindow: Fix resource string if resource is missing
by Daniel Brötzmann 14 Feb '21

14 Feb '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 25ddc9d2 by wurstsalat at 2021-02-14T15:19:07+01:00 VcardWindow: Fix resource string if resource is missing Fixes: #10273 - - - - - 1 changed file: - gajim/vcard.py Changes: ===================================== gajim/vcard.py ===================================== @@ -398,10 +398,13 @@ def fill_jabber_page(self): tt_text = _("There is no pending subscription request.") ask_label.set_tooltip_text(tt_text) - resources = '%s (%s)' % (self.contact.resource, str( - self.contact.priority)) - uf_resources = self.contact.resource + _(' resource with priority ')\ - + str(self.contact.priority) + resources = '' + uf_resources = '' + if self.contact.resource: + resources = '%s (%s)' % (self.contact.resource, str( + self.contact.priority)) + uf_resources = self.contact.resource + _(' resource with priority ')\ + + str(self.contact.priority) if not self.contact.status: self.contact.status = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/25ddc9d2e49a815edacddbfcaff5375b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/25ddc9d2e49a815edacddbfcaff5375b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Add Workspace menu
by Daniel Brötzmann 14 Feb '21

14 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 7cf38b19 by wurstsalat at 2021-02-14T14:26:35+01:00 Add Workspace menu - - - - - a442e375 by wurstsalat at 2021-02-14T14:42:01+01:00 WorkspaceSidebar: Add drag and drop - - - - - 4 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -175,28 +175,25 @@ </packing> </child> <child> - <object class="GtkButton" id="edit_workspace_button"> + <object class="GtkMenuButton" id="workspace_menu_button"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="focus-on-click">False</property> <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Workspace</property> - <property name="relief">none</property> + <property name="use-popover">False</property> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> + <property name="icon-name">open-menu-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> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -61,12 +61,12 @@ /* Workspace sidebar */ .workspace-sidebar { background: transparent; - margin-left: 12px; + margin-left: 6px; margin-right: 6px; } .workspace-sidebar-item { padding-top: 0px; - padding-bottom: 6px; + padding-bottom: 0px; } .workspace-sidebar-item:selected, .workspace-sidebar-item:hover { @@ -80,8 +80,13 @@ } .workspace-sidebar-item image { border-radius: 9px; - margin-top: 6px; - margin-right: 6px; + margin: 6px; +} +.workspace-sidebar-item.drag-hover-top { + border-top: 1px solid #4e9a06; +} +.workspace-sidebar-item.drag-hover-bottom { + border-bottom: 1px solid #4e9a06; } /* Account sidebar */ ===================================== gajim/gtk/main.py ===================================== @@ -27,6 +27,11 @@ log = logging.getLogger('gajim.gui.main') +WORKSPACE_MENU_DICT = { + 'edit': _('Edit…'), + 'remove': _('Remove'), +} + class MainWindow(Gtk.ApplicationWindow, EventHelper): def __init__(self): @@ -64,8 +69,12 @@ def __init__(self): self._ui.right_grid.add(self._chat_stack) - self._ui.edit_workspace_button.connect( - 'clicked', self._on_edit_workspace_clicked) + workspace_menu = Gio.Menu() + for action, label in WORKSPACE_MENU_DICT.items(): + workspace_menu.append(label, f'win.{action.lower()}-workspace') + + self._ui.workspace_menu_button.set_menu_model(workspace_menu) + self._ui.start_chat_button.connect( 'clicked', self._on_start_chat_clicked) self._ui.connect_signals(self) @@ -146,7 +155,8 @@ def _on_button_release(paned, event): def _add_actions(self): actions = [ ('add-workspace', 's', self._add_workspace), - ('remove-workspace', 's', self._remove_workspace), + ('edit-workspace', None, self._edit_workspace), + ('remove-workspace', None, self._remove_workspace), ('activate-workspace', 's', self._activate_workspace), ('add-chat', 'as', self._add_chat), ('add-group-chat', 'as', self._add_group_chat), @@ -155,7 +165,8 @@ def _add_actions(self): for action in actions: action_name, variant, func = action - variant = GLib.VariantType.new(variant) + if variant is not None: + variant = GLib.VariantType.new(variant) act = Gio.SimpleAction.new(action_name, variant) act.connect('activate', func) self.add_action(act) @@ -311,9 +322,19 @@ def add_workspace(self, 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() - self.remove_workspace(workspace_id) + def _edit_workspace(self, _action, _param): + workspace_id = self.get_active_workspace() + if workspace_id is not None: + self.edit_workspace(workspace_id) + + @staticmethod + def edit_workspace(workspace_id): + open_window('WorkspaceDialog', workspace_id=workspace_id) + + def _remove_workspace(self, _action, _param): + workspace_id = self.get_active_workspace() + if workspace_id is not None: + self.remove_workspace(workspace_id) def remove_workspace(self, workspace_id): was_active = self.get_active_workspace() == workspace_id @@ -452,10 +473,6 @@ def _load_chats(self): 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()) - def _on_event(self, event): if event.name == 'caps-update': #TODO ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -1,9 +1,10 @@ +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib -from gajim.common.const import AvatarSize -from gajim.common import app +from gajim.common import app +from gajim.common.const import AvatarSize from gajim.common.i18n import _ from .util import open_window @@ -14,18 +15,119 @@ def __init__(self, chat_list_stack): Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_valign(Gtk.Align.START) - self.set_sort_func(self._sort_func) self.get_style_context().add_class('workspace-sidebar') - self.add(AddWorkspace('add')) - self.connect('button-press-event', self._on_button_press) + + # Drag and Drop + entries = [Gtk.TargetEntry.new( + 'WORKSPACE_SIDEBAR_ITEM', + Gtk.TargetFlags.SAME_APP, + 0)] + self.drag_dest_set( + Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP, + entries, + Gdk.DragAction.MOVE) + + self.drag_row = None + self.row_before = None + self.row_after = None + + self.connect('drag-motion', self._on_drag_motion) + self.connect('drag-data-received', self._on_drag_data_received) + self.connect('drag-leave', self._on_drag_leave) + self.connect('row-activated', self._on_row_activated) + self.add(AddWorkspace('add')) + chat_list_stack.connect('unread-count-changed', self._on_unread_count_changed) chat_list_stack.connect('chat-selected', self._on_chat_selected) self._workspaces = {} + def _on_drag_motion(self, _widget, _drag_context, _x_coord, y_coord, + _time): + row = self.get_row_at_y(y_coord) + + if self.row_before: + self.row_before.get_style_context().remove_class( + 'drag-hover-bottom') + if self.row_after: + self.row_after.get_style_context().remove_class( + 'drag-hover-top') + + if row: + alloc = row.get_allocation() + hover_row_y = alloc.y + hover_row_height = alloc.height + if y_coord < hover_row_y + hover_row_height / 2: + self.row_after = row + self.row_before = self._get_row_before(row) + else: + self.row_before = row + self.row_after = self._get_row_after(row) + else: + self.row_before = self._get_last_workspace_row() + self.row_after = None + + if self.drag_row in (self.row_before, self.row_after): + return False + + if self.row_before and self.row_before.workspace_id != 'add': + self.row_before.get_style_context().add_class('drag-hover-bottom') + if self.row_after: + self.row_after.get_style_context().add_class('drag-hover-top') + return True + + def _on_drag_data_received(self, _widget, _drag_context, _x_coord, + _y_coord, selection_data, _info, _time): + if self.row_before: + self.row_before.get_style_context().remove_class( + 'drag-hover-bottom') + if self.row_after: + self.row_after.get_style_context().remove_class( + 'drag-hover-top') + + data = selection_data.get_data() + workspace_id = data.decode('utf-8') + row = self.get_workspace_by_id(workspace_id) + + if row in (self.row_after, None): + return + + self.remove(row) + + if self.row_after: + pos = self.row_after.get_index() + elif self.row_before and self.row_before.workspace_id != 'add': + pos = self.row_before.get_index() + 1 + else: + pos = len(self.get_children()) - 1 + + self.insert(row, pos) + app.window.activate_workspace(workspace_id) + + def _on_drag_leave(self, _widget, _drag_context, _time): + if self.row_before: + self.row_before.get_style_context().remove_class( + 'drag-hover-bottom') + if self.row_after: + self.row_after.get_style_context().remove_class( + 'drag-hover-top') + + def _get_row_before(self, row): + return self.get_row_at_index(row.get_index() - 1) + + def _get_row_after(self, row): + return self.get_row_at_index(row.get_index() + 1) + + def _get_last_workspace_row(self): + # len(children) would include AddWorkspace + return self.get_row_at_index(len(self.get_children()) - 1) + + def set_drag_row(self, row): + self.drag_row = row + def _on_unread_count_changed(self, _chat_list_stack, workspace_id, count): workspace = self._workspaces[workspace_id] workspace.set_unread_count(count) @@ -33,21 +135,6 @@ def _on_unread_count_changed(self, _chat_list_stack, workspace_id, count): def _on_chat_selected(self, _chat_list_stack, workspace_id, *args): self.activate_workspace(workspace_id) - @staticmethod - def _sort_func(child1, child2): - if child1.sort_index < child2.sort_index: - return -1 - - if child1.sort_index == child2.sort_index: - return 0 - return 1 - - def _on_button_press(self, _listbox, button_event): - if button_event.button != 3: - return - row = self.get_row_at_y(button_event.y) - WorspaceMenu(row) - @staticmethod def _on_row_activated(_listbox, row): if row.workspace_id == 'add': @@ -58,7 +145,8 @@ def _on_row_activated(_listbox, row): def add_workspace(self, workspace_id): row = Workspace(workspace_id) self._workspaces[workspace_id] = row - self.add(row) + # Insert row before AddWorkspace row + self.insert(row, len(self.get_children()) - 1) def remove_workspace(self, workspace_id): if len(self._workspaces) == 1: @@ -85,6 +173,12 @@ def get_first_workspace(self): for row in self.get_children(): return row.workspace_id + def get_workspace_by_id(self, workspace_id): + for row in self.get_children(): + if row.workspace_id == workspace_id: + return row + return None + def update_avatar(self, workspace_id): row = self._workspaces[workspace_id] row.update_avatar() @@ -102,8 +196,6 @@ class Workspace(CommonWorkspace): def __init__(self, workspace_id): CommonWorkspace.__init__(self, workspace_id) - self.sort_index = 0 - self._unread_label = Gtk.Label() self._unread_label.get_style_context().add_class( 'unread-counter') @@ -118,7 +210,21 @@ def __init__(self, workspace_id): overlay.add(self._image) overlay.add_overlay(self._unread_label) - self.add(overlay) + # Drag and Drop + entries = [Gtk.TargetEntry.new( + 'WORKSPACE_SIDEBAR_ITEM', + Gtk.TargetFlags.SAME_APP, + 0)] + eventbox = Gtk.EventBox() + eventbox.drag_source_set( + Gdk.ModifierType.BUTTON1_MASK, + entries, + Gdk.DragAction.MOVE) + eventbox.connect('drag-begin', self._on_drag_begin) + eventbox.connect('drag-data-get', self._on_drag_data_get) + eventbox.add(overlay) + + self.add(eventbox) self.show_all() def update_avatar(self): @@ -131,15 +237,27 @@ def set_unread_count(self, count): self._unread_label.set_text('999+') self._unread_label.set_visible(bool(count)) + def _on_drag_begin(self, _widget, drag_context): + scale = self.get_scale_factor() + surface = app.interface.avatar_storage.get_workspace_surface( + self.workspace_id, AvatarSize.WORKSPACE, scale) + Gtk.drag_set_icon_surface(drag_context, surface) + + listbox = self.get_parent() + listbox.set_drag_row(self) + + def _on_drag_data_get(self, _widget, _drag_context, selection_data, + _info, _time): + drop_type = Gdk.Atom.intern_static_string('WORKSPACE_SIDEBAR_ITEM') + data = self.workspace_id.encode('utf-8') + selection_data.set(drop_type, 32, data) + class AddWorkspace(CommonWorkspace): def __init__(self, workspace_id): CommonWorkspace.__init__(self, workspace_id) - self.set_selectable(False) - self.sort_index = 10000 - image = Gtk.Image.new_from_icon_name('list-add-symbolic', Gtk.IconSize.DND) image.set_halign(Gtk.Align.CENTER) @@ -148,33 +266,6 @@ def __init__(self, workspace_id): self.show_all() -class WorspaceMenu(Gtk.Popover): - def __init__(self, row): - Gtk.Popover.__init__(self) - entries = [ - (_('Remove'), 'remove-workspace'), - ] - - self._workspace_id = row.workspace_id - - box = Gtk.Box() - for label, action in entries: - button = Gtk.Button(label=label) - button.connect('clicked', self._on_click, action) - box.add(button) - box.show_all() - - self.add(box) - self.set_relative_to(row) - self.popup() - - def _on_click(self, _button, action): - self.popdown() - 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) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/74ae244abc140baa70cef82894294d5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/74ae244abc140baa70cef82894294d5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 97 commits: Raise nbxmpp version
by Philipp Hörist 14 Feb '21

14 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 8dfe87e4 by lovetox at 2021-02-06T21:19:56+01:00 Raise nbxmpp version - - - - - d6e3a890 by lovetox at 2021-02-06T21:34:06+01:00 ChatControlBase: Fix race condition when closing with ESC Fixes #10421 - - - - - 69b4ae18 by André Apitzsch at 2021-02-06T23:58:03+01:00 Flatpak: Update dependencies - - - - - d37f6e84 by lovetox at 2021-02-07T17:35:11+01:00 PubSub: Discover publish options correctly - - - - - 2fd685f7 by lovetox at 2021-02-07T17:35:11+01:00 Bookmarks: Check for config-node-max feature Fixes #10425 - - - - - c93d1170 by lovetox at 2021-02-07T17:41:20+01:00 Update appdata.xml - - - - - 1692f3ed by Daniel Brötzmann at 2021-02-09T17:28:00+01:00 ChatControl: Remove shortcut from tooltip - - - - - 76501abf by Daniel Brötzmann at 2021-02-09T18:04:57+01:00 Preferences: Check for pipeline before removing elements Fixes #10430 - - - - - c6fd3959 by mimi89999 at 2021-02-11T22:37:24+01:00 Set account window stack as non-vhomogeneous Closes #10438 - - - - - d0e602bd by lovetox at 2021-02-12T21:27:43+01:00 Add setting for GSSAPI authentication - - - - - 739ead2b by lovetox at 2021-02-12T21:27:43+01:00 Client: Determine some Settings right before connecting - - - - - 3fcdc8a5 by André Apitzsch at 2021-02-12T21:54:30+01:00 Remove conversion of ASCII emojis Display emojis as intended by the sender, i.e. don't replace it. Closes #10416. - - - - - 9d0ffffc by lovetox at 2021-02-12T23:10:33+01:00 ServiceRegistration: Use nbxmpp register methods Fixes #10443 - - - - - 7439dc9a by lovetox at 2021-02-12T23:10:33+01:00 Register: Remove unused methods - - - - - dbda5c5c by mimi89999 at 2021-02-12T23:14:58+01:00 Update servers.json Remove servers that redirect to a website or have registration disabled Closes #10437 - - - - - a4fba1f4 by mimi89999 at 2021-02-13T10:08:20+01:00 Change dataform to href markup URLs in fixed field Closes #10445 - - - - - c46ee9a2 by mimi89999 at 2021-02-13T13:09:54+01:00 Set chat window hscrollbar_policy to never - - - - - 1ac4fd7a by André Apitzsch at 2021-02-13T18:09:40+01:00 Move regular expressions to separate file - - - - - b243c3c0 by André Apitzsch at 2021-02-13T18:09:41+01:00 Move regex tests - - - - - 9e0c64b1 by mimi89999 at 2021-02-13T21:45:51+01:00 Change dataform to href markup URLs in instructions - - - - - 94b6b0c2 by lovetox at 2021-02-13T21:53:40+01:00 Use nbxmpp last activity module - - - - - ae2d2f10 by lovetox at 2021-02-14T13:06:09+01:00 Windows: Set debug env var This allows us to discover if Gajim was started with Gajim-Debug.exe - - - - - a68337a4 by lovetox at 2021-02-14T13:31:40+01:00 Logging: Move logging setup methods to logging_helpers Also check for GAJIM_DEBUG - - - - - 40ddea11 by lovetox at 2021-02-14T13:47:17+01:00 Start - - - - - 5bded928 by lovetox at 2021-02-14T13:47:17+01:00 Disable CI - - - - - 055a99df by lovetox at 2021-02-14T13:47:17+01:00 Really disable CI - - - - - 61427680 by lovetox at 2021-02-14T13:47:17+01:00 Add Workspace settings API - - - - - 975036ae by lovetox at 2021-02-14T13:47:17+01:00 Store and Open chats - - - - - 8538905e by lovetox at 2021-02-14T13:47:17+01:00 Add remove_chat() - - - - - 93122713 by lovetox at 2021-02-14T13:47:17+01:00 Account Side Bar - - - - - 07701b84 by lovetox at 2021-02-14T13:47:17+01:00 Add Workspace Side Bar - - - - - 38bc3279 by wurstsalat at 2021-02-14T13:47:17+01:00 ChatList: Add basic elements - - - - - 04cec3dd by wurstsalat at 2021-02-14T13:47:17+01:00 ChatListStack: Add Start Chat - - - - - 12f03b9c by wurstsalat at 2021-02-14T13:47:17+01:00 Add basic Sidebar styling - - - - - cbeded9e by wurstsalat at 2021-02-14T13:47:17+01:00 Improve styling for Sidebar and ChatList - - - - - ad03a40c by lovetox at 2021-02-14T13:47:17+01:00 Store chatlist on remove - - - - - 48b42996 by lovetox at 2021-02-14T13:47:17+01:00 Add/Remove Workspaces - - - - - dd663b09 by lovetox at 2021-02-14T13:47:17+01:00 Allow to add chats to different workspaces - - - - - 7596c2a2 by lovetox at 2021-02-14T13:47:17+01:00 Add transparent backgrounds - - - - - c8c9463a by wurstsalat at 2021-02-14T13:47:17+01:00 AccountSideBar: Improve styling - - - - - 18ceeeb5 by wurstsalat at 2021-02-14T13:47:17+01:00 WorkspaceSidebar: Improve styling - - - - - 6b62e39f by lovetox at 2021-02-14T13:47:17+01:00 Improve left sidebar - - - - - cdbf14e9 by lovetox at 2021-02-14T13:47:17+01:00 css - - - - - 58a86b0c by lovetox at 2021-02-14T13:47:17+01:00 Dont fail when account is disabled - - - - - 6c776082 by lovetox at 2021-02-14T13:47:17+01:00 CSS - - - - - 9737cae6 by wurstsalat at 2021-02-14T13:47:17+01:00 AvatarSelector: Add Load Image button - - - - - 55de3c96 by Daniel Brötzmann at 2021-02-14T13:47:17+01:00 Workspace: Add Workspace edit dialog - - - - - 231e401d by wurstsalat at 2021-02-14T13:47:17+01:00 Workspace: Add title and editing functionality - - - - - 13f30e8b by wurstsalat at 2021-02-14T13:47:17+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - 1874a64a by lovetox at 2021-02-14T13:47:17+01:00 Store type for open chats - - - - - f87114e6 by lovetox at 2021-02-14T13:47:17+01:00 Store workspace dialog settings - - - - - fa0bcfbf by lovetox at 2021-02-14T13:47:17+01:00 Fix adding new Workspace - - - - - a6edebd1 by lovetox at 2021-02-14T13:47:17+01:00 Fix some selection bugs - - - - - d0782466 by Daniel Brötzmann at 2021-02-14T13:47:17+01:00 ChatListStack: Wrap in ScrolledWindow - - - - - 41fb28e3 by lovetox at 2021-02-14T13:47:17+01:00 Move scrolled window into gui xml - - - - - 1b26a018 by lovetox at 2021-02-14T13:47:17+01:00 sytle chatlist - - - - - 5ef5d42d by wurstsalat at 2021-02-14T13:47:17+01:00 ChatList: Styling - - - - - 7c43fac7 by wurstsalat at 2021-02-14T13:47:17+01:00 MainWindow: Styling - - - - - ece8e7db by wurstsalat at 2021-02-14T13:47:17+01:00 Accounts: Add basic account page - - - - - b531ff0c by lovetox at 2021-02-14T13:47:17+01:00 Refactor Groupchats - - - - - 4b1f26e3 by lovetox at 2021-02-14T13:47:17+01:00 Start Chat: Destroy after joining MUC - - - - - 03188ffb by lovetox at 2021-02-14T13:47:17+01:00 Disable Roster - - - - - 105ab12a by lovetox at 2021-02-14T13:47:18+01:00 Make quit work - - - - - 6b681c68 by lovetox at 2021-02-14T13:47:18+01:00 Stuff - - - - - 941635b3 by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Add friendly timestamps - - - - - d23f8dd0 by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Unread counter styling - - - - - a6905952 by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Group chat avatars and message lines - - - - - f7d08f4b by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 Paned: Improve ChatList resizing - - - - - 44b92f86 by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Use groupchat name, improve ellipsizing - - - - - 1240c4de by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Add group chat nicks - - - - - e2a3b1f0 by lovetox at 2021-02-14T13:47:18+01:00 Remove unread_messages table - - - - - ba7ec162 by lovetox at 2021-02-14T13:47:18+01:00 add unread cache - - - - - e484c41e by lovetox at 2021-02-14T13:47:18+01:00 Add notifications - - - - - 47288476 by lovetox at 2021-02-14T13:47:18+01:00 Fix notifications - - - - - e683117b by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Move ui to glade file - - - - - e50f4290 by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Add RosterTooltip - - - - - 84216d22 by lovetox at 2021-02-14T13:47:18+01:00 Move event handling to main - - - - - 90bd8642 by lovetox at 2021-02-14T13:47:18+01:00 Fix some events - - - - - a67b0c91 by lovetox at 2021-02-14T13:47:18+01:00 Reset unread counter - - - - - cc8defb7 by lovetox at 2021-02-14T13:47:18+01:00 Fix more events - - - - - cffa94fd by wurstsalat at 2021-02-14T13:47:18+01:00 WorkspaceSidebar: Add unread counter - - - - - 627b905c by lovetox at 2021-02-14T13:47:18+01:00 Unread count improv - - - - - e52f8f45 by lovetox at 2021-02-14T13:47:18+01:00 Add unread count to workspace - - - - - c447f518 by lovetox at 2021-02-14T13:47:18+01:00 Dont allow chats to be opened multiple times - - - - - 75905291 by lovetox at 2021-02-14T13:47:18+01:00 Don’t notify on messages from ourself - - - - - f6cb90fc by lovetox at 2021-02-14T13:47:18+01:00 Use consistent jid attribute - - - - - 4df68412 by lovetox at 2021-02-14T13:47:18+01:00 Fix some events - - - - - 451b859b by lovetox at 2021-02-14T13:47:18+01:00 Handle presence - - - - - 3e5369d7 by lovetox at 2021-02-14T13:47:18+01:00 Sort with activity - - - - - 8985fd57 by lovetox at 2021-02-14T13:47:18+01:00 Save handle position - - - - - 1b503120 by lovetox at 2021-02-14T13:47:18+01:00 Connect Menu actions - - - - - 78cca248 by lovetox at 2021-02-14T13:47:18+01:00 Bring back more actions - - - - - ec250b14 by lovetox at 2021-02-14T13:47:18+01:00 Fix transients - - - - - 34d24462 by lovetox at 2021-02-14T13:47:18+01:00 Make Private Chat work - - - - - a4a51b17 by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Add avatar and name for PMs - - - - - bcadcffe by Daniel Brötzmann at 2021-02-14T13:47:18+01:00 ChatList: Show indicator for group chats - - - - - 74ae244a by lovetox at 2021-02-14T13:47:18+01:00 New Contacts - - - - - 30 changed files: - − .gitlab-ci.yml - README.md - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/logging_helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/chatstates.py - + gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/pubsub.py - gajim/common/modules/register.py - gajim/common/modules/roster.py - + gajim/common/regex.py - gajim/common/setting_values.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f3e924e8c58529e6dbf04046afad0e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f3e924e8c58529e6dbf04046afad0e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Windows: Set debug env var
by Philipp Hörist 14 Feb '21

14 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae2d2f10 by lovetox at 2021-02-14T13:06:09+01:00 Windows: Set debug env var This allows us to discover if Gajim was started with Gajim-Debug.exe - - - - - a68337a4 by lovetox at 2021-02-14T13:31:40+01:00 Logging: Move logging setup methods to logging_helpers Also check for GAJIM_DEBUG - - - - - 3 changed files: - gajim/application.py - gajim/common/logging_helpers.py - win/misc/create-launcher.py Changes: ===================================== gajim/application.py ===================================== @@ -34,9 +34,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import time import sys -from datetime import datetime from urllib.parse import unquote from nbxmpp.namespaces import Namespace @@ -358,14 +356,7 @@ def _handle_local_options(self, if options.contains('gdebug'): os.environ['G_MESSAGES_DEBUG'] = 'all' - if app.get_debug_mode(): - # Redirect has to happen before logging init - self._cleanup_debug_logs() - self._redirect_output() - logging_helpers.init() - logging_helpers.set_verbose() - else: - logging_helpers.init() + logging_helpers.init() if options.contains('quiet'): logging_helpers.set_quiet() @@ -393,24 +384,6 @@ def warn_with_traceback(message, category, filename, lineno, warnings.showwarning = warn_with_traceback warnings.filterwarnings(action="always") - @staticmethod - def _redirect_output(): - debug_folder = configpaths.get('DEBUG') - date = datetime.today().strftime('%d%m%Y-%H%M%S') - filename = '%s-debug.log' % date - fd = open(debug_folder / filename, 'a') - sys.stderr = sys.stdout = fd - - @staticmethod - def _cleanup_debug_logs(): - debug_folder = configpaths.get('DEBUG') - debug_files = list(debug_folder.glob('*-debug.log*')) - now = time.time() - for file in debug_files: - # Delete everything older than 3 days - if file.stat().st_ctime < now - 259200: - file.unlink() - def add_actions(self): ''' Build Application Actions ''' from gajim import app_actions ===================================== gajim/common/logging_helpers.py ===================================== @@ -17,7 +17,11 @@ import logging import os import sys +import time +from datetime import datetime +from gajim.common import app +from gajim.common import configpaths from gajim.common.i18n import _ def parseLogLevel(arg): @@ -136,6 +140,11 @@ def init(): """ Iinitialize the logging system """ + + if app.get_debug_mode(): + _cleanup_debug_logs() + _redirect_output() + use_color = False if os.name != 'nt': use_color = sys.stderr.isatty() @@ -164,6 +173,12 @@ def init(): root_log.addHandler(consoleloghandler) root_log.propagate = False + # GAJIM_DEBUG is set only on Windows when using Gajim-Debug.exe + # Gajim-Debug.exe shows a command line prompt and we want to redirect + # log output to it + if app.get_debug_mode() or os.environ.get('GAJIM_DEBUG', False): + set_verbose() + def set_loglevels(loglevels_string): parseAndSetLogLevels(loglevels_string) @@ -176,6 +191,25 @@ def set_quiet(): parseAndSetLogLevels('.nbxmpp=CRITICAL') +def _redirect_output(): + debug_folder = configpaths.get('DEBUG') + date = datetime.today().strftime('%d%m%Y-%H%M%S') + filename = '%s-debug.log' % date + fd = open(debug_folder / filename, 'a') + sys.stderr = sys.stdout = fd + + +def _cleanup_debug_logs(): + debug_folder = configpaths.get('DEBUG') + debug_files = list(debug_folder.glob('*-debug.log*')) + now = time.time() + for file in debug_files: + # Delete everything older than 3 days + if file.stat().st_ctime < now - 259200: + file.unlink() + + + # tests if __name__ == '__main__': init() ===================================== win/misc/create-launcher.py ===================================== @@ -58,7 +58,7 @@ def build_exe(source_path, resource_path, is_gui, out_path): subprocess.check_call(args) -def get_launcher_code(): +def get_launcher_code(debug): template = """\ #include "Python.h" #define WIN32_LEAN_AND_MEAN @@ -89,6 +89,7 @@ def get_launcher_code(): PySys_SetArgvEx(__argc, szArglist, 0); result = PyRun_SimpleString( "import sys; import os;" + "os.environ['GAJIM_DEBUG'] = %s;" "sys.frozen=True;" "from pathlib import Path;" "root_path = Path(sys.executable).parents[1];" @@ -99,7 +100,7 @@ def get_launcher_code(): Py_Finalize(); return result; } - """ + """ % int(debug) return template @@ -153,7 +154,7 @@ def to_ver_list(v): def build_launcher(out_path, icon_path, file_desc, product_name, product_version, - company_name, is_gui): + company_name, is_gui, debug=False): src_ico = os.path.abspath(icon_path) target = os.path.abspath(out_path) @@ -165,7 +166,7 @@ def build_launcher(out_path, icon_path, file_desc, product_name, product_version try: os.chdir(temp) with open("launcher.c", "w") as h: - h.write(get_launcher_code()) + h.write(get_launcher_code(debug)) shutil.copyfile(src_ico, "launcher.ico") with open("launcher.rc", "w") as h: h.write(get_resouce_code( @@ -196,7 +197,7 @@ def main(): build_launcher( os.path.join(target, "Gajim-Debug.exe"), os.path.join(misc, "gajim.ico"), "Gajim", "Gajim", - version, company_name, False) + version, company_name, False, debug=True) # build_launcher( # os.path.join(target, "history_manager.exe"), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/94b6b0c2523ac3562b78031f6f0f0d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/94b6b0c2523ac3562b78031f6f0f0d4… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits