release v3.4.0 (#1809)

vnotex · Jul 9, 2021 · bdf9224 · bdf9224
1 parent 19b5163
commit bdf9224
Show file tree

Hide file tree

Showing 10 changed files with 621 additions and 205 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 env:
-    VNOTE_VER: 3.3.0
+    VNOTE_VER: 3.4.0
 
 jobs:
   build-linux:

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 env:
-    VNOTE_VER: 3.3.0
+    VNOTE_VER: 3.4.0
 
 jobs:
   build-linux:

diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 env:
-    VNOTE_VER: 3.3.0
+    VNOTE_VER: 3.4.0
 
 jobs:
   build:

diff --git a/changes.md b/changes.md
@@ -1,4 +1,12 @@
 # Changes
+## v3.4.0
+* Support Snippet
+    * `Ctrl+G S` to insert a snippet
+    * `%snippet_name%` to insert a snippet (the legacy Magic Word)
+        * Snippet is supported in some dialogs (such as creating a new note)
+* Support note template (snippet is supported)
+* Remove `'` and `"` from auot-brackets
+
 ## v3.3.0
 * Editor: support auto indent, auto list
 * Support opening notes with external programs

diff --git a/src/data/core/translations/vnote_zh_CN.qm b/src/data/core/translations/vnote_zh_CN.qm
diff --git a/src/data/core/translations/vnote_zh_CN.ts b/src/data/core/translations/vnote_zh_CN.ts
diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json
@@ -3,7 +3,7 @@
     "metadata" : {
         "//comment": "When releasing new version, please go through the following configs to check if override is needed.",
         "//Comment": "markdown_editor#override_viewer_resource",
-        "version" : "3.3.0"
+        "version" : "3.4.0"
     },
     "core" : {
         "theme" : "pure",

diff --git a/src/widgets/lineeditwithsnippet.cpp b/src/widgets/lineeditwithsnippet.cpp
@@ -18,7 +18,7 @@ LineEditWithSnippet::LineEditWithSnippet(const QString &p_contents, QWidget *p_p
 
 void LineEditWithSnippet::setTips()
 {
-    const auto tips = tr("Snippet is supported via %name%");
+    const auto tips = tr("Snippet is supported via \"%name%\"");
     setToolTip(tips);
     setPlaceholderText(tips);
 }

diff --git a/src/widgets/textviewwindowhelper.h b/src/widgets/textviewwindowhelper.h
@@ -200,7 +200,7 @@ namespace vnotex
                                                p_win->m_editor->getTextEdit(),
                                                SnippetMgr::generateOverrides(p_win->getBuffer()));
             p_win->m_editor->enterInsertModeIfApplicable();
-            p_win->showMessage(ViewWindow::tr("Snippet applied: %1").arg(p_name));
+            p_win->showMessage(vnotex::ViewWindow::tr("Snippet applied: %1").arg(p_name));
         }
 
         template <typename _ViewWindow>
@@ -227,7 +227,7 @@ namespace vnotex
                     // Found one symbol under current cursor.
                     snippetName = match.captured(1);
                     if (!SnippetMgr::getInst().find(snippetName)) {
-                        p_win->showMessage(ViewWindow::tr("Snippet (%1) not found").arg(snippetName));
+                        p_win->showMessage(vnotex::ViewWindow::tr("Snippet (%1) not found").arg(snippetName));
                         return;
                     }
 
@@ -254,7 +254,7 @@ namespace vnotex
         {
             const auto snippets = SnippetMgr::getInst().getSnippets();
             if (snippets.isEmpty()) {
-                p_win->showMessage(ViewWindow::tr("Snippet not available"));
+                p_win->showMessage(vnotex::ViewWindow::tr("Snippet not available"));
                 return QString();
             }
 
@@ -267,7 +267,7 @@ namespace vnotex
             }
 
             // Ownership will be transferred to showFloatingWidget().
-            auto selector = new QuickSelector(ViewWindow::tr("Select Snippet"),
+            auto selector = new QuickSelector(vnotex::ViewWindow::tr("Select Snippet"),
                                               items,
                                               true,
                                               p_win);

diff --git a/src/widgets/toolbarhelper.cpp b/src/widgets/toolbarhelper.cpp
@@ -491,6 +491,12 @@ QToolBar *ToolBarHelper::setupSettingsToolBar(MainWindow *p_win, QToolBar *p_too
 
         menu->addSeparator();
 
+        menu->addAction(MainWindow::tr("%1 Home Page").arg(qApp->applicationDisplayName()),
+                        menu,
+                        []() {
+                            WidgetUtils::openUrlByDesktop(QUrl("https://vnotex.github.io/vnote"));
+                        });
+
         menu->addAction(MainWindow::tr("Feedback And Discussions"),
                         menu,
                         []() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ on: @@
       workflow_dispatch:
     env:
-        VNOTE_VER: 3.3.0
+        VNOTE_VER: 3.4.0
     jobs:
       build:
@@ Expand Down @@