Dev (#2316)

* refine mindmap * update release * release v3.16.0
vnotex · Dec 30, 2022 · 31d4ad1 · 31d4ad1
1 parent 5229be4
commit 31d4ad1
Show file tree

Hide file tree

Showing 15 changed files with 516 additions and 428 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.15.1
+    VNOTE_VER: 3.16.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.15.1
+    VNOTE_VER: 3.16.0
 
 jobs:
   build:

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.15.1
+    VNOTE_VER: 3.16.0
 
 jobs:
   build:

diff --git a/changes.md b/changes.md
@@ -1,4 +1,15 @@
 # Changes
+## v3.16.0
+* Support reading PDF format
+* Support Ming Map editor in suffix `*.emind`
+* Support "View By" for notebooks selector
+* ViewWindow: add shortcut Ctrl+G,V to alternate among view modes
+* Bug fixes
+
+## v3.15.1
+* Add two themes
+* Bug fixes
+
 ## v3.15.0
 * Editor supports Word Count
 * Add Open Windows panel

diff --git a/src/core/buffer/filetypehelper.cpp b/src/core/buffer/filetypehelper.cpp
@@ -80,6 +80,7 @@ void FileTypeHelper::setupBuiltInTypes()
         type.m_type = FileType::Pdf;
         type.m_typeName = QStringLiteral("PDF");
         type.m_displayName = Buffer::tr("Portable Document Format");
+        type.m_isNewable = false;
 
         auto suffixes = coreConfig.findFileTypeSuffix(type.m_typeName);
         if (suffixes && !suffixes->isEmpty()) {

diff --git a/src/core/buffer/filetypehelper.h b/src/core/buffer/filetypehelper.h
@@ -20,6 +20,10 @@ namespace vnotex
             Others
         };
 
+        QString preferredSuffix() const;
+
+        bool isMarkdown() const;
+
         // Type.
         int m_type = -1;
 
@@ -29,9 +33,8 @@ namespace vnotex
 
         QStringList m_suffixes;
 
-        QString preferredSuffix() const;
-
-        bool isMarkdown() const;
+        // Whether we can new this type of file.
+        bool m_isNewable = true;
     };
 
     // Only handle built-in editors.

diff --git a/src/core/htmltemplatehelper.cpp b/src/core/htmltemplatehelper.cpp
@@ -378,9 +378,8 @@ void HtmlTemplateHelper::updateMindMapEditorTemplate(const MindMapEditorConfig &
 
     s_mindMapEditorTemplate.m_revision = p_config.revision();
 
-    const auto &themeMgr = VNoteX::getInst().getThemeMgr();
     generateMindMapEditorTemplate(p_config,
-                                  themeMgr.getFile(Theme::File::WebStyleSheet),
+                                  QString() /* Use empty theme style for now */,
                                   s_mindMapEditorTemplate);
 }
 

diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist
@@ -21,9 +21,9 @@
     <key>CFBundleExecutable</key>
     <string>vnote</string>
     <key>CFBundleShortVersionString</key>
-    <string>3.15.1</string>
+    <string>3.16.0</string>
     <key>CFBundleVersion</key>
-    <string>3.15.1.1</string>
+    <string>3.16.0.1</string>
     <key>NSHumanReadableCopyright</key>
     <string>Created by VNoteX</string>
     <key>CFBundleIconFile</key>