Merge branch 'scenario-dev-pa' into scenarios

src/View/ui/CompareScenarios.ui

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>488</width>
+    <height>117</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="locale">
+   <locale language="English" country="Europe"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QComboBox" name="comboBoxSolver1"/>
+       </item>
+       <item>
+        <widget class="QComboBox" name="comboBoxSolver2"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QComboBox" name="comboBoxScenario1"/>
+       </item>
+       <item>
+        <widget class="QComboBox" name="comboBoxScenario2"/>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_cancel">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_ok">
+       <property name="text">
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/View/ui/MainWindow.ui

@@ -160,9 +160,9 @@
      <string>&amp;Results</string>
     </property>
     <addaction name="action_menu_results_last"/>
-    <addaction name="action_open_results_from_file"/>
-    <addaction name="action_compare_results"/>
-    <addaction name="action_open_results_adists"/>
+    <addaction name="action_menu_open_results_from_file"/>
+    <addaction name="action_menu_compare_scenarios_results"/>
+    <addaction name="action_menu_open_results_adists"/>
    </widget>
    <widget class="QMenu" name="menu_help">
     <property name="title">
@@ -726,7 +726,7 @@
     <string>Edit hydraulic structures</string>
    </property>
   </action>
-  <action name="action_open_results_from_file">
+  <action name="action_menu_open_results_from_file">
    <property name="enabled">
     <bool>false</bool>
    </property>
@@ -787,12 +787,15 @@
     <string>DIF</string>
    </property>
   </action>
-  <action name="action_compare_results">
+  <action name="action_menu_compare_results">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>Compare results</string>
    </property>
   </action>
-  <action name="action_open_results_adists">
+  <action name="action_menu_open_results_adists">
    <property name="enabled">
     <bool>false</bool>
    </property>
@@ -800,6 +803,14 @@
     <string>Open results AdisTS</string>
    </property>
   </action>
+  <action name="action_menu_compare_scenarios_results">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Compare results</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections>