Merge branch 'master' of github.com:YosysHQ/nextpnr into constids

1 files changed, 8 insertions, 4 deletions

diff --git a/gui/basewindow.h b/gui/basewindow.h
index 341cc8e2..6e8f8587 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -48,14 +48,16 @@ class BaseMainWindow : public QMainWindow
     explicit BaseMainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent = 0);

     virtual ~BaseMainWindow();

     Context *getContext() { return ctx.get(); }

-

-    void load_json(std::string filename);

+    void updateJsonLoaded();

 

   protected:

     void createMenusAndBars();

     void disableActions();

+    void load_json(std::string filename);

+

     virtual void onDisableActions(){};

     virtual void onJsonLoaded(){};

+    virtual void onProjectLoaded(){};

     virtual void onPackFinished(){};

     virtual void onBudgetFinished(){};

     virtual void onPlaceFinished(){};

@@ -66,8 +68,9 @@ class BaseMainWindow : public QMainWindow
     void closeTab(int index);

 

     virtual void new_proj() = 0;

-    virtual void open_proj() = 0;

-    virtual bool save_proj() = 0;

+

+    void open_proj();

+    void save_proj();

 

     void open_json();

     void budget();

@@ -93,6 +96,7 @@ class BaseMainWindow : public QMainWindow
     TaskManager *task;

     bool timing_driven;

     std::string currentJson;

+    std::string currentProj;

 

     // main widgets

     QTabWidget *tabWidget;