From 40a4f408298a5e85aaa747884e5e49e2bb2d3133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 19 Jul 2014 12:45:27 +0200 Subject: [PATCH] added default value for empty shortcuts "None" autoload the actions in the first actions groups added to edit shortcuts dialog --- shortcuts_management/actions_shortcuts_model.cpp | 10 +++++++++- shortcuts_management/edit_shortcuts_dialog.cpp | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/shortcuts_management/actions_shortcuts_model.cpp b/shortcuts_management/actions_shortcuts_model.cpp index 14ed0346..86c7d7ba 100644 --- a/shortcuts_management/actions_shortcuts_model.cpp +++ b/shortcuts_management/actions_shortcuts_model.cpp @@ -57,13 +57,21 @@ QVariant ActionsShortcutsModel::data(const QModelIndex &index, int role) const } } + if(role == Qt::ForegroundRole && index.column() == KEYS && actions[index.row()]->shortcut().isEmpty()) + return QBrush(QColor("#AAAAAA")); + if (role != Qt::DisplayRole) return QVariant(); if (index.column() == NAME) return QVariant(actions[index.row()]->toolTip()); if (index.column() == KEYS) - return QVariant(actions[index.row()]->shortcut().toString(QKeySequence::NativeText)); + { + QKeySequence ks = actions[index.row()]->shortcut(); + if(ks.isEmpty()) + return tr("None"); + return QVariant(ks.toString(QKeySequence::NativeText)); + } return QVariant(); } diff --git a/shortcuts_management/edit_shortcuts_dialog.cpp b/shortcuts_management/edit_shortcuts_dialog.cpp index cd8bdc5c..5cfd9088 100644 --- a/shortcuts_management/edit_shortcuts_dialog.cpp +++ b/shortcuts_management/edit_shortcuts_dialog.cpp @@ -40,6 +40,7 @@ EditShortcutsDialog::EditShortcutsDialog(QWidget *parent) : groupsModel = new ActionsGroupsModel(); actionsModel = new ActionsShortcutsModel(); actionsGroupsListView->setModel(groupsModel); + actionsGroupsListView->setFocus(); actionsTableView->setModel(actionsModel); actionsTableView->setColumnWidth(0,30); actionsTableView->setColumnWidth(1,360); @@ -71,9 +72,9 @@ EditShortcutsDialog::EditShortcutsDialog(QWidget *parent) : void EditShortcutsDialog::addActionsGroup(const QString &name, const QIcon &ico, QList &group) { - //TODO - //groups model add groupsModel->addActionsGroup(ActionsGroup(name,ico,group)); + if(actionsTableView->model()->rowCount()==0)//first group added + actionsGroupsListView->selectionModel()->select(groupsModel->index(0,0),QItemSelectionModel::Select); } void EditShortcutsDialog::resetToDefaults() @@ -84,5 +85,4 @@ void EditShortcutsDialog::resetToDefaults() void EditShortcutsDialog::loadShortcuts(const QModelIndex &mi,const QModelIndex &mi2) { actionsModel->addActions(groupsModel->getActions(mi)); - //actionsTableView->resizeColumnsToContents(); }