mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-23 15:35:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added default value for empty shortcuts "None"

Browse Source 
autoload the actions in the first actions groups added to edit shortcuts dialog
This commit is contained in:
Luis Ángel San Martín
2014-07-19 12:45:27 +02:00
parent 1dc8942171
commit 40a4f40829
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shortcuts_management/actions_shortcuts_model.cpp
View File

@ -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) if (role != Qt::DisplayRole)
return QVariant(); return QVariant();
if (index.column() == NAME) if (index.column() == NAME)
return QVariant(actions[index.row()]->toolTip()); return QVariant(actions[index.row()]->toolTip());
if (index.column() == KEYS) 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(); return QVariant();
} }

6
shortcuts_management/edit_shortcuts_dialog.cpp
View File

@ -40,6 +40,7 @@ EditShortcutsDialog::EditShortcutsDialog(QWidget *parent) :
groupsModel = new ActionsGroupsModel(); groupsModel = new ActionsGroupsModel();
actionsModel = new ActionsShortcutsModel(); actionsModel = new ActionsShortcutsModel();
actionsGroupsListView->setModel(groupsModel); actionsGroupsListView->setModel(groupsModel);
actionsGroupsListView->setFocus();
actionsTableView->setModel(actionsModel); actionsTableView->setModel(actionsModel);
actionsTableView->setColumnWidth(0,30); actionsTableView->setColumnWidth(0,30);
actionsTableView->setColumnWidth(1,360); actionsTableView->setColumnWidth(1,360);
@ -71,9 +72,9 @@ EditShortcutsDialog::EditShortcutsDialog(QWidget *parent) :
void EditShortcutsDialog::addActionsGroup(const QString &name, const QIcon &ico, QList<QAction *> &group) void EditShortcutsDialog::addActionsGroup(const QString &name, const QIcon &ico, QList<QAction *> &group)
{ {
//TODO
//groups model add
groupsModel->addActionsGroup(ActionsGroup(name,ico,group)); 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() void EditShortcutsDialog::resetToDefaults()
@ -84,5 +85,4 @@ void EditShortcutsDialog::resetToDefaults()
void EditShortcutsDialog::loadShortcuts(const QModelIndex &mi,const QModelIndex &mi2) void EditShortcutsDialog::loadShortcuts(const QModelIndex &mi,const QModelIndex &mi2)
{ {
actionsModel->addActions(groupsModel->getActions(mi)); actionsModel->addActions(groupsModel->getActions(mi));
//actionsTableView->resizeColumnsToContents();
} }