Merge branch 'hotfix/v0.11.1'

Author: cloose

CuteMarkEd.wxs

@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?define ManufacturerName="CuteMarkEd Project"?>
   <?define ProductName="CuteMarkEd"?>
-  <?define ProductVersion="0.11.0"?>
+  <?define ProductVersion="0.11.1"?>
   <Product Name="$(var.ProductName)" 
       Id="*" 
       UpgradeCode="335156FC-CB7F-4357-98D4-B5519E66402B"

README.md

@@ -8,15 +8,27 @@ A Qt-based, free and open source markdown editor with live HTML preview, math ex
 
 ### DOWNLOAD
 
-[Sources](https://github.com/cloose/CuteMarkEd/archive/v0.11.0.tar.gz)  
-[MS Windows (Installer)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.0.msi)  
-[MS Windows (ZIP file)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.0.zip)  
+[Sources](https://github.com/cloose/CuteMarkEd/archive/v0.11.1.tar.gz)  
+[MS Windows (Installer)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.1.msi)  
+[MS Windows (ZIP file)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.1.zip)  
 [OpenSUSE 13.1 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974)  
 [Fedora 20 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974)  
 [Fedora 21 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974)  
 
 ### NEWS
 
+#### Version 0.11.1
+
+Improvements:
+
+* `IMPROVED` Updated French translation
+
+Fixes:
+
+* `FIXED` Custom shortcuts not working (#224)
+* `FIXED` Disappearing spell checker highlighting (#228)
+* `FIXED` Wrong german quotes snippet (#229)
+
 #### Version 0.11.0
 
 Highlights:
@@ -51,26 +63,6 @@ Fixes:
 * `FIXED` Build with MSVC 2013 and MacOSX
 * `FIXED` Parallel build with e.g. make -j2
 
-#### Version 0.10.2
-
-New Features:
-
-* `NEW` Added Indonesian translation created by bedouin
-* `NEW` Added Danish translation created by mljjlm
-
-Improvements:
-
-* `IMPROVED` Updated Greek translation
-* `IMPROVED` Updated Chinese translation
-
-Fixes:
-
-* `FIXED` Copy & Paste problems on Windows (#161, #203)
-* `FIXED` Restore fullscreen mode after startup (#164)
-* `FIXED` Build on Fedora with both Qt4 and Qt5 installed (#165)
-* `FIXED` Replaced generic editor icon with own icon on Linux
-
-
 ### DEPENDENCIES
 
 * [Qt 5.2](http://qt-project.org) (LGPL v2.1)

app/aboutdialog.cpp

@@ -17,7 +17,7 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 
-static const QString COPYRIGHT = QStringLiteral("Copyright 2013-2014 Christian Loose");
+static const QString COPYRIGHT = QStringLiteral("Copyright 2013-2015 Christian Loose");
 static const QString HOMEPAGE = QStringLiteral("<a href=\"http://cloose.github.io/CuteMarkEd\">http://cloose.github.io/CuteMarkEd</a>");
 
 AboutDialog::AboutDialog(QWidget *parent) :

app/main.cpp

@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName("CuteMarkEd Project");
     app.setApplicationName("CuteMarkEd");
     app.setApplicationDisplayName("CuteMarkEd");
-    app.setApplicationVersion("0.11.0");
+    app.setApplicationVersion("0.11.1");
 
 #ifdef Q_OS_WIN
     QStringList fileTypes;

app/mainwindow.cpp

@@ -1139,23 +1139,27 @@ void MainWindow::setupHtmlSourceView()
 
 void MainWindow::setupCustomShortcuts()
 {
-    // file menu
-    foreach (QAction *action, ui->menuFile->actions()) {
-        setCustomShortcut(action);
-    }
-    // edit menu
-    foreach (QAction *action, ui->menuEdit->actions()) {
-        setCustomShortcut(action);
-    }
-    // view menu
-    foreach (QAction *action, ui->menuView->actions()) {
-        setCustomShortcut(action);
-    }
+    setCustomShortcut(ui->menuFile);
+    setCustomShortcut(ui->menuEdit);
+    setCustomShortcut(ui->menuView);
+
     foreach (QAction *action, ui->plainTextEdit->actions()) {
         setCustomShortcut(action);
     }
 }
 
+void MainWindow::setCustomShortcut(QMenu *menu)
+{
+    foreach (QAction *action, menu->actions()) {
+        if (action->menu()) {
+            // recurse into submenu
+            setCustomShortcut(action->menu());
+        } else {
+            setCustomShortcut(action);
+        }
+    }
+}
+
 void MainWindow::setCustomShortcut(QAction *action)
 {
     if (options->hasCustomShortcut(action->objectName())) {

app/mainwindow.h

@@ -136,6 +136,7 @@ private slots:
     void setupHtmlPreview();
     void setupHtmlSourceView();
     void setupCustomShortcuts();
+    void setCustomShortcut(QMenu *menu);
     void setCustomShortcut(QAction *action);
     void updateExtensionStatus();
     void syncWebViewToHtmlSource();

app/markdown-snippets.json

@@ -24,7 +24,7 @@
         {
             "trigger": "gq",
             "description": "German Quotes",
-            "snippet": "„”",
+            "snippet": "„“",
             "cursor": 7,
             "builtIn": true
         },

app/markdownhighlighter.cpp

@@ -87,16 +87,7 @@ void MarkdownHighlighter::highlightBlock(const QString &textBlock)
 
     // check spelling of passed text block
     if (spellingCheckEnabled) {
-        QStringList wordList = textBlock.split(QRegExp("\\W+"), QString::SkipEmptyParts);
-        int index = 0;
-        foreach (QString word, wordList) {
-           index = textBlock.indexOf(word, index);
-
-           if (!spellChecker->isCorrect(word)) {
-               setFormat(index, word.length(), spellFormat);
-           }
-           index += word.length();
-        }
+        checkSpelling(textBlock);
     }
 
     QString text = document()->toPlainText();
@@ -176,6 +167,20 @@ void MarkdownHighlighter::applyFormat(unsigned long pos, unsigned long end,
     }
 }
 
+void MarkdownHighlighter::checkSpelling(const QString &textBlock)
+{
+    QStringList wordList = textBlock.split(QRegExp("\\W+"), QString::SkipEmptyParts);
+    int index = 0;
+    foreach (QString word, wordList) {
+        index = textBlock.indexOf(word, index);
+
+        if (!spellChecker->isCorrect(word)) {
+            setFormat(index, word.length(), spellFormat);
+        }
+        index += word.length();
+    }
+}
+
 void MarkdownHighlighter::resultReady(pmh_element **elements, unsigned long base_offset)
 {
     if (!elements) {
@@ -184,7 +189,9 @@ void MarkdownHighlighter::resultReady(pmh_element **elements, unsigned long base
     }
 
     // clear any format before base_offset
-    applyFormat(0, base_offset - 1, QTextCharFormat(), false);
+    if (base_offset > 0) {
+        applyFormat(0, base_offset - 1, QTextCharFormat(), false);
+    }
 
     // apply highlight results
     for (int i = 0; i < highlightingStyles.size(); i++) {

app/markdownhighlighter.h

@@ -48,6 +48,7 @@ private slots:
 
 private:
     void applyFormat(unsigned long pos, unsigned long end, QTextCharFormat format, bool merge);
+    void checkSpelling(const QString &textBlock);
 
     HighlightWorkerThread *workerThread;
     QVector<PegMarkdownHighlight::HighlightingStyle> highlightingStyles;

app/optionsdialog.cpp

@@ -311,6 +311,13 @@ void OptionsDialog::readState()
     ui->portLineEdit->setText(QString::number(options->proxyPort()));
     ui->userNameLineEdit->setText(options->proxyUser());
     ui->passwordLineEdit->setText(options->proxyPassword());
+
+    // shortcut settings
+    for (int i = 0; i < ui->shortcutsTable->rowCount(); ++i) {
+        if (options->hasCustomShortcut(actions[i]->objectName())) {
+            ui->shortcutsTable->item(i, 1)->setData(Qt::EditRole, options->customShortcut(actions[i]->objectName()));
+        }
+    }
 }
 
 void OptionsDialog::saveState()