Merge remote-tracking branch 'origin/dev'

agateau · agateau · commit 723098631994 · 2020-10-04T00:31:11.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,23 @@
 # Changelog
 
+## 1.3.0 - 2020-10-03
+
+### Changed
+- Update Spanish translation (Victorhck)
+
+### Fixed
+- Properly encode URL of the note path (Aurelien Gateau)
+- Fix untranslated text in About tab on Linux (Aurelien Gateau)
+
 ## 1.2.91 - 2020-09-28
 
 ### Added
 - You can now search inside your notes with the new search bar (Pavol Oresky)
-- Move selected lines up and down (Aurelien Gateau)
+- You can now move selected lines up and down with Alt+Shift+Up and Down (Aurelien Gateau)
 - macOS dmg (Aurelien Gateau)
 - Windows installer (Aurelien Gateau)
 
-## Changed
+### Changed
 - Reorganized context menu: added "Edit" and "View" submenus (Aurelien Gateau)
 
 ## 1.2.0 - 2019-05-11
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.17)
 project(nanonote
-    VERSION 1.2.91
+    VERSION 1.3.0
     DESCRIPTION "Minimalist note taking application for short-lived notes"
     HOMEPAGE_URL "https://github.com/agateau/nanonote"
 )
diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
@@ -2,6 +2,7 @@
 #include "ui_SettingsDialog.h"
 
 #include <QSpinBox>
+#include <QUrl>
 
 #include "Settings.h"
 
@@ -35,22 +36,27 @@ SettingsDialog::~SettingsDialog() {
 }
 
 void SettingsDialog::setupConfigTab() {
-    auto noteLink = QString("<html><a href='file:%1'>%1</a></html>").arg(Settings::notePath());
+    auto url = QUrl::fromLocalFile(Settings::notePath());
+    auto noteLink =
+        QString("<html><a href='%1'>%2</a></html>").arg(url.toEncoded(), Settings::notePath());
     ui->noteLocationLabel->setText(noteLink);
 }
 
 void SettingsDialog::setupAboutTab() {
-    auto text = tr(R"(<h2>Nanonote %1</h2>
-<p>A minimalist note taking application.<br>
-<a href='%2'>%2</a></p>)",
+    // Do not use C++ raw strings here, the lupdate shipped with Ubuntu 18.04 does not understand
+    // them
+    auto text = tr("<h2>Nanonote %1</h2>\n"
+                   "<p>A minimalist note taking application.<br>\n"
+                   "<a href='%2'>%2</a></p>",
                    "%1: version, %2: project url")
                     .arg(qApp->applicationVersion(), PROJECT_URL);
     ui->aboutLabel->setText(text);
 
-    text = tr(R"(<p>Hi,</p>
-<p>I hope you enjoy Nanonote!</p>
-<p>If you do, it would be lovely if you could <a href='%1'>support my work</a> on free and open source software.</p>
-<p align="right">― Aurélien</p>)",
+    text = tr("<p>Hi,</p>\n"
+              "<p>I hope you enjoy Nanonote!</p>\n"
+              "<p>If you do, it would be lovely if you could <a href='%1'>support my work</a> on "
+              "free and open source software.</p>\n"
+              "<p align=\"right\">― Aurélien</p>",
               "%1: support url")
                .arg(SUPPORT_URL);
     auto font = ui->supportLabel->font();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`cmake_minimum_required(VERSION 3.17)`
`2`	`2`	`project(nanonote`
`3`		`- VERSION 1.2.91`
	`3`	`+ VERSION 1.3.0`
`4`	`4`	`DESCRIPTION "Minimalist note taking application for short-lived notes"`
`5`	`5`	`HOMEPAGE_URL "https://github.com/agateau/nanonote"`
`6`	`6`	`)`