copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Escape account label in roster and menus

This commit is contained in:
Philipp Hörist 2017-11-11 17:10:17 +01:00
parent d19e87eb7b
commit 309e844b4e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gajim/gui_menu_builder.py
View File

@ -780,7 +780,8 @@ def build_accounts_menu():
return return
if len(accounts_list) > 1: if len(accounts_list) > 1:
for acc in accounts_list: for acc in accounts_list:
label = app.config.get_per('accounts', acc, 'account_label') label = escape_mnemonic(
app.config.get_per('accounts', acc, 'account_label'))
acc_menu.append_submenu( acc_menu.append_submenu(
label or acc, get_account_menu(acc)) label or acc, get_account_menu(acc))
else: else:
@ -806,8 +807,8 @@ def build_bookmark_menu(account):
if acc_menu.get_item_link(0, 'submenu'): if acc_menu.get_item_link(0, 'submenu'):
for i in range(acc_menu.get_n_items()): for i in range(acc_menu.get_n_items()):
label = acc_menu.get_item_attribute_value(i, 'label') label = acc_menu.get_item_attribute_value(i, 'label')
account_label = app.config.get_per('accounts', account, account_label = escape_mnemonic(
'account_label') app.config.get_per('accounts', account, 'account_label'))
if label.get_string() in (account_label, account): if label.get_string() in (account_label, account):
menu = acc_menu.get_item_link(i, 'submenu') menu = acc_menu.get_item_link(i, 'submenu')
else: else:
@ -835,3 +836,11 @@ def get_encryption_menu(control_id, type_id):
if menu.get_n_items() == 1: if menu.get_n_items() == 1:
return None return None
return menu return menu
def escape_mnemonic(label):
if label is None:
return
# Underscore inside a label means the next letter is a keyboard
# shortcut. To show an underscore we have to use double underscore
return label.replace('_', '__')

2
gajim/roster_window.py
View File

@ -1069,7 +1069,7 @@ class RosterWindow:
accounts = accounts) accounts = accounts)
account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total))
self.model[child_iter][Column.NAME] = account_name self.model[child_iter][Column.NAME] = GLib.markup_escape_text(account_name)
pep_dict = app.connections[account].pep pep_dict = app.connections[account].pep
if app.config.get('show_mood_in_roster') and 'mood' in pep_dict: if app.config.get('show_mood_in_roster') and 'mood' in pep_dict: