diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2019-06-14 10:07:59 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-06-14 10:07:59 +0200 |
| commit | 053bd48bef73668e5c7bdf84e826a996a519c5bb (patch) | |
| tree | e5fbe9699c76c2e27883cc8105817fccdab35504 | |
| parent | 36ccc22fc93eddd9b6ed867782668b0057ec67e2 (diff) | |
| download | nextpnr-053bd48bef73668e5c7bdf84e826a996a519c5bb.tar.gz nextpnr-053bd48bef73668e5c7bdf84e826a996a519c5bb.tar.bz2 nextpnr-053bd48bef73668e5c7bdf84e826a996a519c5bb.zip | |
Cleanup
| -rw-r--r-- | gui/basewindow.cc | 1 | ||||
| -rw-r--r-- | gui/basewindow.h | 1 | ||||
| -rw-r--r-- | gui/ecp5/mainwindow.cc | 6 | ||||
| -rw-r--r-- | gui/ecp5/mainwindow.h | 1 | ||||
| -rw-r--r-- | gui/generic/mainwindow.cc | 1 | ||||
| -rw-r--r-- | gui/ice40/mainwindow.cc | 6 | ||||
| -rw-r--r-- | gui/ice40/mainwindow.h | 1 |
7 files changed, 1 insertions, 16 deletions
diff --git a/gui/basewindow.cc b/gui/basewindow.cc index afc80694..63e30f27 100644 --- a/gui/basewindow.cc +++ b/gui/basewindow.cc @@ -398,7 +398,6 @@ void BaseMainWindow::updateLoaded() disableActions();
actionPack->setEnabled(true);
onJsonLoaded();
- onProjectLoaded();
}
void BaseMainWindow::execute_python()
diff --git a/gui/basewindow.h b/gui/basewindow.h index e165851f..91389978 100644 --- a/gui/basewindow.h +++ b/gui/basewindow.h @@ -58,7 +58,6 @@ class BaseMainWindow : public QMainWindow virtual void onDisableActions(){};
virtual void onJsonLoaded(){};
- virtual void onProjectLoaded(){};
virtual void onPackFinished(){};
virtual void onBudgetFinished(){};
virtual void onPlaceFinished(){};
diff --git a/gui/ecp5/mainwindow.cc b/gui/ecp5/mainwindow.cc index c6c7bc97..a54ab8b5 100644 --- a/gui/ecp5/mainwindow.cc +++ b/gui/ecp5/mainwindow.cc @@ -192,10 +192,4 @@ void MainWindow::onJsonLoaded() { actionLoadLPF->setEnabled(true); } void MainWindow::onRouteFinished() { actionLoadBase->setEnabled(true); }
-void MainWindow::onProjectLoaded()
-{
- if (ctx->settings.find(ctx->id("input/lpf")) != ctx->settings.end())
- actionLoadLPF->setEnabled(false);
-}
-
NEXTPNR_NAMESPACE_END
diff --git a/gui/ecp5/mainwindow.h b/gui/ecp5/mainwindow.h index 721c6c0b..186a7974 100644 --- a/gui/ecp5/mainwindow.h +++ b/gui/ecp5/mainwindow.h @@ -40,7 +40,6 @@ class MainWindow : public BaseMainWindow void onDisableActions() override;
void onJsonLoaded() override;
void onRouteFinished() override;
- void onProjectLoaded() override;
protected Q_SLOTS:
void new_proj() override;
diff --git a/gui/generic/mainwindow.cc b/gui/generic/mainwindow.cc index 54d1f2c8..eefff39c 100644 --- a/gui/generic/mainwindow.cc +++ b/gui/generic/mainwindow.cc @@ -29,6 +29,7 @@ NEXTPNR_NAMESPACE_BEGIN MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent)
: BaseMainWindow(std::move(context), args, parent)
{
+ initMainResource();
QMessageBox::critical(0, "Error - FIXME", "No GUI support for nextpnr-generic");
std::exit(1);
}
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index f270b112..b766734f 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -189,10 +189,4 @@ void MainWindow::onDisableActions() void MainWindow::onJsonLoaded() { actionLoadPCF->setEnabled(true); }
void MainWindow::onRouteFinished() { actionSaveAsc->setEnabled(true); }
-void MainWindow::onProjectLoaded()
-{
- if (ctx->settings.find(ctx->id("input/pcf")) != ctx->settings.end())
- actionLoadPCF->setEnabled(false);
-}
-
NEXTPNR_NAMESPACE_END
diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h index 4a9a7d8e..de160174 100644 --- a/gui/ice40/mainwindow.h +++ b/gui/ice40/mainwindow.h @@ -41,7 +41,6 @@ class MainWindow : public BaseMainWindow void onDisableActions() override;
void onJsonLoaded() override;
void onRouteFinished() override;
- void onProjectLoaded() override;
protected Q_SLOTS:
void new_proj() override;
|