From 9f86138b86efebb816a2289bf84b96d688615f41 Mon Sep 17 00:00:00 2001
From: lucaszhao19
Date: Mon, 23 Dec 2019 13:25:49 +0530
Subject: Feature implementation - saving and partial loading

---
 main.ui | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'main.ui')

diff --git a/main.ui b/main.ui
index 378d376..3f17384 100644
--- a/main.ui
+++ b/main.ui
@@ -148,7 +148,7 @@
      <x>0</x>
      <y>0</y>
      <width>1068</width>
-     <height>26</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -156,13 +156,13 @@
      <string>File</string>
     </property>
     <addaction name="actionNew_Flowsheet"/>
+    <addaction name="actionSave_2"/>
+    <addaction name="actionOpen"/>
    </widget>
    <widget class="QMenu" name="menuEdit">
     <property name="title">
      <string>Edit</string>
     </property>
-    <addaction name="actionUndo_2"/>
-    <addaction name="actionRedo"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -256,8 +256,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>222</width>
-          <height>978</height>
+          <width>221</width>
+          <height>956</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1184,19 +1184,14 @@
     <string>save</string>
    </property>
   </action>
-  <action name="actionUndo">
+  <action name="actionSave_2">
    <property name="text">
-    <string>Undo</string>
+    <string>Save</string>
    </property>
   </action>
-  <action name="actionUndo_2">
+  <action name="actionOpen">
    <property name="text">
-    <string>Undo</string>
-   </property>
-  </action>
-  <action name="actionRedo">
-   <property name="text">
-    <string>Redo</string>
+    <string>Open</string>
    </property>
   </action>
  </widget>
-- 
cgit 


From 5cc855cd9a145012382031a5a1e731e297632107 Mon Sep 17 00:00:00 2001
From: SaurabhAgarwala
Date: Mon, 23 Dec 2019 17:36:31 +0530
Subject: Terminate function UI created and flowsheet made attribute of class

---
 main.ui | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'main.ui')

diff --git a/main.ui b/main.ui
index 3f17384..1295680 100644
--- a/main.ui
+++ b/main.ui
@@ -148,7 +148,7 @@
      <x>0</x>
      <y>0</y>
      <width>1068</width>
-     <height>21</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -178,6 +178,8 @@
     </property>
     <addaction name="actionEquation_oriented"/>
     <addaction name="actionSequential_mode"/>
+    <addaction name="separator"/>
+    <addaction name="actionTerminate"/>
    </widget>
    <widget class="QMenu" name="menuComponds">
     <property name="title">
@@ -256,8 +258,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>221</width>
-          <height>956</height>
+          <width>222</width>
+          <height>978</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1194,6 +1196,11 @@
     <string>Open</string>
    </property>
   </action>
+  <action name="actionTerminate">
+   <property name="text">
+    <string>Terminate</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
-- 
cgit 


From 6eb53b150dd4fde58996c826960e0c8adf2c5b00 Mon Sep 17 00:00:00 2001
From: SaurabhAgarwala
Date: Tue, 24 Dec 2019 18:51:46 +0530
Subject: Shortcut keys added, typo corrected

---
 main.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'main.ui')

diff --git a/main.ui b/main.ui
index 1295680..7bff94e 100644
--- a/main.ui
+++ b/main.ui
@@ -185,7 +185,7 @@
     <property name="title">
      <string>Compounds</string>
     </property>
-    <addaction name="actionSelect_compouns"/>
+    <addaction name="actionSelect_compounds"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -256,7 +256,7 @@
        <widget class="QWidget" name="scrollAreaWidgetContents">
         <property name="geometry">
          <rect>
-          <x>0</x>
+          <x>-5</x>
           <y>0</y>
           <width>222</width>
           <height>978</height>
@@ -1111,7 +1111,7 @@
    <addaction name="actionEquation_oriented"/>
    <addaction name="actionSequential_mode"/>
    <addaction name="separator"/>
-   <addaction name="actionSelect_compouns"/>
+   <addaction name="actionSelect_compounds"/>
   </widget>
   <action name="actionZoomIn">
    <property name="icon">
@@ -1158,7 +1158,7 @@
     <string>Sequential mode</string>
    </property>
   </action>
-  <action name="actionSelect_compouns">
+  <action name="actionSelect_compounds">
    <property name="icon">
     <iconset>
      <normaloff>icons/compoundSelector.png</normaloff>icons/compoundSelector.png</iconset>
-- 
cgit 


From 89abe5355295af8a6b5108086662bfcbdaa26708 Mon Sep 17 00:00:00 2001
From: Ayush Agrawal
Date: Wed, 1 Jan 2020 20:15:46 +0530
Subject: Added Binary Phase Envelope

---
 main.ui | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'main.ui')

diff --git a/main.ui b/main.ui
index 7bff94e..da7c162 100644
--- a/main.ui
+++ b/main.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1068</width>
-    <height>810</height>
+    <height>803</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -148,7 +148,7 @@
      <x>0</x>
      <y>0</y>
      <width>1068</width>
-     <height>26</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -178,8 +178,6 @@
     </property>
     <addaction name="actionEquation_oriented"/>
     <addaction name="actionSequential_mode"/>
-    <addaction name="separator"/>
-    <addaction name="actionTerminate"/>
    </widget>
    <widget class="QMenu" name="menuComponds">
     <property name="title">
@@ -193,12 +191,19 @@
     </property>
     <addaction name="actionHelp"/>
    </widget>
+   <widget class="QMenu" name="menuUtility">
+    <property name="title">
+     <string>Utility</string>
+    </property>
+    <addaction name="actionBinary_Phase_Envelope"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
    <addaction name="menuView"/>
    <addaction name="menuSimulation"/>
    <addaction name="menuComponds"/>
    <addaction name="menuHelp"/>
+   <addaction name="menuUtility"/>
   </widget>
   <widget class="QDockWidget" name="dockWidget">
    <property name="sizePolicy">
@@ -256,10 +261,10 @@
        <widget class="QWidget" name="scrollAreaWidgetContents">
         <property name="geometry">
          <rect>
-          <x>-5</x>
+          <x>0</x>
           <y>0</y>
-          <width>222</width>
-          <height>978</height>
+          <width>238</width>
+          <height>878</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1196,9 +1201,9 @@
     <string>Open</string>
    </property>
   </action>
-  <action name="actionTerminate">
+  <action name="actionBinary_Phase_Envelope">
    <property name="text">
-    <string>Terminate</string>
+    <string>Binary Phase Envelope</string>
    </property>
   </action>
  </widget>
-- 
cgit 


From 31c57365b01c01a4d9745a2df2a06286858d8774 Mon Sep 17 00:00:00 2001
From: SaurabhAgarwala
Date: Thu, 2 Jan 2020 12:25:58 +0530
Subject: Terminate action bug eliminated

---
 main.ui | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'main.ui')

diff --git a/main.ui b/main.ui
index da7c162..beb8c98 100644
--- a/main.ui
+++ b/main.ui
@@ -148,7 +148,7 @@
      <x>0</x>
      <y>0</y>
      <width>1068</width>
-     <height>22</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -178,6 +178,8 @@
     </property>
     <addaction name="actionEquation_oriented"/>
     <addaction name="actionSequential_mode"/>
+    <addaction name="separator"/>
+    <addaction name="actionTerminate"/>
    </widget>
    <widget class="QMenu" name="menuComponds">
     <property name="title">
@@ -263,8 +265,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>238</width>
-          <height>878</height>
+          <width>222</width>
+          <height>978</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1206,6 +1208,11 @@
     <string>Binary Phase Envelope</string>
    </property>
   </action>
+  <action name="actionTerminate">
+   <property name="text">
+    <string>Terminate</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
-- 
cgit 


From 8dfb7d836e438035be2284e49554dac36d0af7bf Mon Sep 17 00:00:00 2001
From: SaurabhAgarwala
Date: Fri, 3 Jan 2020 15:54:24 +0530
Subject: Made GUI compatible with the new Simulator, abbreviations updated to
 new convention and few bugs eliminated with code clean up at places

---
 main.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'main.ui')

diff --git a/main.ui b/main.ui
index beb8c98..0a839ff 100644
--- a/main.ui
+++ b/main.ui
@@ -345,11 +345,11 @@
             <string notr="true">Text-align:left;</string>
            </property>
            <property name="text">
-            <string>MatStm</string>
+            <string>MaterialStream</string>
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>icons/MatStm.png</normaloff>icons/MatStm.png</iconset>
+             <normaloff>icons/MaterialStream.png</normaloff>icons/MaterialStream.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -906,7 +906,7 @@
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>icons/AdiaComp.png</normaloff>icons/AdiaComp.png</iconset>
+             <normaloff>icons/AdiabaticCompressor.png</normaloff>icons/AdiabaticCompressor.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -953,7 +953,7 @@
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>icons/AdiaExp.png</normaloff>icons/AdiaExp.png</iconset>
+             <normaloff>icons/AdiabaticExpander.png</normaloff>icons/AdiabaticExpander.png</iconset>
            </property>
            <property name="iconSize">
             <size>
-- 
cgit 


From 190966e010e321e4df56d40104ec80467a870e53 Mon Sep 17 00:00:00 2001
From: Sann Yay Aye
Date: Thu, 30 Jan 2020 12:57:51 +0530
Subject: undo&redo_implementation

---
 main.ui | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'main.ui')

diff --git a/main.ui b/main.ui
index 0a839ff..fd7045a 100644
--- a/main.ui
+++ b/main.ui
@@ -148,7 +148,7 @@
      <x>0</x>
      <y>0</y>
      <width>1068</width>
-     <height>26</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -163,6 +163,8 @@
     <property name="title">
      <string>Edit</string>
     </property>
+    <addaction name="actionUndo"/>
+    <addaction name="actionRedo"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -265,8 +267,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>222</width>
-          <height>978</height>
+          <width>221</width>
+          <height>956</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1213,6 +1215,16 @@
     <string>Terminate</string>
    </property>
   </action>
+  <action name="actionUndo">
+   <property name="text">
+    <string>Undo</string>
+   </property>
+  </action>
+  <action name="actionRedo">
+   <property name="text">
+    <string>Redo</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
-- 
cgit