Merge branch 'release/0.9.9'

MiniZinc · Jul 30, 2015 · ca42d60 · ca42d60
2 parents 927705d + 846695f
commit ca42d60
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/MiniZincIDE/CHANGES b/MiniZincIDE/CHANGES
@@ -1,3 +1,9 @@
+2015-07-30
+  v0.9.9
+  - Fix for clicking on error messages on Windows
+  - Fix syntax highlighting, used to turn itself off when saving file
+    under a different name
+  - Set default font more consistently on different platforms
 2015-07-01
   v0.9.8
   - Add "dark mode" to change text colours

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.8
+VERSION = 0.9.9
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {

diff --git a/MiniZincIDE/codeeditor.cpp b/MiniZincIDE/codeeditor.cpp
@@ -87,7 +87,7 @@ void CodeEditor::setDocument(QTextDocument *document)
     QPlainTextEdit::setDocument(document);
     if (document) {
         QFont f= font();
-        highlighter = new Highlighter(f,document);
+        highlighter = new Highlighter(f,darkMode,document);
         connect(document, SIGNAL(modificationChanged(bool)), this, SLOT(docChanged(bool)));
     }
 }

diff --git a/MiniZincIDE/mainwindow.cpp b/MiniZincIDE/mainwindow.cpp
@@ -212,8 +212,15 @@ IDE::IDE(int& argc, char* argv[]) : QApplication(argc,argv) {
         QSettings settings;
         settings.beginGroup("MainWindow");
 
-        QFont defaultFont("Courier New");
-        defaultFont.setStyleHint(QFont::Monospace);
+        QFont defaultFont;
+        defaultFont.setFamily("Menlo");
+        if (!defaultFont.exactMatch()) {
+            defaultFont.setFamily("Consolas");
+        }
+        if (!defaultFont.exactMatch()) {
+            defaultFont.setFamily("Courier New");
+        }
+        defaultFont.setStyleHint(QFont::TypeWriter);
         defaultFont.setPointSize(13);
         QFont editorFont = settings.value("editorFont", defaultFont).value<QFont>();
         bool darkMode = settings.value("darkMode", false).value<bool>();
@@ -640,8 +647,15 @@ void MainWindow::init(const QString& projectFile)
     QSettings settings;
     settings.beginGroup("MainWindow");
 
-    QFont defaultFont("Courier New");
-    defaultFont.setStyleHint(QFont::Monospace);
+    QFont defaultFont;
+    defaultFont.setFamily("Menlo");
+    if (!defaultFont.exactMatch()) {
+        defaultFont.setFamily("Consolas");
+    }
+    if (!defaultFont.exactMatch()) {
+        defaultFont.setFamily("Courier New");
+    }
+    defaultFont.setStyleHint(QFont::TypeWriter);
     defaultFont.setPointSize(13);
     editorFont = settings.value("editorFont", defaultFont).value<QFont>();
     darkMode = settings.value("darkMode", false).value<bool>();
@@ -1189,10 +1203,10 @@ void MainWindow::tabChange(int tab) {
             }
             if (curEditor->filepath.isEmpty()) {
                 setWindowFilePath(curEditor->filename);
-                setWindowTitle(curEditor->filename+p);
+                setWindowTitle(curEditor->filename+p+"[*]");
             } else {
                 setWindowFilePath(curEditor->filepath);
-                setWindowTitle(curEditor->filename+p);
+                setWindowTitle(curEditor->filename+p+"[*]");
             }
             ui->actionSave->setEnabled(true);
             ui->actionSave_as->setEnabled(true);
@@ -1247,7 +1261,7 @@ void MainWindow::tabChange(int tab) {
                 QFileInfo fi(projectPath);
                 p = "Project: "+fi.baseName();
             }
-            setWindowTitle(p);
+            setWindowTitle(p+"[*]");
         }
     }
 }
@@ -2144,15 +2158,21 @@ void MainWindow::on_actionAbout_MiniZinc_IDE_triggered()
     AboutDialog(IDE::instance()->applicationVersion()).exec();
 }
 
-void MainWindow::errorClicked(const QUrl & url)
+void MainWindow::errorClicked(const QUrl & anUrl)
 {
+    QUrl url = anUrl;
+    QString query = url.query();
+    url.setQuery("");
+    url.setScheme("file");
+    QFileInfo urlinfo(url.toLocalFile());
     IDE::instance()->stats.errorsClicked++;
     for (int i=0; i<ui->tabWidget->count(); i++) {
         if (ui->tabWidget->widget(i) != ui->configuration) {
             CodeEditor* ce = static_cast<CodeEditor*>(ui->tabWidget->widget(i));
-            if (ce->filepath == url.path()) {
+            QFileInfo ceinfo(ce->filepath);
+            if (ceinfo.canonicalFilePath() == urlinfo.canonicalFilePath()) {
                 QRegExp re_line("line=([0-9]+)");
-                if (re_line.indexIn(url.query()) != -1) {
+                if (re_line.indexIn(query) != -1) {
                     bool ok;
                     int line = re_line.cap(1).toInt(&ok);
                     if (ok) {