Merge branch 'release/2.0.9'

Author: guidotack

MiniZincIDE/CHANGES

@@ -1,4 +1,9 @@
-?
+2015-12-07
+  v2.0.9
+  - Remove (unimplemented) menu item for adding files to a project.
+  - Fix version number comparison to work for multi-digit minor and patch
+    versions.
+2015-10-19
   v2.0.8
   - Only disable the run and compile actions when a solving process is currently
     running (keep editor and rest of the user interface enabled).

MiniZincIDE/MiniZincIDE.pro

@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 2.0.8
+VERSION = 2.0.9
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {

MiniZincIDE/mainwindow.cpp

@@ -519,7 +519,39 @@ void
 IDE::versionCheckFinished(void) {
     if (versionCheckReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()==200) {
         QString currentVersion = versionCheckReply->readAll();
-        if (currentVersion > applicationVersion()) {
+
+        QRegExp versionRegExp("([1-9][0-9]+)\\.([0-9]+)\\.([0-9]+)");
+
+        int curVersionMajor = 0;
+        int curVersionMinor = 0;
+        int curVersionPatch = 0;
+        bool ok = true;
+        if (versionRegExp.indexIn(currentVersion) != -1) {
+            curVersionMajor = versionRegExp.cap(1).toInt(&ok);
+            if (ok)
+                curVersionMinor = versionRegExp.cap(2).toInt(&ok);
+            if (ok)
+                curVersionPatch = versionRegExp.cap(3).toInt(&ok);
+        }
+
+        int appVersionMajor = 0;
+        int appVersionMinor = 0;
+        int appVersionPatch = 0;
+        if (ok && versionRegExp.indexIn(applicationVersion()) != -1) {
+            appVersionMajor = versionRegExp.cap(1).toInt(&ok);
+            if (ok)
+                appVersionMinor = versionRegExp.cap(2).toInt(&ok);
+            if (ok)
+                appVersionPatch = versionRegExp.cap(3).toInt(&ok);
+        }
+
+        bool needUpdate = ok && (curVersionMajor > appVersionMajor ||
+                                 (curVersionMajor==appVersionMajor &&
+                                  (curVersionMinor > appVersionMinor ||
+                                   (curVersionMinor==appVersionMinor &&
+                                    curVersionPatch > appVersionPatch))));
+
+        if (needUpdate) {
             int button = QMessageBox::information(NULL,"Update available",
                                      "Version "+currentVersion+" of the MiniZinc IDE is now available. "
                                      "You are currently using version "+applicationVersion()+

MiniZincIDE/mainwindow.ui

@@ -591,7 +591,6 @@
     <addaction name="actionNewModel_file"/>
     <addaction name="actionNewData_file"/>
     <addaction name="actionOpen"/>
-    <addaction name="actionAdd_to_project"/>
     <addaction name="menuRecent_Files"/>
     <addaction name="menuRecent_Projects"/>
     <addaction name="separator"/>
@@ -1268,11 +1267,6 @@
     <bool>false</bool>
    </property>
   </action>
-  <action name="actionAdd_to_project">
-   <property name="text">
-    <string>Add files to project...</string>
-   </property>
-  </action>
   <action name="actionSubmit_to_Coursera">
    <property name="icon">
     <iconset resource="minizincide.qrc">