Merge branch 'hotfix/v0.11.2'

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.1"?>
+  <?define ProductVersion="0.11.2"?>
   <Product Name="$(var.ProductName)" 
       Id="*" 
       UpgradeCode="335156FC-CB7F-4357-98D4-B5519E66402B"

README.md

@@ -8,15 +8,31 @@ 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.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)  
+[Sources](https://github.com/cloose/CuteMarkEd/archive/v0.11.2.tar.gz)  
+[MS Windows (Installer)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.2.msi)  
+[MS Windows (ZIP file)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.2.zip)  
+[OpenSUSE 13.2 (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)  
+[Fedora 22 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974)  
+[Fedora 23 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974)  
 
 ### NEWS
 
+#### Version 0.11.2
+
+Improvements:
+
+* `IMPROVED` Added Hungarian translation
+
+Fixes:
+
+* `FIXED` Editor pane jumping up and down during editing (#232)
+* `FIXED` Missing mermaid CSS for styling in preview (#241)
+* `FIXED` Correct order of HTML Preview/Source menu item (#242)
+* `FIXED` Retrieval of last used style on application start on Linux (#257)
+* `FIXED` Crash when switching between markdown converters (#260)
+
 #### Version 0.11.1
 
 Improvements:

app-static/converter/hoedownmarkdownconverter.cpp

@@ -88,7 +88,7 @@ QString HoedownMarkdownConverter::renderAsHtml(MarkdownDocument *document)
     if (document) {
         HoedownMarkdownDocument *doc = dynamic_cast<HoedownMarkdownDocument*>(document);
 
-        if (doc->document()) {
+        if (doc && doc->document()) {
             hoedown_buffer *in = doc->document();
             hoedown_buffer *out = hoedown_buffer_new(64);
 

app-static/converter/revealmarkdownconverter.cpp

@@ -30,7 +30,9 @@ QString RevealMarkdownConverter::renderAsHtml(MarkdownDocument *document)
 
     if (document) {
         RevealMarkdownDocument *doc = dynamic_cast<RevealMarkdownDocument*>(document);
-        html = doc->markdownText;
+        if (doc) {
+            html = doc->markdownText;
+        }
     }
 
     return html;

app-static/htmlviewsynchronizer.cpp

@@ -46,6 +46,9 @@ void HtmlViewSynchronizer::webViewScrolled()
     int value = m_webView->page()->mainFrame()->scrollBarValue(Qt::Vertical);
 
     m_editor->verticalScrollBar()->setValue(qRound(value * factor));
+
+    // remember new vertical scrollbar position of markdown editor
+    rememberScrollBarPos();
 }
 
 void HtmlViewSynchronizer::scrollValueChanged(int value)

app-static/template/htmltemplate.cpp

@@ -108,6 +108,7 @@ QString HtmlTemplate::buildHtmlHeader(RenderOptions options) const
 
     // add mermaid.js script to HTML header
     if (options.testFlag(Template::DiagramSupport)) {
+        header += "<link rel=\"stylesheet\" href=\"qrc:/scripts/mermaid/mermaid.css\">\n";
         header += "<script src=\"qrc:/scripts/mermaid/mermaid.full.min.js\"></script>\n";
     }
 

app/aboutdialog.cpp

@@ -17,7 +17,7 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 
-static const QString COPYRIGHT = QStringLiteral("Copyright 2013-2015 Christian Loose");
+static const QString COPYRIGHT = QStringLiteral("Copyright 2013-2016 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/aboutdialog.ui

@@ -109,7 +109,7 @@
           <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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&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-size:8pt; font-weight:600;&quot;&gt;Christian Loose (cloose)&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-size:8pt;&quot;&gt;Creator and maintainer&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-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
@@ -163,6 +163,12 @@ p, li { white-space: pre-wrap; }
 &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-size:8pt;&quot;&gt;&lt;br /&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-size:8pt; font-weight:600;&quot;&gt;Mljjlm&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-size:8pt;&quot;&gt;Danish translation&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-size:8pt;&quot;&gt;&lt;br /&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-size:8pt; font-weight:600;&quot;&gt;Napcok&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-size:8pt;&quot;&gt;Polish translation&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-size:8pt;&quot;&gt;&lt;br /&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-size:8pt; font-weight:600;&quot;&gt;Neran93&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-size:8pt;&quot;&gt;Hungarian translation&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-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
@@ -180,7 +186,7 @@ p, li { white-space: pre-wrap; }
           <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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&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-size:8pt; font-weight:600;&quot;&gt;Qt&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; (LGPL v2.1)&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;a href=&quot;http://qt-project.org/&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://qt.io/&lt;/span&gt;&lt;/a&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-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;

app/app.pro

@@ -25,8 +25,10 @@ TRANSLATIONS += \
     translations/cutemarked_el.ts \
     translations/cutemarked_es.ts \
     translations/cutemarked_fr.ts \
+    translations/cutemarked_hu_HU.ts \
     translations/cutemarked_id.ts \
     translations/cutemarked_ja.ts \
+    translations/cutemarked_pl.ts \
     translations/cutemarked_pt_BR.ts \
     translations/cutemarked_ru.ts \
     translations/cutemarked_zh_CN.ts
@@ -121,8 +123,11 @@ OTHER_FILES += \
     syntax_da.html \
     syntax_de.html \
     syntax_el.html \
+    syntax_es.html \
+    syntax_hu_HU.html \
     syntax_id.html \
     syntax_ja.html \
+    syntax_pt_BR.html \
     syntax_zh_CN.html \
     styles/solarized-dark.css \
     styles/markdown.css \

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.1");
+    app.setApplicationVersion("0.11.2");
 
 #ifdef Q_OS_WIN
     QStringList fileTypes;