Merge pull request #43 from YosysHQ/common_main

Common main and project

2 files changed, 8 insertions, 5 deletions

diff --git a/gui/ecp5/mainwindow.cc b/gui/ecp5/mainwindow.cc
index efaad364..e5a5f1ba 100644
--- a/gui/ecp5/mainwindow.cc
+++ b/gui/ecp5/mainwindow.cc
@@ -29,7 +29,8 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 

 NEXTPNR_NAMESPACE_BEGIN

 

-MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent) : BaseMainWindow(std::move(context), args, parent)

+MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent)

+        : BaseMainWindow(std::move(context), args, parent)

 {

     initMainResource();

 

@@ -50,7 +51,8 @@ void MainWindow::newContext(Context *ctx)
     setWindowTitle(title.c_str());

 }

 

-void MainWindow::createMenu() {

+void MainWindow::createMenu()

+{

     // Add arch specific actions

     actionLoadBase = new QAction("Open Base Config", this);

     actionLoadBase->setIcon(QIcon(":/icons/resources/open_base.png"));

@@ -71,7 +73,7 @@ void MainWindow::createMenu() {
 

     menuDesign->addSeparator();

     menuDesign->addAction(actionLoadBase);

-    menuDesign->addAction(actionSaveConfig);    

+    menuDesign->addAction(actionSaveConfig);

 }

 

 static const ChipInfoPOD *get_chip_info(const RelPtr<ChipInfoPOD> *ptr) { return ptr->get(); }

@@ -96,8 +98,8 @@ static QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip)
     return packages;

 }

 

-

-void MainWindow::new_proj() {

+void MainWindow::new_proj()

+{

     QMap<QString, int> arch;

     arch.insert("Lattice ECP5 25K", ArchArgs::LFE5U_25F);

     arch.insert("Lattice ECP5 45K", ArchArgs::LFE5U_45F);

diff --git a/gui/ecp5/mainwindow.h b/gui/ecp5/mainwindow.h
index d1d5a5a2..9460913c 100644
--- a/gui/ecp5/mainwindow.h
+++ b/gui/ecp5/mainwindow.h
@@ -47,6 +47,7 @@ class MainWindow : public BaseMainWindow
     void newContext(Context *ctx);

     void open_base();

     void save_config();

+

   private:

     QAction *actionLoadBase;

     QAction *actionSaveConfig;