Merge branch 'release/2.0.14'

MiniZinc · Jul 31, 2016 · f452e84 · f452e84
2 parents 3e1cc36 + 7acc614
commit f452e84
Show file tree

Hide file tree

Showing 19 changed files with 369 additions and 282 deletions.
diff --git a/MiniZincIDE/MiniZincIDE.pro b/MiniZincIDE/MiniZincIDE.pro
@@ -4,14 +4,22 @@
 #
 #-------------------------------------------------
 
-QT       += core gui webkitwidgets
+QT       += core gui widgets
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 4): {
+  greaterThan(QT_MINOR_VERSION, 5): {
+    QT += webenginewidgets
+    DEFINES += MINIZINC_IDE_HAVE_WEBENGINE
+  }
+  !greaterThan(QT_MINOR_VERSION, 5): {
+    QT += webkitwidgets
+  }
+}
 
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 2.0.13
+VERSION = 2.0.14
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {
@@ -86,3 +94,6 @@ FORMS    += \
 
 RESOURCES += \
     minizincide.qrc
+
+target.path = /bin
+INSTALLS += target
diff --git a/MiniZincIDE/aboutdialog.ui b/MiniZincIDE/aboutdialog.ui
@@ -51,8 +51,8 @@
     <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.Helvetica Neue DeskInterface'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:30px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.minizinc.org&quot;&gt;&lt;img src=&quot;:/images/mznlogo.png&quot; width=&quot;128&quot; height=&quot;108&quot; /&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'.Lucida Grande UI';&quot;&gt; &lt;/span&gt;&lt;/p&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:30px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.minizinc.org&quot;&gt;&lt;img src=&quot;:/images/mznicon.png&quot; width=&quot;108&quot; height=&quot;108&quot; /&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'.Lucida Grande UI';&quot;&gt; &lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'.Lucida Grande UI'; font-size:large; font-weight:600;&quot;&gt;The MiniZinc IDE&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'.Lucida Grande UI';&quot;&gt;Version $VERSION&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Lucida Grande UI';&quot;&gt;&lt;br /&gt;&lt;/p&gt;

diff --git a/MiniZincIDE/codeeditor.cpp b/MiniZincIDE/codeeditor.cpp
@@ -129,6 +129,15 @@ void CodeEditor::keyPressEvent(QKeyEvent *e)
         e->accept();
         QTextCursor cursor(textCursor());
         cursor.insertText("  ");
+    } else if (e->key() == Qt::Key_Return) {
+        e->accept();
+        QTextCursor cursor(textCursor());
+        QString curLine = cursor.block().text();
+        QRegExp leadingWhitespace("^(\\s*)");
+        cursor.insertText("\n");
+        if (leadingWhitespace.indexIn(curLine) != -1) {
+            cursor.insertText(leadingWhitespace.cap(1));
+        }
     } else {
         QPlainTextEdit::keyPressEvent(e);
     }