From 9bb489936078980e98fc873845b2ca64ddb490fb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 27 Jun 2018 11:12:05 +0200 Subject: [PATCH] disable new and open while tasks are running --- gui/basewindow.cc | 4 ++-- gui/basewindow.h | 2 ++ gui/ice40/mainwindow.cc | 9 +++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gui/basewindow.cc b/gui/basewindow.cc index dd456e07..69f4f622 100644 --- a/gui/basewindow.cc +++ b/gui/basewindow.cc @@ -95,7 +95,7 @@ void BaseMainWindow::writeInfo(std::string text) { info->info(text); } void BaseMainWindow::createMenusAndBars() { - QAction *actionNew = new QAction("New", this); + actionNew = new QAction("New", this); QIcon iconNew; iconNew.addFile(QStringLiteral(":/icons/resources/new.png")); actionNew->setIcon(iconNew); @@ -103,7 +103,7 @@ void BaseMainWindow::createMenusAndBars() actionNew->setStatusTip("New project file"); connect(actionNew, SIGNAL(triggered()), this, SLOT(new_proj())); - QAction *actionOpen = new QAction("Open", this); + actionOpen = new QAction("Open", this); QIcon iconOpen; iconOpen.addFile(QStringLiteral(":/icons/resources/open.png")); actionOpen->setIcon(iconOpen); diff --git a/gui/basewindow.h b/gui/basewindow.h index 601f6acb..6180e795 100644 --- a/gui/basewindow.h +++ b/gui/basewindow.h @@ -65,6 +65,8 @@ class BaseMainWindow : public QMainWindow QMenuBar *menuBar; QToolBar *mainToolBar; QStatusBar *statusBar; + QAction *actionNew; + QAction *actionOpen; }; NEXTPNR_NAMESPACE_END diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 32074adc..2563a767 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -260,6 +260,9 @@ void MainWindow::disableActions() actionPlay->setEnabled(false); actionPause->setEnabled(false); actionStop->setEnabled(false); + + actionNew->setEnabled(true); + actionOpen->setEnabled(true); } void MainWindow::loadfile_finished(bool status) @@ -349,6 +352,9 @@ void MainWindow::taskStarted() disableActions(); actionPause->setEnabled(true); actionStop->setEnabled(true); + + actionNew->setEnabled(false); + actionOpen->setEnabled(false); } void MainWindow::taskPaused() @@ -356,6 +362,9 @@ void MainWindow::taskPaused() disableActions(); actionPlay->setEnabled(true); actionStop->setEnabled(true); + + actionNew->setEnabled(false); + actionOpen->setEnabled(false); } void MainWindow::budget()