Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Added "Alt+S" shortcut to start model simulation

Browse source
This commit is contained in:
Damjan Adamic 2014-05-05 20:25:41 +02:00
parent 1f3e67f912
commit 809a3cfd60
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
companion/src/mainwindow.cpp
View file

@ -1563,7 +1563,12 @@ MdiChild *MainWindow::createMdiChild()
return child; return child;
} }
QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot, QObject *slotObj) QAction * MainWindow::addAct(const QString & icon, const QString & sName, const QString & lName, enum QKeySequence::StandardKey shortcut, const char *slot, QObject *slotObj)
{
return addAct(icon, sName, lName, QKeySequence(shortcut), slot, slotObj);
}
QAction * MainWindow::addAct(const QString & icon, const QString & sName, const QString & lName, const QKeySequence & shortcut, const char *slot, QObject *slotObj)
{ {
QAction * newAction = new QAction( this ); QAction * newAction = new QAction( this );
if (!icon.isEmpty()) if (!icon.isEmpty())
@ -1572,20 +1577,20 @@ QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySeq
newAction->setText(sName); newAction->setText(sName);
if (!lName.isEmpty()) if (!lName.isEmpty())
newAction->setStatusTip(lName); newAction->setStatusTip(lName);
if (shortcut != 0) newAction->setShortcut(shortcut);
newAction->setShortcut(QKeySequence(shortcut));
if (slotObj == NULL) if (slotObj == NULL)
slotObj = this; slotObj = this;
connect(newAction, SIGNAL(triggered()), slotObj, slot); connect(newAction, SIGNAL(triggered()), slotObj, slot);
return newAction; return newAction;
} }
QAction * MainWindow::addAct(QString icon, QString sName, QString lName, const char *slot)
QAction * MainWindow::addAct(const QString & icon, const QString & sName, const QString & lName, const char *slot)
{ {
return addAct(icon, sName, lName, QKeySequence::UnknownKey, slot); return addAct(icon, sName, lName, QKeySequence::UnknownKey, slot);
} }
QAction * MainWindow::addAct(QActionGroup *aGroup, QString sName, QString lName, const char *slot) QAction * MainWindow::addAct(QActionGroup *aGroup, const QString & sName, const QString & lName, const char *slot)
{ {
QAction *action = addAct("", sName, lName, QKeySequence::UnknownKey, slot); QAction *action = addAct("", sName, lName, QKeySequence::UnknownKey, slot);
action->setCheckable(true); action->setCheckable(true);
@ -1653,8 +1658,8 @@ void MainWindow::createActions()
// dutchLangAct = addAct( langAlignGroup, tr("Dutch"), tr("Use Dutch in menus"), SLOT(setNLLanguage())); // dutchLangAct = addAct( langAlignGroup, tr("Dutch"), tr("Use Dutch in menus"), SLOT(setNLLanguage()));
aboutAct = addAct("information.png", tr("About..."), tr("Show the application's About box"), SLOT(about())); aboutAct = addAct("information.png", tr("About..."), tr("Show the application's About box"), SLOT(about()));
printAct = addAct("print.png", tr("Print..."), tr("Print current model"), QKeySequence::Print, SLOT(print())); printAct = addAct("print.png", tr("Print..."), tr("Print current model"), QKeySequence::Print, SLOT(print()));
simulateAct = addAct("simulate.png", tr("Simulate..."), tr("Simulate current model"), SLOT(simulate())); simulateAct = addAct("simulate.png", tr("Simulate..."), tr("Simulate current model"), QKeySequence(tr("Alt+S")), SLOT(simulate()));
loadbackupAct = addAct("open.png", tr("Load Backup..."), tr("Load backup from file"), SLOT(loadBackup())); loadbackupAct = addAct("open.png", tr("Load Backup..."), tr("Load backup from file"), SLOT(loadBackup()));
logsAct = addAct("logs.png", tr("View Log File..."), tr("Open and view log file"), SLOT(logFile())); logsAct = addAct("logs.png", tr("View Log File..."), tr("Open and view log file"), SLOT(logFile()));
appPrefsAct = addAct("apppreferences.png",tr("Settings..."), tr("Edit Settings"), SLOT(appPrefs())); appPrefsAct = addAct("apppreferences.png",tr("Settings..."), tr("Edit Settings"), SLOT(appPrefs()));

7
companion/src/mainwindow.h
View file

@ -159,9 +159,10 @@ class MainWindow : public QMainWindow
private: private:
void createActions(); void createActions();
QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *, QObject *slotObj=NULL); QAction * addAct(const QString &, const QString &, const QString &, enum QKeySequence::StandardKey, const char *, QObject *slotObj=NULL);
QAction * addAct(QActionGroup *, QString, QString, const char *); QAction * addAct(const QString &, const QString &, const QString &, const QKeySequence &, const char *, QObject *slotObj=NULL);
QAction * addAct(QString, QString, QString, const char *); QAction * addAct(QActionGroup *, const QString &, const QString &, const char *);
QAction * addAct(const QString &, const QString &, const QString &, const char *);
void createMenus(); void createMenus();
void createToolBars(); void createToolBars();