anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PrefShortcuts: use KeySequence::ForGui to display shortcuts

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21309 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-10-31 17:15:10 +00:00
parent ae76ba2362
commit 6cf20c52b7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/CustomizedWidgets.cpp
View File

@ -93,7 +93,7 @@ void ShortcutLineEdit::keyPressEvent(QKeyEvent * e)
break;
default:
appendToSequence(e);
setText(toqstr(keysequence_.print(KeySequence::BindFile)));
setText(toqstr(keysequence_.print(KeySequence::ForGui)));
}
}

9
src/frontends/qt4/GuiPrefs.cpp
View File

@ -1874,10 +1874,7 @@ QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun,
string const action_name = lyxaction.getActionName(action);
QString const lfun_name = toqstr(from_utf8(action_name)
+ " " + lfun.argument());
// use BindFile format instead of a more verbose form Portable. If the
// Shortcut dialog can hide all the bind file stuff, and on_removePB_pressed
// can parse Portable format, Portable format can be used.
QString const shortcut = toqstr(seq.print(KeySequence::BindFile));
QString const shortcut = toqstr(seq.print(KeySequence::ForGui));
item_type item_tag = tag;
QTreeWidgetItem * newItem = NULL;
@ -1925,6 +1922,8 @@ QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun,
newItem->setText(0, lfun_name);
newItem->setText(1, shortcut);
// record BindFile representation to recover KeySequence when needed.
newItem->setData(1, Qt::UserRole, QVariant(toqstr(seq.print(KeySequence::BindFile))));
setItemType(newItem, item_tag);
return newItem;
}
@ -1987,7 +1986,7 @@ void PrefShortcuts::on_removePB_pressed()
// removing all selected items anyway.
QList<QTreeWidgetItem*> items = shortcutsTW->selectedItems();
for (int i = 0; i < items.size(); ++i) {
string shortcut = fromqstr(items[i]->text(1));
string shortcut = fromqstr(items[i]->data(1, Qt::UserRole).toString());
string lfun = fromqstr(items[i]->text(0));
FuncRequest func = lyxaction.lookupFunc(lfun);
item_type tag = static_cast<item_type>(items[i]->data(0, Qt::UserRole).toInt());