From 9510c444c93fdb8923d77651562fb698e59dea5f Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 5 Aug 2018 18:02:33 +0200
Subject: Disable menu options on json load

---
 gui/basewindow.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gui/basewindow.h')

diff --git a/gui/basewindow.h b/gui/basewindow.h
index 341cc8e2..67f39ac2 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -48,12 +48,12 @@ 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 onPackFinished(){};
-- 
cgit v1.2.3


From ecc21caa77b09075a97d131890019f6b97281928 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 8 Aug 2018 18:14:22 +0200
Subject: move load/save proj to base

---
 gui/basewindow.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gui/basewindow.h')

diff --git a/gui/basewindow.h b/gui/basewindow.h
index 67f39ac2..ef3e252c 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -56,6 +56,7 @@ class BaseMainWindow : public QMainWindow
 
     virtual void onDisableActions(){};
     virtual void onJsonLoaded(){};
+    virtual void onProjectLoaded(){};
     virtual void onPackFinished(){};
     virtual void onBudgetFinished(){};
     virtual void onPlaceFinished(){};
@@ -66,8 +67,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 +95,7 @@ class BaseMainWindow : public QMainWindow
     TaskManager *task;
     bool timing_driven;
     std::string currentJson;
+    std::string currentProj;
 
     // main widgets
     QTabWidget *tabWidget;
-- 
cgit v1.2.3


From fc5cee6fb896bc4d7a8b79dcde789e03c787bd89 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 8 Aug 2018 18:17:34 +0200
Subject: clangformat

---
 gui/basewindow.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gui/basewindow.h')

diff --git a/gui/basewindow.h b/gui/basewindow.h
index ef3e252c..6e8f8587 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -49,6 +49,7 @@ class BaseMainWindow : public QMainWindow
     virtual ~BaseMainWindow();
     Context *getContext() { return ctx.get(); }
     void updateJsonLoaded();
+
   protected:
     void createMenusAndBars();
     void disableActions();
-- 
cgit v1.2.3