Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits:
f7f3dc99 by wurstsalat at 2021-05-02T11:57:19+02:00
Add Note to myself feature
- - - - -
3 changed files:
- gajim/gtk/chat_list.py
- gajim/gtk/start_chat.py
- gajim/gui_menu_builder.py
Changes:
=====================================
gajim/gtk/chat_list.py
=====================================
@@ -288,7 +288,8 @@ def __init__(self, workspace_id, account, jid, type_,
pinned):
self.conversations_label = ConversationsHeader()
self.pinned_label = PinnedHeader()
- self.contact =
app.get_client(account).get_module('Contacts').get_contact(jid)
+ self._client = app.get_client(account)
+ self.contact = self._client.get_module('Contacts').get_contact(jid)
self.contact.connect('presence-update', self._on_presence_update)
self.contact.connect('chatstate-update', self._on_chatstate_update)
self.contact.connect('nickname-update', self._on_nickname_update)
@@ -404,8 +405,11 @@ def update_name(self):
muc_name = get_groupchat_name(client, self.jid)
self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})')
return
-
- self._ui.name_label.set_text(self.contact.name)
+ own_jid = self._client.get_own_jid().bare
+ if self.jid == own_jid:
+ self._ui.name_label.set_text(_('Note to myself'))
+ else:
+ self._ui.name_label.set_text(self.contact.name)
def update_account_identifier(self):
account_class = app.css_config.get_dynamic_class(self.account)
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -27,7 +27,6 @@
from gajim.common import app
from gajim.common.helpers import validate_jid
from gajim.common.helpers import to_user_string
-from gajim.common.helpers import get_groupchat_name
from gajim.common.helpers import get_group_chat_nick
from gajim.common.i18n import _
from gajim.common.i18n import get_rfc5646_lang
@@ -131,8 +130,18 @@ def _add_contacts(self, rows):
client = app.get_client(account)
for jid, _data in client.get_module('Roster').iter():
contact = client.get_module('Contacts').get_contact(jid)
- rows.append(ContactRow(account, contact, jid,
- contact.name, show_account))
+ rows.append(ContactRow(account,
+ contact,
+ jid,
+ contact.name,
+ show_account))
+ self_contact = client.get_module('Contacts').get_contact(
+ client.get_own_jid().bare)
+ rows.append(ContactRow(account,
+ self_contact,
+ self_contact.jid,
+ _('Note to myself'),
+ show_account))
def _add_groupchats(self, rows):
show_account = len(self._accounts) > 1
=====================================
gajim/gui_menu_builder.py
=====================================
@@ -871,7 +871,9 @@ def get_chat_list_row_menu(workspace_id, account, jid,
pinned):
(_('Move Chat'), []),
]
- if not contact.is_groupchat and not contact.is_in_roster:
+ is_self_contact = contact.jid.bare == client.get_own_jid().bare
+ if (not contact.is_groupchat and not contact.is_in_roster and
+ not is_self_contact):
menu_items.append(('add-to-roster', _('Add to contact list')))
menu = Gio.Menu()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/f7f3dc99fa450776535dc07aa4c236a0febaeb81
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/f7f3dc99fa450776535dc07aa4c236a0febaeb81
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
