Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Fix notifications
by Philipp Hörist 02 Feb '21

02 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 9d9e9cdf by lovetox at 2021-02-02T23:09:03+01:00 Fix notifications - - - - - 3 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -93,7 +93,7 @@ def update_time(self): def update(self, event): row = self._chats.get((event.account, event.jid)) row.add_unread() - row.set_last_message_text('Me', event.msgtext) + row.set_last_message_text('Me', event.msgtxt) class ChatRow(Gtk.ListBoxRow): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -85,9 +85,6 @@ def clear(self): self.set_visible_child_name('empty') def update(self, event): - if not event.msgtxt: - return - control = self.get_control(event.account, event.jid) typ = '' ===================================== gajim/gtk/main.py ===================================== @@ -245,6 +245,9 @@ def _on_message_received(self, event): if not self.chat_exists(event.account, event.jid): self.add_chat(event.account, event.jid, 'contact') + if not event.msgtxt: + return + self._chat_stack.update(event) self._chat_list_stack.update(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d9e9cdfe6da7da44c46565a64d3d325… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9d9e9cdfe6da7da44c46565a64d3d325… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Remove unread_messages table
by Philipp Hörist 02 Feb '21

02 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 70ade17b by lovetox at 2021-02-02T22:56:57+01:00 Remove unread_messages table - - - - - 7373b349 by lovetox at 2021-02-02T22:56:57+01:00 add unread cache - - - - - 0bcf9951 by lovetox at 2021-02-02T22:58:47+01:00 Add notifications - - - - - 13 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/storage/archive.py - gajim/common/storage/cache.py - gajim/groupchat_control.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -227,7 +227,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None): ('caps-update', ged.GUI1, self._on_caps_update), ('message-sent', ged.OUT_POSTCORE, self._on_message_sent), ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), - ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), + # ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), @@ -604,34 +604,6 @@ def _on_mam_decrypted_message_received(self, event): message_id=event.properties.id, additional_data=event.additional_data) - @event_filter(['account']) - def _on_decrypted_message_received(self, event): - if not event.msgtxt: - return True - - if event.session.control != self: - return - - typ = '' - if event.properties.is_sent_carbon: - typ = 'out' - - self.add_message(event.msgtxt, - typ, - tim=event.properties.timestamp, - subject=event.properties.subject, - displaymarking=event.displaymarking, - msg_log_id=event.msg_log_id, - message_id=event.properties.id, - correct_id=event.correct_id, - additional_data=event.additional_data) - if event.msg_log_id: - pw = self.parent_win - end = self.conv_textview.autoscroll - if not pw or (pw.get_active_control() and self \ - == pw.get_active_control() and pw.is_active() and end): - app.storage.archive.set_read_messages([event.msg_log_id]) - @event_filter(['account', 'jid']) def _on_message_error(self, event): self.conv_textview.show_error(event.message_id, event.error) @@ -1229,17 +1201,6 @@ def shutdown(self): self.get_full_jid(), types=['printed_%s' % self._type, str(self._type)]) # Remove contact instance if contact has been removed - key = (self.contact.jid, self.account) - roster = app.interface.roster - has_pending = roster.contact_has_pending_roster_events(self.contact, - self.account) - if key in roster.contacts_to_be_removed.keys() and not has_pending: - backend = roster.contacts_to_be_removed[key]['backend'] - del roster.contacts_to_be_removed[key] - roster.remove_contact(self.contact.jid, - self.account, - force=True, - backend=backend) super(ChatControl, self).shutdown() ===================================== gajim/chat_control_base.py ===================================== @@ -1180,15 +1180,15 @@ def add_message(self, self.save_message(text, 'received') # Send chat marker if we’re actively following the chat - if self.parent_win and self.contact.settings.get('send_marker'): - if (self.parent_win.get_active_control() == self and - self.parent_win.is_active() and - self.has_focus() and end): - con = app.connections[self.account] - con.get_module('ChatMarkers').send_displayed_marker( - self.contact, - self.last_msg_id, - self._type) + # if self.parent_win and self.contact.settings.get('send_marker'): + # if (self.parent_win.get_active_control() == self and + # self.parent_win.is_active() and + # self.has_focus() and end): + # con = app.connections[self.account] + # con.get_module('ChatMarkers').send_displayed_marker( + # self.contact, + # self.last_msg_id, + # self._type) # TODO old event Code # if kind in ('incoming', 'incoming_queue', 'error'): ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -132,8 +132,7 @@ def generate(self): class NotificationEvent(nec.NetworkIncomingEvent): name = 'notification' - base_network_events = ['decrypted-message-received', - 'gc-message-received', + base_network_events = ['gc-message-received', 'presence-received'] def generate(self): ===================================== gajim/common/modules/mam.py ===================================== @@ -238,7 +238,6 @@ def _mam_message_received(self, _con, stanza, properties): with_, properties.mam.timestamp, kind, - unread=False, message=msgtxt, contact_name=properties.muc_nickname, additional_data=additional_data, ===================================== gajim/common/modules/message.py ===================================== @@ -134,22 +134,22 @@ def _message_received(self, _con, stanza, properties): msgtxt = properties.body session = None - if not properties.type.is_groupchat: - if properties.is_muc_pm and properties.type.is_error: - session = self._con.find_session(fjid, properties.thread) - if not session: - session = self._con.get_latest_session(fjid) - if not session: - session = self._con.make_new_session( - fjid, properties.thread, type_='pm') - else: - session = self._con.get_or_create_session( - fjid, properties.thread) - - if properties.thread and not session.received_thread_id: - session.received_thread_id = True - - session.last_receive = time.time() + # if not properties.type.is_groupchat: + # if properties.is_muc_pm and properties.type.is_error: + # session = self._con.find_session(fjid, properties.thread) + # if not session: + # session = self._con.get_latest_session(fjid) + # if not session: + # session = self._con.make_new_session( + # fjid, properties.thread, type_='pm') + # else: + # session = self._con.get_or_create_session( + # fjid, properties.thread) + + # if properties.thread and not session.received_thread_id: + # session.received_thread_id = True + + # session.last_receive = time.time() additional_data = AdditionalDataDict() @@ -210,7 +210,7 @@ def _message_received(self, _con, stanza, properties): return app.nec.push_incoming_event( - NetworkEvent('decrypted-message-received', **event_attr)) + NetworkEvent('message-received', **event_attr)) def _message_error_received(self, _con, _stanza, properties): jid = properties.jid ===================================== gajim/common/storage/archive.py ===================================== @@ -48,12 +48,6 @@ jid TEXT UNIQUE, type INTEGER ); - CREATE TABLE unread_messages( - message_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, - jid_id INTEGER, - shown BOOLEAN default 0 - ); - CREATE INDEX idx_unread_messages_jid_id ON unread_messages (jid_id); CREATE TABLE logs( log_line_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE, account_id INTEGER, @@ -326,78 +320,6 @@ def convert_show_values_to_db_api_values(show): # it's a RFC violation .... but we should not crash return None - @timeit - def insert_unread_events(self, message_id, jid_id): - """ - Add unread message with id: message_id - """ - sql = '''INSERT INTO unread_messages (message_id, jid_id, shown) - VALUES (?, ?, 0)''' - self._con.execute(sql, (message_id, jid_id)) - self._delayed_commit() - - @timeit - def set_read_messages(self, message_ids): - """ - Mark all messages with ids in message_ids as read - """ - ids = ','.join([str(i) for i in message_ids]) - sql = 'DELETE FROM unread_messages WHERE message_id IN (%s)' % ids - self._con.execute(sql) - self._delayed_commit() - - @timeit - def set_shown_unread_msgs(self, msg_log_id): - """ - Mark unread message as shown un GUI - """ - sql = 'UPDATE unread_messages SET shown = 1 where message_id = %s' % \ - msg_log_id - self._con.execute(sql) - self._delayed_commit() - - @timeit - def reset_shown_unread_messages(self): - """ - Set shown field to False in unread_messages table - """ - sql = 'UPDATE unread_messages SET shown = 0' - self._con.execute(sql) - self._delayed_commit() - - @timeit - def get_unread_msgs(self): - """ - Get all unread messages - """ - all_messages = [] - try: - unread_results = self._con.execute( - 'SELECT message_id, shown from unread_messages').fetchall() - except Exception: - unread_results = [] - for message in unread_results: - msg_log_id = message.message_id - shown = message.shown - # here we get infos for that message, and related jid from jids table - # do NOT change order of SELECTed things, unless you change function(s) - # that called this function - result = self._con.execute(''' - SELECT logs.log_line_id, logs.message, logs.time, logs.subject, - jids.jid, logs.additional_data - FROM logs, jids - WHERE logs.log_line_id = %d AND logs.jid_id = jids.jid_id - ''' % msg_log_id - ).fetchone() - if result is None: - # Log line is no more in logs table. - # remove it from unread_messages - self.set_read_messages([msg_log_id]) - continue - - all_messages.append((result, shown)) - return all_messages - @timeit def load_groupchat_messages(self, account, jid): account_id = self.get_account_id(account, type_=JIDConstant.ROOM_TYPE) @@ -824,8 +746,7 @@ def insert_jid(self, jid, kind=None, type_=JIDConstant.NORMAL_TYPE): return self.get_jid_id(jid, kind, type_) @timeit - def insert_into_logs(self, account, jid, time_, kind, - unread=True, **kwargs): + def insert_into_logs(self, account, jid, time_, kind, **kwargs): """ Insert a new message into the `logs` table @@ -863,11 +784,6 @@ def insert_into_logs(self, account, jid, time_, kind, log.info('Insert into DB: jid: %s, time: %s, kind: %s, stanza_id: %s', jid, time_, kind, kwargs.get('stanza_id', None)) - if unread and kind == KindConstant.CHAT_MSG_RECV: - sql = '''INSERT INTO unread_messages (message_id, jid_id) - VALUES (?, (SELECT jid_id FROM jids WHERE jid = ?))''' - self._con.execute(sql, (lastrowid, jid)) - self._delayed_commit() return lastrowid ===================================== gajim/common/storage/cache.py ===================================== @@ -23,7 +23,7 @@ from gajim.common.storage.base import timeit -CURRENT_USER_VERSION = 6 +CURRENT_USER_VERSION = 7 CACHE_SQL_STATEMENT = ''' CREATE TABLE caps_cache ( @@ -45,6 +45,14 @@ jid TEXT PRIMARY KEY UNIQUE, avatar_sha TEXT ); + CREATE TABLE unread( + account TEXT, + jid TEXT, + count INTEGER, + message_id TEXT, + timestamp INTEGER, + PRIMARY KEY (account, jid) + ); PRAGMA user_version=%s; ''' % CURRENT_USER_VERSION @@ -88,6 +96,23 @@ def _migrate(self): if user_version < 6: self._reinit_storage() + return + + if user_version < 7: + statements = [ + '''CREATE TABLE unread( + account TEXT, + jid TEXT, + count INTEGER, + message_id TEXT, + timestamp INTEGER, + PRIMARY KEY (account, jid))''', + + 'CREATE INDEX idx_unread ON unread(account, jid)', + 'PRAGMA user_version=7' + ] + + self._execute_multiple(statements) @timeit def _load_caps_data(self): @@ -262,3 +287,28 @@ def get_muc_avatar_sha(self, jid): """ return self._muc_avatar_sha_cache.get(jid) + + @timeit + def get_unread_count(self, account, jid): + sql = '''SELECT count, message_id, timestamp FROM unread + WHERE account = ? AND jid = ?''' + return self._con.execute(sql, (account, jid)).fetchone() + + @timeit + def set_unread_count(self, account, jid, count, message_id, timestamp): + sql = '''INSERT INTO unread (account, jid, count, message_id, timestamp) + VALUES (?, ?, ?, ?, ?)''' + self._con.execute(sql, (account, jid, count, message_id, timestamp)) + self._delayed_commit() + + @timeit + def update_unread_count(self, account, jid, count): + sql = 'UPDATE unread SET count = ? WHERE account = ? AND jid = ?' + self._con.execute(sql, (count, account, jid)) + self._delayed_commit() + + @timeit + def reset_unread_count(self, account, jid): + sql = 'DELETE FROM unread WHERE account = ? AND jid = ?' + self._con.execute(sql, (account, jid)) + self._delayed_commit() ===================================== gajim/groupchat_control.py ===================================== @@ -1610,10 +1610,10 @@ def on_cancel(is_checked): on_yes(self) def _close_control(self, reason=None): - if self.parent_win is None: - self.shutdown(reason) - else: - self.parent_win.remove_tab(self, None, reason=reason, force=True) + # if self.parent_win is None: + self.shutdown(reason) + # else: + # self.parent_win.remove_tab(self, None, reason=reason, force=True) def set_control_active(self, state): self.conv_textview.allow_focus_out_line = True ===================================== gajim/gtk/chat_list.py ===================================== @@ -33,12 +33,11 @@ def __init__(self, workspace_id): self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) def _on_destroy(self): - if self._timer_id is not None: - GLib.source_remove(self._timer_id) + GLib.source_remove(self._timer_id) def _update_timer(self): - self.update() - GLib.timeout_add_seconds(60, self._update_timer) + self.update_time() + return True def _filter_func(self, row): if not self._current_filter_text: @@ -87,9 +86,14 @@ def get_open_chats(self): open_chats.append(key + (value.type,)) return open_chats - def update(self): + def update_time(self): for _, row in self._chats.items(): - row.update() + row.update_time() + + def update(self, event): + row = self._chats.get((event.account, event.jid)) + row.add_unread() + row.set_last_message_text('Me', event.msgtext) class ChatRow(Gtk.ListBoxRow): @@ -150,11 +154,11 @@ def __init__(self, workspace_id, account, jid, type_): chat_name_label.set_ellipsize(Pango.EllipsizeMode.END) chat_name_label.set_text(name) - last_message_label = Gtk.Label() - last_message_label.set_halign(Gtk.Align.START) - last_message_label.set_xalign(0) - last_message_label.set_ellipsize(Pango.EllipsizeMode.END) - last_message_label.get_style_context().add_class('small-label') + self._last_message_label = Gtk.Label() + self._last_message_label.set_halign(Gtk.Align.START) + self._last_message_label.set_xalign(0) + self._last_message_label.set_ellipsize(Pango.EllipsizeMode.END) + self._last_message_label.get_style_context().add_class('small-label') self._timestamp_label = Gtk.Label() self._timestamp_label.set_halign(Gtk.Align.END) @@ -167,23 +171,24 @@ def __init__(self, workspace_id, account, jid, type_): last_message_box = Gtk.Box(spacing=3) if line is not None and line.message is not None: one_line = ' '.join(line.message.splitlines()) - last_message_label.set_text(one_line) - nick_label = Gtk.Label() - nick_label.set_halign(Gtk.Align.START) - nick_label.get_style_context().add_class('small-label') - nick_label.get_style_context().add_class('dim-label') + + self._last_message_label.set_text(one_line) + self._nick_label = Gtk.Label() + self._nick_label.set_halign(Gtk.Align.START) + self._nick_label.get_style_context().add_class('small-label') + self._nick_label.get_style_context().add_class('dim-label') if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): - nick_label.set_text(_('Me:')) - last_message_box.add(nick_label) + self._nick_label.set_text(_('Me:')) + last_message_box.add(self._nick_label) if line.kind == KindConstant.GC_MSG: our_nick = get_group_chat_nick(account, jid) if line.contact_name == our_nick: - nick_label.set_text(_('Me:')) + self._nick_label.set_text(_('Me:')) else: - nick_label.set_text(_('%(muc_nick)s: ') % { + self._nick_label.set_text(_('%(muc_nick)s: ') % { 'muc_nick': line.contact_name}) - last_message_box.add(nick_label) + last_message_box.add(self._nick_label) # TODO: file transfers have to be displayed differently @@ -191,7 +196,7 @@ def __init__(self, workspace_id, account, jid, type_): uf_timestamp = get_uf_relative_time(line.time) self._timestamp_label.set_text(uf_timestamp) - last_message_box.add(last_message_label) + last_message_box.add(self._last_message_label) self._unread_label = Gtk.Label() self._unread_label.set_no_show_all(True) @@ -242,16 +247,16 @@ def _on_state_flags_changed(self, _listboxrow, *args): def _on_close_button_clicked(self, _button): app.window.remove_chat(self.workspace_id, self.account, self.jid) - def update(self): + def update_time(self): if self._timestamp is not None: uf_timestamp = get_uf_relative_time(self._timestamp) self._timestamp_label.set_text(uf_timestamp) - def set_unread(self, count): - log.info('Set unread count: %s (%s)', self.jid, count) - self._unread_count = count - if not count: - self._unread_label.hide() - else: - self._unread_label.set_text(str(count)) - self._unread_label.show() + def add_unread(self): + self._unread_count += 1 + self._unread_label.set_text(str(self._unread_count)) + self._unread_label.show() + + def set_last_message_text(self, nickname, text): + self._last_message_label.set_text(text) + self._nick_label.set_text(nickname) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -120,3 +120,7 @@ def contains_chat(self, account, jid, workspace_id=None): chat_list = self._chat_lists[workspace_id] return chat_list.contains_chat(account, jid) + + def update(self, event): + chat_list = self._find_chat(event.account, event.jid) + chat_list.update(event) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -83,3 +83,23 @@ def show_chat(self, account, jid): def clear(self): self.set_visible_child_name('empty') + + def update(self, event): + if not event.msgtxt: + return + + control = self.get_control(event.account, event.jid) + + typ = '' + if event.properties.is_sent_carbon: + typ = 'out' + + control.add_message(event.msgtxt, + typ, + tim=event.properties.timestamp, + subject=event.properties.subject, + displaymarking=event.displaymarking, + msg_log_id=event.msg_log_id, + message_id=event.properties.id, + correct_id=event.correct_id, + additional_data=event.additional_data) ===================================== gajim/gtk/main.py ===================================== @@ -4,6 +4,7 @@ from gi.repository import Gio from gajim.common import app +from gajim.common import ged from gajim.common.i18n import _ from gajim.gui.util import get_builder from gajim.gui.util import load_icon @@ -61,6 +62,10 @@ def __init__(self): 'clicked', self._on_start_chat_clicked) self._ui.connect_signals(self) + app.ged.register_event_handler('message-received', + ged.CORE, + self._on_message_received) + self.show_all() self._load_chats() @@ -236,6 +241,13 @@ def _on_edit_workspace_clicked(self, _button): open_window('WorkspaceDialog', workspace_id=self.get_active_workspace()) + def _on_message_received(self, event): + if not self.chat_exists(event.account, event.jid): + self.add_chat(event.account, event.jid, 'contact') + + self._chat_stack.update(event) + self._chat_list_stack.update(event) + def quit(self): accounts = list(app.connections.keys()) get_msg = False ===================================== gajim/gui_interface.py ===================================== @@ -63,7 +63,6 @@ from gajim.chat_control import ChatControl from gajim.groupchat_control import GroupchatControl from gajim.privatechat_control import PrivateChatControl -from gajim.message_window import MessageWindowMgr from gajim.session import ChatControlSession @@ -2124,8 +2123,6 @@ def __init__(self): # Load CSS files app.load_css_config() - app.storage.archive.reset_shown_unread_messages() - for account in app.settings.get_accounts(): if app.settings.get_account_setting(account, 'is_zeroconf'): app.ZEROCONF_ACC_NAME = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/97dfbb01b552f37cbb1444759e907ce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/97dfbb01b552f37cbb1444759e907ce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Add group chat nicks
by Daniel Brötzmann 02 Feb '21

02 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 97dfbb01 by Daniel Brötzmann at 2021-02-02T19:42:06+01:00 ChatList: Add group chat nicks - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -9,6 +9,7 @@ from gajim.common.const import KindConstant from gajim.common.i18n import _ from gajim.common.helpers import get_groupchat_name +from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_uf_relative_time log = logging.getLogger('gajim.gtk.chatlist') @@ -167,14 +168,23 @@ def __init__(self, workspace_id, account, jid, type_): if line is not None and line.message is not None: one_line = ' '.join(line.message.splitlines()) last_message_label.set_text(one_line) - nick_label = Gtk.Label(label=_('Me:')) + nick_label = Gtk.Label() nick_label.set_halign(Gtk.Align.START) nick_label.get_style_context().add_class('small-label') nick_label.get_style_context().add_class('dim-label') if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): + nick_label.set_text(_('Me:')) last_message_box.add(nick_label) - # TODO: MUC nick + if line.kind == KindConstant.GC_MSG: + our_nick = get_group_chat_nick(account, jid) + if line.contact_name == our_nick: + nick_label.set_text(_('Me:')) + else: + nick_label.set_text(_('%(muc_nick)s: ') % { + 'muc_nick': line.contact_name}) + last_message_box.add(nick_label) + # TODO: file transfers have to be displayed differently self._timestamp = line.time View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97dfbb01b552f37cbb1444759e907ce7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97dfbb01b552f37cbb1444759e907ce7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Paned: Improve ChatList resizing
by Daniel Brötzmann 02 Feb '21

02 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3ff47301 by Daniel Brötzmann at 2021-02-02T19:24:16+01:00 Paned: Improve ChatList resizing - - - - - 517424b8 by Daniel Brötzmann at 2021-02-02T19:25:11+01:00 ChatList: Use groupchat name, improve ellipsizing - - - - - 2 changed files: - gajim/data/gui/main.ui - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -317,8 +317,8 @@ </style> </object> <packing> - <property name="resize">True</property> - <property name="shrink">True</property> + <property name="resize">False</property> + <property name="shrink">False</property> </packing> </child> <child> ===================================== gajim/gtk/chat_list.py ===================================== @@ -8,6 +8,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.i18n import _ +from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_uf_relative_time log = logging.getLogger('gajim.gtk.chatlist') @@ -118,32 +119,39 @@ def __init__(self, workspace_id, account, jid, type_): contact = app.contacts.get_contact(account, jid) - if contact and not contact.is_groupchat: - avatar = app.contacts.get_avatar(account, - contact.jid, - AvatarSize.ROSTER, - self.get_scale_factor(), - contact.show) - name = contact.get_shown_name() + scale = self.get_scale_factor() + if contact: + if contact.is_groupchat: + avatar = app.contacts.get_avatar(account, + jid, + AvatarSize.ROSTER, + scale) + con = app.connections[account] + name = get_groupchat_name(con, jid) + else: + avatar = app.contacts.get_avatar(account, + contact.jid, + AvatarSize.ROSTER, + scale, + contact.show) + name = contact.get_shown_name() else: avatar = app.contacts.get_avatar(account, jid, AvatarSize.ROSTER, - self.get_scale_factor()) + scale) name = jid avatar_image = Gtk.Image.new_from_surface(avatar) chat_name_label = Gtk.Label() chat_name_label.set_halign(Gtk.Align.START) chat_name_label.set_xalign(0) - chat_name_label.set_max_width_chars(18) chat_name_label.set_ellipsize(Pango.EllipsizeMode.END) chat_name_label.set_text(name) last_message_label = Gtk.Label() last_message_label.set_halign(Gtk.Align.START) last_message_label.set_xalign(0) - last_message_label.set_max_width_chars(20) last_message_label.set_ellipsize(Pango.EllipsizeMode.END) last_message_label.get_style_context().add_class('small-label') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3b4d96a92acfa73fafa512656ba4a06… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3b4d96a92acfa73fafa512656ba4a06… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatList: Group chat avatars and message lines
by Daniel Brötzmann 01 Feb '21

01 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3b4d96a9 by Daniel Brötzmann at 2021-02-01T20:29:45+01:00 ChatList: Group chat avatars and message lines - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -118,7 +118,7 @@ def __init__(self, workspace_id, account, jid, type_): contact = app.contacts.get_contact(account, jid) - if contact: + if contact and not contact.is_groupchat: avatar = app.contacts.get_avatar(account, contact.jid, AvatarSize.ROSTER, @@ -157,7 +157,8 @@ def __init__(self, workspace_id, account, jid, type_): line = app.storage.archive.get_last_conversation_line(account, jid) last_message_box = Gtk.Box(spacing=3) if line is not None and line.message is not None: - last_message_label.set_text(line.message) + one_line = ' '.join(line.message.splitlines()) + last_message_label.set_text(one_line) nick_label = Gtk.Label(label=_('Me:')) nick_label.set_halign(Gtk.Align.START) nick_label.get_style_context().add_class('small-label') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b4d96a92acfa73fafa512656ba4a06c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3b4d96a92acfa73fafa512656ba4a06c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ChatList: Add friendly timestamps
by Daniel Brötzmann 01 Feb '21

01 Feb '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1c96ce9d by Daniel Brötzmann at 2021-02-01T20:01:53+01:00 ChatList: Add friendly timestamps - - - - - 8740fa22 by Daniel Brötzmann at 2021-02-01T20:08:45+01:00 ChatList: Unread counter styling - - - - - 3 changed files: - gajim/common/helpers.py - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -49,6 +49,8 @@ import string from string import Template import urllib +from datetime import datetime +from datetime import timedelta from urllib.parse import unquote from encodings.punycode import punycode_encode from functools import wraps @@ -283,6 +285,30 @@ def get_uf_affiliation(affiliation, plural=False): affiliation_name = _('Member') return affiliation_name +def get_uf_relative_time(timestamp: int) -> str: + date_time = datetime.fromtimestamp(timestamp) + now = datetime.now() + timespan = now - date_time + + if timespan > timedelta(days=365): + return str(date_time.year) + if timespan > timedelta(days=7): + return date_time.strftime('%b %d') + if timespan > timedelta(days=2): + return date_time.strftime('%a') + if date_time.strftime('%d') != now.strftime('%d'): + return _('Yesterday') + if timespan > timedelta(minutes=15): + return date_time.strftime('%H:%M') + if timespan > timedelta(minutes=1): + minutes = int(timespan.seconds / 60) + return ngettext('%i min ago', + '%i mins ago', + minutes, + minutes, + minutes) + return _('Just now') + def get_sorted_keys(adict): keys = sorted(adict.keys()) return keys ===================================== gajim/data/style/gajim.css ===================================== @@ -159,12 +159,13 @@ margin-right: 6px; } .unread-counter { + background-color: rgb(22, 100, 169); color: rgb(242, 242, 242); + font-weight: bold; + font-size: 80%; padding-left: 6px; padding-right: 6px; border-radius: 10px; - font-size: 80%; - background-color: rgb(22, 100, 169); } /* VCardWindow */ ===================================== gajim/gtk/chat_list.py ===================================== @@ -1,16 +1,14 @@ import logging -from datetime import datetime - +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Pango -from gi.repository import GLib from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.i18n import _ - +from gajim.common.helpers import get_uf_relative_time log = logging.getLogger('gajim.gtk.chatlist') @@ -24,11 +22,22 @@ def __init__(self, workspace_id): self._workspace_id = workspace_id self.get_style_context().add_class('chatlist') + self.connect('destroy', self._on_destroy) self.show_all() self.set_filter_func(self._filter_func) + self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) + + def _on_destroy(self): + if self._timer_id is not None: + GLib.source_remove(self._timer_id) + + def _update_timer(self): + self.update() + GLib.timeout_add_seconds(60, self._update_timer) + def _filter_func(self, row): if not self._current_filter_text: return True @@ -76,6 +85,10 @@ def get_open_chats(self): open_chats.append(key + (value.type,)) return open_chats + def update(self): + for _, row in self._chats.items(): + row.update() + class ChatRow(Gtk.ListBoxRow): def __init__(self, workspace_id, account, jid, type_): @@ -85,6 +98,8 @@ def __init__(self, workspace_id, account, jid, type_): self.jid = jid self.workspace_id = workspace_id self.type = type_ + + self._timestamp = None self._unread_count = 0 self.get_style_context().add_class('chatlist-row') @@ -132,11 +147,11 @@ def __init__(self, workspace_id, account, jid, type_): last_message_label.set_ellipsize(Pango.EllipsizeMode.END) last_message_label.get_style_context().add_class('small-label') - timestamp_label = Gtk.Label() - timestamp_label.set_halign(Gtk.Align.END) - timestamp_label.set_valign(Gtk.Align.END) - timestamp_label.get_style_context().add_class('small-label') - timestamp_label.get_style_context().add_class('dim-label') + self._timestamp_label = Gtk.Label() + self._timestamp_label.set_halign(Gtk.Align.END) + self._timestamp_label.set_valign(Gtk.Align.END) + self._timestamp_label.get_style_context().add_class('small-label') + self._timestamp_label.get_style_context().add_class('dim-label') # Get last chat message from archive line = app.storage.archive.get_last_conversation_line(account, jid) @@ -153,10 +168,10 @@ def __init__(self, workspace_id, account, jid, type_): # TODO: MUC nick # TODO: file transfers have to be displayed differently - # TODO: Calculate user friendly timestamp for yesterday, etc. - date_time = datetime.fromtimestamp(line.time) - timestamp = date_time.strftime('%H:%M') - timestamp_label.set_text(timestamp) + self._timestamp = line.time + uf_timestamp = get_uf_relative_time(line.time) + self._timestamp_label.set_text(uf_timestamp) + last_message_box.add(last_message_label) self._unread_label = Gtk.Label() @@ -180,7 +195,7 @@ def __init__(self, workspace_id, account, jid, type_): meta_box = Gtk.Box(spacing=6) meta_box.pack_start(chat_name_label, False, True, 0) meta_box.pack_end(self._unread_label, False, True, 0) - meta_box.pack_end(timestamp_label, False, True, 0) + meta_box.pack_end(self._timestamp_label, False, True, 0) text_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) text_box.add(meta_box) @@ -208,6 +223,11 @@ def _on_state_flags_changed(self, _listboxrow, *args): def _on_close_button_clicked(self, _button): app.window.remove_chat(self.workspace_id, self.account, self.jid) + def update(self): + if self._timestamp is not None: + uf_timestamp = get_uf_relative_time(self._timestamp) + self._timestamp_label.set_text(uf_timestamp) + def set_unread(self, count): log.info('Set unread count: %s (%s)', self.jid, count) self._unread_count = count View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1634ed6e28abf7eb19a908fbe0305d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1634ed6e28abf7eb19a908fbe0305d1… You're receiving this email because of your account on dev.gajim.org.

1 0

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

31 Jan '21

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

1 0

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

31 Jan '21

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

1 0

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

31 Jan '21

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

1 0

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

31 Jan '21

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

1 0

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