anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ShortcutPrefs: clean-up

Browse Source
This commit is contained in:
Guillaume Munch 2016-05-29 20:58:33 +01:00
parent 2b6d0ae3de
commit b53d07897b
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2822,6 +2822,13 @@ void PrefShortcuts::updateShortcutsTW()
} }
//static
KeyMap::ItemType PrefShortcuts::itemType(QTreeWidgetItem & item)
{
return static_cast<KeyMap::ItemType>(item.data(0, Qt::UserRole).toInt());
}
void PrefShortcuts::setItemType(QTreeWidgetItem * item, KeyMap::ItemType tag) void PrefShortcuts::setItemType(QTreeWidgetItem * item, KeyMap::ItemType tag)
{ {
item->setData(0, Qt::UserRole, QVariant(tag)); item->setData(0, Qt::UserRole, QVariant(tag));
@ -2915,9 +2922,7 @@ void PrefShortcuts::on_shortcutsTW_itemSelectionChanged()
if (items.isEmpty()) if (items.isEmpty())
return; return;
KeyMap::ItemType tag = if (itemType(*items[0]) == KeyMap::UserUnbind)
static_cast<KeyMap::ItemType>(items[0]->data(0, Qt::UserRole).toInt());
if (tag == KeyMap::UserUnbind)
removePB->setText(qt_("Res&tore")); removePB->setText(qt_("Res&tore"));
else else
removePB->setText(qt_("Remo&ve")); removePB->setText(qt_("Remo&ve"));
@ -2955,10 +2960,8 @@ void PrefShortcuts::removeShortcut()
string shortcut = fromqstr(items[i]->data(1, Qt::UserRole).toString()); string shortcut = fromqstr(items[i]->data(1, Qt::UserRole).toString());
string lfun = fromqstr(items[i]->text(0)); string lfun = fromqstr(items[i]->text(0));
FuncRequest func = lyxaction.lookupFunc(lfun); FuncRequest func = lyxaction.lookupFunc(lfun);
KeyMap::ItemType tag =
static_cast<KeyMap::ItemType>(items[i]->data(0, Qt::UserRole).toInt());
switch (tag) { switch (itemType(*items[i])) {
case KeyMap::System: { case KeyMap::System: {
// for system bind, we do not touch the item // for system bind, we do not touch the item
// but add an user unbind item // but add an user unbind item
@ -3010,10 +3013,8 @@ void PrefShortcuts::deactivateShortcuts(QList<QTreeWidgetItem*> const & items)
string shortcut = fromqstr(items[i]->data(1, Qt::UserRole).toString()); string shortcut = fromqstr(items[i]->data(1, Qt::UserRole).toString());
string lfun = fromqstr(items[i]->text(0)); string lfun = fromqstr(items[i]->text(0));
FuncRequest func = lyxaction.lookupFunc(lfun); FuncRequest func = lyxaction.lookupFunc(lfun);
KeyMap::ItemType tag =
static_cast<KeyMap::ItemType>(items[i]->data(0, Qt::UserRole).toInt());
switch (tag) { switch (itemType(*items[i])) {
case KeyMap::System: case KeyMap::System:
// for system bind, we do not touch the item // for system bind, we do not touch the item
// but add an user unbind item // but add an user unbind item

39
src/frontends/qt4/GuiPrefs.h
View File

@ -456,24 +456,6 @@ public:
void applyRC(LyXRC & rc) const; void applyRC(LyXRC & rc) const;
void updateRC(LyXRC const & rc); void updateRC(LyXRC const & rc);
void updateShortcutsTW(); void updateShortcutsTW();
void modifyShortcut();
/// remove selected binding, restore default value
void removeShortcut();
/// remove bindings, do not restore default values
void deactivateShortcuts(QList<QTreeWidgetItem*> const & items);
/// check the new binding k->func, and remove existing bindings to k after
/// asking the user. We exclude lfun_to_modify from this test: we assume
/// that if the user clicked "modify" then they agreed to modify the
/// binding. Returns false if the shortcut is invalid or the user cancels.
bool validateNewShortcut(FuncRequest const & func,
KeySequence const & k,
QString const & lfun_to_modify);
/// compute current active shortcut
FuncRequest currentBinding(KeySequence const & k);
///
void setItemType(QTreeWidgetItem * item, KeyMap::ItemType tag);
QTreeWidgetItem * insertShortcutItem(FuncRequest const & lfun,
KeySequence const & shortcut, KeyMap::ItemType tag);
public Q_SLOTS: public Q_SLOTS:
void selectBind(); void selectBind();
@ -491,6 +473,27 @@ public Q_SLOTS:
void shortcutRemovePressed(); void shortcutRemovePressed();
private: private:
void modifyShortcut();
/// remove selected binding, restore default value
void removeShortcut();
/// remove bindings, do not restore default values
void deactivateShortcuts(QList<QTreeWidgetItem*> const & items);
/// check the new binding k->func, and remove existing bindings to k after
/// asking the user. We exclude lfun_to_modify from this test: we assume
/// that if the user clicked "modify" then they agreed to modify the
/// binding. Returns false if the shortcut is invalid or the user cancels.
bool validateNewShortcut(FuncRequest const & func,
KeySequence const & k,
QString const & lfun_to_modify);
/// compute current active shortcut
FuncRequest currentBinding(KeySequence const & k);
///
void setItemType(QTreeWidgetItem * item, KeyMap::ItemType tag);
///
static KeyMap::ItemType itemType(QTreeWidgetItem & item);
///
QTreeWidgetItem * insertShortcutItem(FuncRequest const & lfun,
KeySequence const & shortcut, KeyMap::ItemType tag);
/// ///
GuiShortcutDialog * shortcut_; GuiShortcutDialog * shortcut_;
/// ///