mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make most of the shortcuts widget specific

Browse source 
Having the window specific means that you can't have a key do different
things on different widgets.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-03 15:28:06 -07:00
parent 2cfa7fead0
commit 49053e86aa
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/mainwindow.cpp
View file

@ -502,11 +502,11 @@ void MainWindow::on_actionYearlyStatistics_triggered()
yearlyStats->setMinimumWidth(600); yearlyStats->setMinimumWidth(600);
yearlyStats->setWindowTitle(tr("Yearly Statistics")); yearlyStats->setWindowTitle(tr("Yearly Statistics"));
yearlyStats->setWindowIcon(QIcon(":subsurface-icon")); yearlyStats->setWindowIcon(QIcon(":subsurface-icon"));
QShortcut *closeKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), yearlyStats); QShortcut *closeKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), yearlyStats, 0, 0, Qt::WidgetShortcut);
connect(closeKey, SIGNAL(activated()), yearlyStats, SLOT(close())); connect(closeKey, SIGNAL(activated()), yearlyStats, SLOT(close()));
closeKey = new QShortcut(QKeySequence(Qt::Key_Escape), yearlyStats); closeKey = new QShortcut(QKeySequence(Qt::Key_Escape), yearlyStats, 0, 0, Qt::WidgetShortcut);
connect(closeKey, SIGNAL(activated()), yearlyStats, SLOT(close())); connect(closeKey, SIGNAL(activated()), yearlyStats, SLOT(close()));
QShortcut *quitKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), yearlyStats); QShortcut *quitKey = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), yearlyStats, 0, 0, Qt::WidgetShortcut);
connect(quitKey, SIGNAL(activated()), this, SLOT(close())); connect(quitKey, SIGNAL(activated()), this, SLOT(close()));
} }
/* problem here is that without more MainWindow variables or a separate YearlyStatistics /* problem here is that without more MainWindow variables or a separate YearlyStatistics

4
qt-ui/profile/profilewidget2.cpp
View file

@ -1044,8 +1044,10 @@ void ProfileWidget2::disconnectTemporaryConnections()
disconnect(plannerModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), disconnect(plannerModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
this, SLOT(pointsRemoved(const QModelIndex &, int, int))); this, SLOT(pointsRemoved(const QModelIndex &, int, int)));
Q_FOREACH (QAction *action, actionsForKeys.values()) Q_FOREACH (QAction *action, actionsForKeys.values()) {
action->setShortcut(QKeySequence()); action->setShortcut(QKeySequence());
action->setShortcutContext(Qt::WidgetShortcut);
}
} }
void ProfileWidget2::pointInserted(const QModelIndex &parent, int start, int end) void ProfileWidget2::pointInserted(const QModelIndex &parent, int start, int end)

4
qt-ui/usermanual.cpp
View file

@ -18,12 +18,12 @@ UserManual::UserManual(QWidget *parent) : QMainWindow(parent),
QAction *actionShowSearch = new QAction(this); QAction *actionShowSearch = new QAction(this);
actionShowSearch->setShortcut(Qt::CTRL + Qt::Key_F); actionShowSearch->setShortcut(Qt::CTRL + Qt::Key_F);
actionShowSearch->setShortcutContext(Qt::WindowShortcut); actionShowSearch->setShortcutContext(Qt::WidgetShortcut);
addAction(actionShowSearch); addAction(actionShowSearch);
QAction *actionHideSearch = new QAction(this); QAction *actionHideSearch = new QAction(this);
actionHideSearch->setShortcut(Qt::Key_Escape); actionHideSearch->setShortcut(Qt::Key_Escape);
actionHideSearch->setShortcutContext(Qt::WindowShortcut); actionHideSearch->setShortcutContext(Qt::WidgetShortcut);
addAction(actionHideSearch); addAction(actionHideSearch);
setWindowTitle(tr("User Manual")); setWindowTitle(tr("User Manual"));