Merge branch 'release/2.0.7'

MiniZinc · Oct 6, 2015 · 01d4917 · 01d4917
2 parents a776fcc + 89220fd
commit 01d4917
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/MiniZincIDE/CHANGES b/MiniZincIDE/CHANGES
@@ -1,5 +1,6 @@
-2015-09-29
-  v0.9.10
+2015-10-06
+  v2.0.7
+  - Changed version number scheme to coincide with MiniZinc version.
   - Disable all editing while the solver is running (avoids race conditions).
   - Fix behaviour of stop button: avoid race condition when pressing it twice,
     and signal that process has stopped when the initial SIGINT was successful.

diff --git a/MiniZincIDE/MiniZincIDE.pro b/MiniZincIDE/MiniZincIDE.pro
@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 0.9.10
+VERSION = 2.0.7
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {

diff --git a/MiniZincIDE/mainwindow.cpp b/MiniZincIDE/mainwindow.cpp
@@ -1330,10 +1330,13 @@ QStringList MainWindow::parseConf(bool compileOnly, bool useDataFile)
     if (!compileOnly && project.defaultBehaviour()) {
         QFile fznFile(currentFznTarget);
         if (fznFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            fznFile.seek(fznFile.size()-strlen("satisfy;\n"));
-            QString line = fznFile.readLine();
-            if (!line.contains("satisfy;"))
-                ret << "-a";
+            int seekSize = strlen("satisfy;\n\n");
+            if (fznFile.size() >= seekSize) {
+                fznFile.seek(fznFile.size()-seekSize);
+                QString line = fznFile.readLine();
+                if (!line.contains("satisfy;"))
+                    ret << "-a";
+            }
         }
     } else {
         if (!compileOnly && project.printAll())

diff --git a/MiniZincIDE/mainwindow.ui b/MiniZincIDE/mainwindow.ui
@@ -90,8 +90,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>599</width>
-             <height>772</height>
+             <width>593</width>
+             <height>774</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -270,7 +270,7 @@
                        </size>
                       </property>
                       <property name="text">
-                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Optimisation problems: print all solutions&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Optimization problems: print all solutions&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                       </property>
                       <property name="textFormat">
                        <enum>Qt::RichText</enum>
@@ -300,7 +300,7 @@
                  <item>
                   <widget class="QRadioButton" name="userBehaviourButton">
                    <property name="text">
-                    <string>User-defined behaviour</string>
+                    <string>User-defined behavior</string>
                    </property>
                    <attribute name="buttonGroup">
                     <string notr="true">buttonGroup</string>
@@ -348,7 +348,7 @@
                       <item>
                        <widget class="QLabel" name="label_6">
                         <property name="text">
-                         <string>(not relevant for optimisation problems)</string>
+                         <string>(not relevant for optimization problems)</string>
                         </property>
                        </widget>
                       </item>