Browse Source

Dev (#2316)

* refine mindmap

* update release

* release v3.16.0
Le Tan 2 years ago
parent
commit
31d4ad151e

+ 1 - 1
.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:

+ 1 - 1
.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:

+ 1 - 1
.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:

+ 11 - 0
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

+ 1 - 0
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()) {

+ 6 - 3
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.

+ 1 - 2
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);
 }
 

+ 2 - 2
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>

File diff suppressed because it is too large
+ 198 - 165
src/data/core/translations/vnote_ja.ts


BIN
src/data/core/translations/vnote_zh_CN.qm


File diff suppressed because it is too large
+ 190 - 157
src/data/core/translations/vnote_zh_CN.ts


+ 1 - 1
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.15.1"
+        "version" : "3.16.0"
     },
     "core" : {
         "theme" : "pure",

+ 2 - 1
src/data/extra/web/js/mindmapeditorcore.js

@@ -6,7 +6,8 @@ class MindMapEditorCore extends VXCore {
     initOnLoad() {
         let options = {
           el: '#vx-mindmap',
-          direction: MindElixir.LEFT,
+          direction: MindElixir.SIDE,
+          allowUndo: true,
         }
 
         this.mind = new MindElixir(options);

+ 4 - 0
src/data/extra/web/mindmap-editor-template.html

@@ -15,6 +15,10 @@
             margin: 0px !important;
             padding: 0px !important;
         }
+
+        span#fullscreen {
+            display: none;
+        }
     </style>
 
     <!-- VX_THEME_STYLES_PLACEHOLDER -->

+ 3 - 0
src/widgets/dialogs/nodeinfowidget.cpp

@@ -161,6 +161,9 @@ void NodeInfoWidget::setupFileTypeComboBox(QWidget *p_parent)
     m_fileTypeComboBox = WidgetsFactory::createComboBox(p_parent);
     const auto &fileTypes = FileTypeHelper::getInst().getAllFileTypes();
     for (const auto &ft : fileTypes) {
+        if (m_mode == Mode::Create && !ft.m_isNewable) {
+            continue;
+        }
         m_fileTypeComboBox->addItem(ft.m_displayName, ft.m_typeName);
     }
     connect(m_fileTypeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),

Some files were not shown because too many files changed in this diff