.github/workflows/ci-linux.yml

@@ -8,21 +8,14 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab.
   workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled'
-        required: false
-        default: false
 
 env:
-    VNOTE_VER: 3.19.2
-    CMAKE_VER: 3.24.3
+    VNOTE_VER: 3.6.0
 
 jobs:
   build-linux:
     name: Build On Ubuntu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     timeout-minutes: 120
 
     steps:
@@ -37,86 +30,75 @@ jobs:
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
-      - name: Install a Fresh CMake
-        run: |
-          wget --no-verbose https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-Linux-x86_64.sh
-          chmod +x cmake-${CMAKE_VER}-Linux-x86_64.sh
-          mkdir ${{runner.workspace}}/cmake
-          sudo ./cmake-${CMAKE_VER}-Linux-x86_64.sh --skip-license --prefix=${{runner.workspace}}/cmake
-          sudo rm -f /usr/local/bin/cmake /usr/local/bin/cpack
-          sudo ln -s ${{runner.workspace}}/cmake/bin/cmake /usr/local/bin/cmake
-          sudo ln -s ${{runner.workspace}}/cmake/bin/cpack /usr/local/bin/cpack
-
       - name: Install linuxdeploy
         uses: miurahr/install-linuxdeploy-action@v1
         with:
           plugins: qt appimage
 
-      - name: Install Dependencies
+      - name: Install dependencies
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libfcitx5-qt-dev fcitx-libs-dev extra-cmake-modules libxkbcommon-dev
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y tree
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y fuse libxcb-cursor-dev
-          python3 -m pip config set global.break-system-packages true
-
-      - name: Cache Qt
-        id: cache-qt
-        uses: actions/cache@v4
-        with:
-          path: ${{runner.workspace}}/Qt
-          key: ${{ runner.os }}-QtCache-6.8
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libfcitx-qt5-dev tree
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v2
         with:
-          version: 6.8.3
+          version: 5.12.10
           target: desktop
-          modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
-          tools: 'tools_opensslv3_src'
-          cache: 'true'
-
-      - name: Compile OpenSSLV3
-        run: |
-          cd ${Qt6_DIR}/../../Tools/OpenSSLv3/src
-          ./Configure
-          make -j2
-          sudo make install
+          modules: qtwebchannel qtwebengine qtsvg qtlocation qttools qttranslations
+          tools: tools_openssl_x64,1.1.1-4,qt.tools.openssl.gcc_64
 
       - name: Create Build Dir
         run: mkdir build
         working-directory: ${{runner.workspace}}
 
-      - name: Compile fcitxqt5
+      - name: Compile qt5ct
         run: |
-          git clone https://github.com/fcitx/fcitx-qt5
-          cd fcitx-qt5
-          mkdir build && cd build
-          cmake -DENABLE_QT5=OFF -DENABLE_QT6=ON ..
-          make -j2
-          sudo make install
-        working-directory: ${{runner.workspace}}/build
-
-      - name: Compile qt6ct
-        run: |
-          git clone https://github.com/trialuser02/qt6ct qt6ct.git
-          cd qt6ct.git
-          qmake
+          wget -c https://excellmedia.dl.sourceforge.net/project/qt5ct/qt5ct-1.1.tar.bz2
+          tar xf qt5ct-1.*.tar.bz2
+          cd qt5ct-1.*/
+          QT_SELECT=5 qmake
           make -j$(nproc) && sudo make install
         working-directory: ${{runner.workspace}}/build
 
       - name: Configure Project
         run: |
           qmake -v
-          cmake --version
-          cmake ${GITHUB_WORKSPACE}
+          cp /usr/lib/x86_64-linux-gnu/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so ./
+          sudo chmod +rwx ./libfcitxplatforminputcontextplugin.so
+          cp ./libfcitxplatforminputcontextplugin.so $Qt5_Dir/plugins/platforminputcontexts
+          qmake CONFIG+=release -spec linux-g++-64 ${GITHUB_WORKSPACE}/vnote.pro
         working-directory: ${{runner.workspace}}/build
 
       - name: Build Project
+        run: make -j$(nproc)
+        working-directory: ${{runner.workspace}}/build
+
+      - name: Install Project
         run: |
-          # Remove the libqsqlmimer.so as libmimerapi.so is not deployed with Qt6
-          rm ${{runner.workspace}}/Qt/6.*/gcc_64/plugins/sqldrivers/libqsqlmimer.so
-          cmake --build . --target pack
+          mkdir AppDir
+          make install INSTALL_ROOT=${{runner.workspace}}/build/AppDir
+          tree AppDir
+        working-directory: ${{runner.workspace}}/build
+
+      - name: Package Project
+        run: |
+          # Move the lib out to avoid duplication
+          mv AppDir/usr/lib ./
+          LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH
+          # Copy translations
+          mkdir -p AppDir/usr/translations
+          cp $Qt5_Dir/translations/qt_zh_CN.qm AppDir/usr/translations
+          # Package qt5ct (EXTRA_QT_PLUGINS seems not work)
+          # EXTRA_QT_PLUGINS="platformthemes/libqt5ct.so;styles/libqt5ct-style.so"
+          mkdir -p AppDir/usr/plugins/platformthemes
+          mkdir -p AppDir/usr/plugins/styles
+          cp $Qt5_Dir/plugins/platformthemes/* AppDir/usr/plugins/platformthemes/
+          cp $Qt5_Dir/plugins/styles/* AppDir/usr/plugins/styles/
+          # Package libssl.so and libcrypto.so
+          Qt5_Tools=$Qt5_Dir/../../Tools
+          linuxdeploy-x86_64.AppImage --appdir ./AppDir --plugin qt --output appimage -l $Qt5_Tools/OpenSSL/binary/lib/libcrypto.so.1.1 -l $Qt5_Tools/OpenSSL/binary/lib/libssl.so.1.1
+          tree AppDir
         working-directory: ${{runner.workspace}}/build
 
       - name: Fix Package
@@ -133,14 +115,15 @@ jobs:
           linuxdeploy-plugin-appimage-x86_64.AppImage --appdir=./squashfs-root
           mv VNote*.AppImage ../
           popd
-          mv VNote*.AppImage VNote-${{env.VNOTE_VER}}-linux-x64.AppImage
+          mv VNote*.AppImage vnote-linux-x64_v${{env.VNOTE_VER}}.AppImage
+          cp vnote-linux-x64_v${{env.VNOTE_VER}}.AppImage vnote-linux-x64.AppImage
         working-directory: ${{runner.workspace}}/build
 
       - name: Archive Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
-          name: VNote-${{env.VNOTE_VER}}-linux-x64.AppImage
-          path: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-linux-x64.AppImage
+          name: vnote-linux-x64_v${{env.VNOTE_VER}}
+          path: ${{runner.workspace}}/build/vnote-linux-x64_v${{env.VNOTE_VER}}.AppImage
 
       - name: Update Tag
         if: github.ref == 'refs/heads/master'
@@ -153,17 +136,6 @@ jobs:
         uses: johnwbyrd/update-release@v1.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-linux-x64.AppImage
+          files: ${{runner.workspace}}/build/vnote-linux-x64.AppImage
           release: Continuous Build
           tag: continuous-build
-
-      - name: Release
-        if: github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, '[Release]')
-        uses: ncipollo/release-action@v1.11.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-linux-x64.AppImage
-          commit: master
-          tag: v${{env.VNOTE_VER}}
-          allowUpdates: true
-          draft: true

.github/workflows/ci-macos.yml

@@ -8,34 +8,16 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab.
   workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled'
-        required: false
-        default: false
 
 env:
-    VNOTE_VER: 3.19.2
-    CMAKE_VER: 3.24.3
+    VNOTE_VER: 3.6.0
 
 jobs:
-  build:
-    environment: Mac-code-sign
+  build-linux:
     name: Build On MacOS
+    runs-on: macos-latest
     timeout-minutes: 120
 
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - name: "Build on Arm64"
-            os: macos-latest
-            arch: universal
-            qt: 6.8.3
-
-    runs-on: ${{matrix.config.os}}
-
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE.
       - uses: actions/checkout@v2
@@ -50,50 +32,19 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          brew install tree libiodbc libpq
-
-      - name: Fix SQL
-        run: |
-          sudo mkdir -p /usr/local/opt/libiodbc/lib
-          sudo ln -s /opt/homebrew/opt/libiodbc/lib/libiodbc.2.dylib /usr/local/opt/libiodbc/lib/libiodbc.2.dylib
-          sudo mkdir -p /Applications/Postgres.app/Contents/Versions/14/lib
-          sudo ln -s /opt/homebrew/Cellar/libpq/16.3/lib/libpq.5.dylib /Applications/Postgres.app/Contents/Versions/14/lib/libpq.5.dylib
-
-      - name: Install a fresh CMake
-        run: |
-          wget --no-verbose https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-macos-universal.tar.gz
-          tar xzf cmake-${CMAKE_VER}-macos-universal.tar.gz
-          sudo rm -f /usr/local/bin/cmake /usr/local/bin/cpack
-          sudo ln -s ${{runner.workspace}}/cmake-${CMAKE_VER}-macos-universal/CMake.app/Contents/bin/cmake /usr/local/bin/cmake
-          sudo ln -s ${{runner.workspace}}/cmake-${CMAKE_VER}-macos-universal/CMake.app/Contents/bin/cpack /usr/local/bin/cpack
-        working-directory: ${{runner.workspace}}
+          brew install tree
 
       - name: Install macdeployqtfix
         run: |
           git clone https://github.com/tamlok/macdeployqtfix.git macdeployqtfix --depth=1
         working-directory: ${{runner.workspace}}
 
-      - name: Install optool
-        run: |
-          wget --no-verbose https://github.com/alexzielenski/optool/releases/download/0.1/optool.zip
-          unzip ./optool.zip
-          sudo ln -s ./optool /usr/local/bin/optool
-        working-directory: ${{runner.workspace}}
-
-      - name: Cache Qt
-        id: cache-qt
-        uses: actions/cache@v4
-        with:
-          path: ${{runner.workspace}}/Qt
-          key: ${{ runner.os }}-QtCache-6.8
-
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v2
         with:
-          version: ${{matrix.config.qt}}
+          version: 5.12.10
           target: desktop
-          modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
-          cache: 'true'
+          modules: qtwebchannel qtwebengine qtsvg qtlocation qttools qttranslations
 
       - name: Create Build Dir
         run: mkdir build
@@ -102,111 +53,71 @@ jobs:
       - name: Configure Project
         run: |
           qmake -v
-          cmake --version
-          cmake -DMACDEPLOYQTFIX_EXECUTABLE=${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"  ${GITHUB_WORKSPACE}
+          qmake CONFIG+=release ${GITHUB_WORKSPACE}/vnote.pro
         working-directory: ${{runner.workspace}}/build
 
       - name: Build Project
-        run: |
-          # Keep only required SQL drivers
-          rm ${{env.Qt6_DIR}}/plugins/sqldrivers/libqsqlmimer.dylib
-          rm ${{env.Qt6_DIR}}/plugins/sqldrivers/libqsqlodbc.dylib
-          rm ${{env.Qt6_DIR}}/plugins/sqldrivers/libqsqlpsql.dylib
-
-          # Build the project
-          cmake --build . --target pack
-
-          # Fix Qt frameworks
-          python3 ${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py ./src/VNote.app/Contents/MacOS/VNote ${{env.Qt6_DIR}}/../..
-
-          # Only delete rpaths that exist to avoid errors
-          for rpath in $(otool -l ./src/VNote.app/Contents/MacOS/VNote | awk '/LC_RPATH/ {getline; getline; print $2}' | grep 'vnote'); do
-            echo "Checking rpath: $rpath"
-            if otool -l ./src/VNote.app/Contents/MacOS/VNote | grep -q "$rpath"; then
-              echo "Deleting rpath: $rpath"
-              install_name_tool -delete_rpath "$rpath" ./src/VNote.app/Contents/MacOS/VNote
-            else
-              echo "Rpath not found: $rpath"
-            fi
-          done
-          for rpath in $(otool -l ./src/VNote.app/Contents/Frameworks/libVTextEdit.dylib | awk '/LC_RPATH/ {getline; getline; print $2}' | grep 'vnote'); do
-            echo "Checking rpath: $rpath"
-            if otool -l ./src/VNote.app/Contents/Frameworks/libVTextEdit.dylib | grep -q "$rpath"; then
-              echo "Deleting rpath: $rpath"
-              install_name_tool -delete_rpath "$rpath" ./src/VNote.app/Contents/Frameworks/libVTextEdit.dylib
-            else
-              echo "Rpath not found: $rpath"
-            fi
-          done
-
-          # Run macdeployqtfix again to ensure all dependencies are properly fixed
-          python3 ${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py ./src/VNote.app/Contents/MacOS/VNote ${{env.Qt6_DIR}}/../..
+        run: make -j4
         working-directory: ${{runner.workspace}}/build
 
-      - name: Codesign Bundle
-        # Extract the secrets we defined earlier as environment variables
-        env:
-          MACOS_CERTIFICATE: ${{ secrets.CLI_MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.CLI_MACOS_CERTIFICATE_PWD }}
-          MACOS_CERTIFICATE_NAME: ${{ secrets.CLI_MACOS_CERTIFICATE_NAME }}
-          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.CLI_MACOS_CERTIFICATE }}
+      - name: Deploy VSyntaxHighlighting Framework
         run: |
-          # Turn our base64-encoded certificate back to a regular .p12 file
-          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-
-          # We need to create a new keychain, otherwise using the certificate will prompt
-          # with a UI dialog asking for the certificate password, which we can't
-          # use in a headless CI environment
-          security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-          security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-
-          echo "Codesigning main app bundle"
-          codesign --force --deep -s "$MACOS_CERTIFICATE_NAME" --entitlements ${{github.workspace}}/package/entitlements.xml --options runtime ./src/VNote.app
-          codesign -v -vvv ./src/VNote.app
-
-          hdiutil create -volname "VNote" -srcfolder ./src/VNote.app -ov -format UDZO VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
-          codesign --force --deep -s "$MACOS_CERTIFICATE_NAME" --entitlements ${{github.workspace}}/package/entitlements.xml --options runtime ./VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
-          codesign -v -vvv ./VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
-
+          my_lib_name=VSyntaxHighlighting
+          my_lib_framework=${my_lib_name}.framework
+          my_lib_dir=./libs/vtextedit/src/libs/syntax-highlighting
+          frameworks_dir=./src/vnote.app/Contents/Frameworks
+          mkdir -p ${frameworks_dir}
+          cp -R ${my_lib_dir}/${my_lib_framework} ${frameworks_dir}
         working-directory: ${{runner.workspace}}/build
 
-      - name: "Notarize Bundle"
-        # Extract the secrets we defined earlier as environment variables
-        env:
-          PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.CLI_MACOS_NOTARY_USER }}
-          PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.CLI_MACOS_TEAM_ID }}
-          PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.CLI_MACOS_NOTARY_PWD }}
+      - name: Deploy VTextEdit Framework
         run: |
-          # Store the notarization credentials so that we can prevent a UI password dialog
-          # from blocking the CI
-          echo "Create keychain profile"
-          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"
+          my_lib_name=VTextEdit
+          my_lib_framework=${my_lib_name}.framework
+          my_lib_dir=./libs/vtextedit/src/editor
+          frameworks_dir=./src/vnote.app/Contents/Frameworks
+          mkdir -p ${frameworks_dir}
+          cp -R ${my_lib_dir}/${my_lib_framework} ${frameworks_dir}
+        working-directory: ${{runner.workspace}}/build
 
-          # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
-          # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
-          # characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
-          # you're curious
-          echo "Notarize app"
-          xcrun notarytool submit "${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg" --keychain-profile "notarytool-profile" --wait
+      - name: Cleanup rpath
+        run: |
+          app_target=./src/vnote.app/Contents/MacOS/vnote
+          install_name_tool -delete_rpath ${PWD}/src/../libs/vtextedit/src/editor ${app_target}
+          install_name_tool -delete_rpath ${PWD}/src/../libs/vtextedit/src/libs/syntax-highlighting ${app_target}
+        working-directory: ${{runner.workspace}}/build
 
-          # Finally, we need to "attach the staple" to our executable, which will allow our app to be
-          # validated by macOS even when an internet connection is not available.
-          echo "Attach staple"
-          xcrun stapler staple "${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg"
+      - name: Mac Deploy
+        run: |
+          pushd src
+          macdeployqt vnote.app
+          python ${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py vnote.app/Contents/MacOS/vnote $Qt5_Dir
+          # Fix Helpers/QtWebEngineProcess.app
+          pushd vnote.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers
+          macdeployqt QtWebEngineProcess.app
+          python ${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess $Qt5_Dir
+          popd
+          popd
+          tree ./
+        working-directory: ${{runner.workspace}}/build
 
-      # Enable tmate debugging of manually-triggered workflows if the input option was provided
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+      - name: Package Project
+        run: |
+          mkdir -p distrib/vnote
+          pushd distrib/vnote
+          mv ../../src/vnote.app ./
+          ln -s /Applications ./Applications
+          popd
+          sleep 1m
+          hdiutil create -srcfolder ./distrib/vnote -format UDBZ vnote-mac-x64_v${{env.VNOTE_VER}}.dmg
+          cp vnote-mac-x64_v${{env.VNOTE_VER}}.dmg vnote-mac-x64.dmg
+        working-directory: ${{runner.workspace}}/build
 
-      - name: Archive DMG
-        uses: actions/upload-artifact@v4
+      - name: Archive Artifacts
+        uses: actions/upload-artifact@v2
         with:
-          name: VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}
-          path: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
+          name: vnote-mac-x64_v${{env.VNOTE_VER}}
+          path: ${{runner.workspace}}/build/vnote-mac-x64_v${{env.VNOTE_VER}}.dmg
 
       - name: Update Tag
         if: github.ref == 'refs/heads/master'
@@ -219,17 +130,6 @@ jobs:
         uses: johnwbyrd/update-release@v1.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
+          files: ${{runner.workspace}}/build/vnote-mac-x64.dmg
           release: Continuous Build
           tag: continuous-build
-
-      - name: Release
-        if: github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, '[Release]')
-        uses: ncipollo/release-action@v1.11.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-mac-${{matrix.config.arch}}.dmg
-          commit: master
-          tag: v${{env.VNOTE_VER}}
-          allowUpdates: true
-          draft: true

.github/workflows/ci-win.yml

@@ -8,44 +8,29 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab.
   workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled'
-        required: false
-        default: false
 
 env:
-    VNOTE_VER: 3.19.2
+    VNOTE_VER: 3.6.0
 
 jobs:
   build:
     name: ${{ matrix.config.name }}
-    runs-on: windows-${{ matrix.config.vs_version }}
+    runs-on: windows-latest
     timeout-minutes: 120
 
     strategy:
-      fail-fast: false
       matrix:
         config:
-          - name: "Build on Win64 Qt 5.15"
-            arch: win64_msvc2019_64
-            vs_version: 2019
-            vs_cmd: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
-            qt: 5.15.2
-            qt_modules: qtwebengine
-            qt_tools: tools_opensslv3_x64
-            qt_major: 5
-            suffix: "-windows7"
-          - name: "Build on Win64 Qt 6"
-            arch: win64_msvc2022_64
-            vs_version: 2022
-            vs_cmd: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
-            qt: 6.8.3
-            qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"
-            qt_tools: tools_opensslv3_x64
-            qt_major: 6
-            suffix: ""
+          - {
+            name: "Build On Win64",
+            arch: win64_msvc2017_64,
+            platform: x64
+          }
+          - {
+            name: "Build On Win32",
+            arch: win32_msvc2017,
+            platform: x86
+          }
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE.
@@ -60,72 +45,65 @@ jobs:
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 
-      - name: Cache Qt
-        id: cache-qt
-        uses: actions/cache@v4
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
         with:
-          path: ${{runner.workspace}}/Qt
-          key: ${{runner.os}}-${{matrix.config.arch}}-QtCache-${{matrix.config.qt}}
-
-      - name: Install Qt Official Build
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: ${{matrix.config.qt}}
+          version: 5.12.10
           target: desktop
           arch: ${{matrix.config.arch}}
-          modules: ${{matrix.config.qt_modules}}
-          tools: ${{matrix.config.qt_tools}}
-          cache: 'true'
+          modules: qtwebchannel qtwebengine qtsvg qtlocation qttools qttranslations
+          tools: tools_openssl_${{matrix.config.platform}},1.1.1-4,qt.tools.openssl.win_${{matrix.config.platform}}
 
       - name: Create Build Dir
         shell: bash
         run: mkdir build
         working-directory: ${{runner.workspace}}
 
-      - name: Clone OpenSSL on 5.15
+      - name: Clone OpenSSL
         shell: bash
-        if: ${{startsWith(matrix.config.qt, '5.15')}}
         run: |
           git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git --depth=1
         working-directory: ${{runner.workspace}}/build
 
-      # Enable tmate debugging of manually-triggered workflows if the input option was provided
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
-
       - name: Configure and Build Project
         shell: cmd
         run: |
-          cmake --version
-          call "${{matrix.config.vs_cmd}}"
-          cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=${{runner.workspace}}\build\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE%
-          cmake --build .
-          cmake --build . --target=pack
-          7z x VNote*.zip -o*
-          dir
+          call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{matrix.config.platform}}
+          qmake -r -spec win32-msvc CONFIG-=debug CONFIG+=release %GITHUB_WORKSPACE%\vnote.pro
+          nmake
         working-directory: ${{runner.workspace}}/build
 
-      - name: Rename on 5.15
-        shell: bash
-        if: ${{startsWith(matrix.config.qt, '5.15')}}
+      - name: Package Project
+        shell: cmd
         run: |
-          mv VNote-${{env.VNOTE_VER}}-win64 VNote-${{env.VNOTE_VER}}-win64${{matrix.config.suffix}}
-          mv VNote-${{env.VNOTE_VER}}-win64.zip VNote-${{env.VNOTE_VER}}-win64${{matrix.config.suffix}}.zip
+          mkdir "%DISTRIB_PATH%"
+          call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ${{matrix.config.platform}}
+          windeployqt.exe --dir "%DISTRIB_PATH%" .\src\release\vnote.exe
+          copy .\src\release\vnote.exe "%DISTRIB_PATH%\vnote.exe"
+          copy .\src\release\vnote_extra.rcc "%DISTRIB_PATH%\vnote_extra.rcc"
+          copy .\libs\vtextedit\src\libs\syntax-highlighting\release\VSyntaxHighlighting.dll "%DISTRIB_PATH%\VSyntaxHighlighting.dll"
+          copy .\libs\vtextedit\src\editor\release\VTextEdit.dll "%DISTRIB_PATH%\VTextEdit.dll"
+          rem set qt_dir=%Qt5_Dir:/=\%
+          rem for %%I in ("%qt_dir%\..\..") do set "qt_topdir=%%~fI"
+          rem set openssl_dir=%qt_topdir%\Tools\OpenSSL\Win_${{matrix.config.platform}}\bin
+          set openssl_dir=openssl-utils.git\1.1.1g\Win_${{matrix.config.platform}}
+          copy %openssl_dir%\lib*.dll "%DISTRIB_PATH%\"
+          copy "%GITHUB_WORKSPACE%\README.md" "%DISTRIB_PATH%\README.md"
+          copy "%GITHUB_WORKSPACE%\COPYING.LESSER" "%DISTRIB_PATH%\COPYING.LESSER"
+          echo %GITHUB_SHA% > "%DISTRIB_PATH%\commit"
+          del /F /Q "%DISTRIB_PATH%\translations\qt_*.qm"
+          7z a vnote-win-${{matrix.config.platform}}.zip "%DISTRIB_PATH%"
         working-directory: ${{runner.workspace}}/build
+        env:
+          DISTRIB_PATH: ${{runner.workspace}}/build/distrib/vnote
 
       - name: Archive Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
-          name: VNote-${{env.VNOTE_VER}}-win64${{matrix.config.suffix}}
-          path: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-win64${{matrix.config.suffix}}
-
-      - name: Archive Installer
-        if: ${{!startsWith(matrix.config.qt, '5.15')}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: VNote-${{env.VNOTE_VER}}-win64${{matrix.config.suffix}}.msi
-          path: ${{runner.workspace}}/build/VNote*.msi
+          name: vnote-win-${{matrix.config.platform}}_v${{env.VNOTE_VER}}
+          path: ${{env.DISTRIB_PATH}}
+        env:
+          DISTRIB_PATH: ${{runner.workspace}}/build/distrib/vnote
 
       - name: Update Tag
         if: github.ref == 'refs/heads/master'
@@ -139,19 +117,6 @@ jobs:
         uses: johnwbyrd/update-release@v1.0.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          # glob not supported
-          files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-win64${{matrix.config.suffix}}.zip
+          files: ${{runner.workspace}}/build/vnote-win-${{matrix.config.platform}}.zip
           release: Continuous Build
           tag: continuous-build
-
-      - name: Release
-        if: github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, '[Release]')
-        uses: ncipollo/release-action@v1.11.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          # glob not supported
-          artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-win64${{matrix.config.suffix}}
-          commit: master
-          tag: v${{env.VNOTE_VER}}
-          allowUpdates: true
-          draft: true

.gitignore

@@ -2,16 +2,4 @@
 *.pro.user.*
 .ccls
 compile_commands.json
-compile_commands.json.*
 compile_flags.txt
-.cache
-.tasks
-.vimspector.json
-GPATH
-GRTAGS
-GTAGS
-aqtinstall.log
-tags
-CMakeLists.txt.user
-build
-.DS_Store

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "libs/vtextedit"]
 	path = libs/vtextedit
 	url = https://github.com/vnotex/vtextedit.git
-[submodule "libs/QHotkey"]
-	path = libs/QHotkey
-	url = https://github.com/vnotex/QHotkey.git

CMakeLists.txt

@@ -1,26 +0,0 @@
-cmake_minimum_required (VERSION 3.20)
-
-set(CMAKE_OSX_DEPLOYMENT_TARGET "12.1" CACHE STRING "Minimum OS X deployment version")
-
-project(VNote
-    VERSION 3.19.2
-    DESCRIPTION "A pleasant note-taking platform"
-    HOMEPAGE_URL "https://app.vnote.fun"
-    LANGUAGES C CXX)
-
-set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type, defaults to Release")
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(QHOTKEY_INSTALL OFF CACHE BOOL "Disable installing QHotKey" FORCE)
-add_subdirectory(libs)
-
-add_subdirectory(src)
-
-# TODO: find a better way to organize tests
-# add_subdirectory(tests)

README.md

@@ -1,13 +1,11 @@
 # VNote
-![CI-Windows](https://github.com/vnotex/vnote/actions/workflows/ci-win.yml/badge.svg?branch=master) ![CI-Linux](https://github.com/vnotex/vnote/actions/workflows/ci-linux.yml/badge.svg?branch=master) ![CI-MacOS](https://github.com/vnotex/vnote/actions/workflows/ci-macos.yml/badge.svg?branch=master)
+![CI-Windows](https://github.com/vnotex/vnote/workflows/CI-Windows/badge.svg) ![CI-Linux](https://github.com/vnotex/vnote/workflows/CI-Linux/badge.svg) ![CI-MacOS](https://github.com/vnotex/vnote/workflows/CI-MacOS/badge.svg)
 
 [简体中文](README_zh_CN.md)
 
-[Project on Gitee](https://gitee.com/vnotex/vnote)
-
 A pleasant note-taking platform.
 
-For more information, please visit [**VNote's Home Page**](https://vnotex.github.io/vnote).
+For more information, please visit [**VNote's Home Page**](https://vnotex.github.io/vnote) or [Home Page on Gitee](https://tamlok.gitee.io/vnote).
 
 ![VNote](pics/vnote.png)
 
@@ -20,22 +18,39 @@ Utilizing Qt, VNote could run on **Linux**, **Windows**, and **macOS**.
 
 ![Main](pics/main.png)
 
-![Main2](pics/main2.png)
-
 ## Downloads
 Continuous builds on `master` branch could be found at the [Continuous Build](https://github.com/vnotex/vnote/releases/tag/continuous-build) release.
 
 Latest stable builds could be found at the [latest release](https://github.com/vnotex/vnote/releases/latest). Alternative download services are available:
 
 * [Tianyi Netdisk](https://cloud.189.cn/t/Av67NvmEJVBv)
-* [Baidu Netdisk](https://pan.baidu.com/s/1lX69oMBw8XuJshQDN3HiHw?pwd=f8fk)
+* [Baidu Netdisk](https://pan.baidu.com/s/1Fou1flmBsQUQ8Qs9V_M6Aw) with the code `note`
 
 ## Supports
 * [GitHub Issues](https://github.com/vnotex/vnote/issues);
 * Email: `tamlokveer at gmail.com`;
+* [Slack](https://join.slack.com/t/vnote/shared_invite/enQtNDg2MzY0NDg3NzI4LTVhMzBlOTY0YzVhMmQyMTFmZDdhY2M3MDQxYTBjOTA2Y2IxOGRiZjg2NzdhMjkzYmUyY2VkMWJlZTNhMTQyODU);
 * [Telegram](https://t.me/vnotex);
 * WeChat Public Account: vnotex;
 
+## Donate
+You could help VNote's development in many ways.
+
+* Keep monitoring VNote and sending feedback for improvement.
+* Spread and promote VNote to your friends. Popularity is a strong power to drive developers.
+* Participate in the development of VNote and send [Pull Request](https://github.com/vnotex/vnote/pulls) to make VNote perfect.
+* Last, really appreciate your donations to VNote if VNote does help.
+
+**PayPal**: [PayPal.Me/vnotemd](https://www.paypal.me/vnotemd)
+
+**Alipay**: `tamlokveer@gmail.com`
+
+<img src="pics/alipay.png" width="256px" height="256px" />
+
+**WeChat**
+
+<img src="pics/wechat_pay.png" width="256px" height="256px" />
+
 Thank [users who donated to VNote](https://github.com/vnotex/vnote/wiki/Donate-List)!
 
 ## License

README_zh_CN.md

@@ -1,42 +1,57 @@
 # VNote
-![CI-Windows](https://github.com/vnotex/vnote/actions/workflows/ci-win.yml/badge.svg?branch=master) ![CI-Linux](https://github.com/vnotex/vnote/actions/workflows/ci-linux.yml/badge.svg?branch=master) ![CI-MacOS](https://github.com/vnotex/vnote/actions/workflows/ci-macos.yml/badge.svg?branch=master)
+![CI-Windows](https://github.com/vnotex/vnote/workflows/CI-Windows/badge.svg) ![CI-Linux](https://github.com/vnotex/vnote/workflows/CI-Linux/badge.svg) ![CI-MacOS](https://github.com/vnotex/vnote/workflows/CI-MacOS/badge.svg)
 
 [English](README.md)
 
-[Gitee托管项目](https://gitee.com/vnotex/vnote)
-
 一个舒适的笔记平台！
 
-更多信息，请访问[VNote主页](https://vnotex.github.io/vnote)。
+更多信息，请访问 [VNote 主页](https://tamlok.gitee.io/vnote) 或者[由 Gitee 托管的主页](https://tamlok.gitee.io/vnote) 。
 
 ![VNote](pics/vnote.png)
 
 ## 简介
-**VNote**是一个专注于Markdown的基于Qt的开源免费的笔记应用。VNote希望能提供一个拥有完美编辑体验的舒适的笔记平台。
+**VNote** 是一个专注于 Markdown 的基于 Qt 的开源免费的笔记应用。VNote 希望能提供一个拥有完美编辑体验的舒适的笔记平台。
 
-VNote不是一个简单的Markdown编辑器。通过提供强大的笔记管理，VNote使得使用Markdown记笔记更轻松简单。将来，VNote会支持更多的文档格式。
+VNote 不是一个简单的 Markdown 编辑器。通过提供强大的笔记管理，VNote 使得使用 Markdown 记笔记更轻松简单。将来，VNote 会支持更多的文档格式。
 
-得益于Qt，VNote当前可以高效地运行在**Linux**，**Windows**，以及**macOS**平台上。
+得益于 Qt，VNote 当前可以高效地运行在 **Linux** ， **Windows** ，以及 **macOS** 平台上。
 
 ![主界面](pics/main.png)
 
-![主界面2](pics/main2.png)
-
 ## 下载
-基于`master`分支的[持续构建版本发布](https://github.com/vnotex/vnote/releases/tag/continuous-build)。
+基于 `master` 分支的 [持续构建版本发布](https://github.com/vnotex/vnote/releases/tag/continuous-build) 。
 
-最新的[稳定版本发布](https://github.com/vnotex/vnote/releases/latest)。其他下载选项：
+最新的 [稳定版本发布](https://github.com/vnotex/vnote/releases/latest) 。 其他下载选项：
 
 * [天翼云盘](https://cloud.189.cn/t/Av67NvmEJVBv)
-* [百度云盘](https://pan.baidu.com/s/1lX69oMBw8XuJshQDN3HiHw?pwd=f8fk)
+* [百度云盘](https://pan.baidu.com/s/1Fou1flmBsQUQ8Qs9V_M6Aw) 提取码 `note`
 
 ## 支持
-* [GitHub Issues](https://github.com/vnotex/vnote/issues)；
-* 邮件：`tamlokveer at gmail.com`；
-* [Telegram](https://t.me/vnotex)；
-* 微信公众号：`vnotex`；
+* [GitHub Issues](https://github.com/vnotex/vnote/issues) ；
+* 邮件： `tamlokveer at gmail.com` ；
+* [Slack](https://join.slack.com/t/vnote/shared_invite/enQtNDg2MzY0NDg3NzI4LTVhMzBlOTY0YzVhMmQyMTFmZDdhY2M3MDQxYTBjOTA2Y2IxOGRiZjg2NzdhMjkzYmUyY2VkMWJlZTNhMTQyODU) ；
+* [Telegram](https://t.me/vnotex) ；
+* 微信公众号： vnotex ；
 
-感谢这些[捐赠用户](https://github.com/vnotex/vnote/wiki/Donate-List)！
+## 捐赠
+有很多方式可以帮助 VNote 的开发：
+
+* 持续关注 VNote 并反馈问题以帮助改进；
+* 推荐 VNote 给朋友，口碑传播；
+* 参与 VNote 的开发，发起 [拉取请求](https://github.com/vnotex/vnote/pulls) 一起改进 VNote；
+* 如果 VNote 真的好用，可以考虑捐赠；
+
+**PayPal**: [PayPal.Me/vnotemd](https://www.paypal.me/vnotemd)
+
+**支付宝**: `tamlokveer@gmail.com`
+
+<img src="pics/alipay.png" width="256px" height="256px" />
+
+**微信**
+
+<img src="pics/wechat_pay.png" width="256px" height="256px" />
+
+感谢这些 [捐赠用户](https://github.com/vnotex/vnote/wiki/Donate-List) ！
 
 ## 许可
-VNote遵循[GNU LGPLv3](https://opensource.org/licenses/LGPL-3.0)许可。VNote项目的代码可以自由给VNoteX项目使用。
+VNote 遵循 [GNU LGPLv3](https://opensource.org/licenses/LGPL-3.0) 许可。VNote 项目的代码可以自由给 VNoteX 项目使用。

SECURITY.md

@@ -1,15 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only the latest version is supported with security updates.
-
-## Reporting a Vulnerability
-
-Please [contact support](mailto:tamlokveer@gmail.com) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.
-
-For general opinions on what makes an app more or less secure, please use the forum.
-
-## Bounty
-
-We **do not** offer a bounty for discovering vulnerabilities, please do not ask. We can however credit you and link to your website/profile in the changelog and release announcement.

changes.md

@@ -1,136 +1,4 @@
 # Changes
-## v3.19.2
-* Codesign MacOS Bundle
-* Fix toolbar expansion button style
-* Support hot-reloading of theme via --watch-themes option
-
-## v3.19.1
-* Fix toolbar button in Qt 6.8
-
-## v3.19.0
-* Add VSCode-sytle editor shortcuts
-
-## v3.18.1
-* Fix crash caused by Qt6 change
-* Fix XSS protection exemption
-* Check link before open
-
-## v3.18.0
-* Upgrade to Qt6
-* Support MacOS universal build
-* Upgrade Mermaid, Flowchart.js, and markdown-it
-* Markdown-it
-    * Fix XSS protection and turn it on by default
-    * Support mark by `==xx==`
-
-## v3.17.0
-* Quick note: create note in given scheme (@feloxx)
-* MarkdownEditor: support inserting multiple images (@feloxx)
-* Mermaid: upgrade and fix preview issue (@ygcaicn)
-* Flowchart.js: upgrade
-
-## 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
-* Theme: add Vue-light theme
-* Support default open mode
-* NotebookSelector: support dynamic icons for notebooks
-
-## v3.14.0
-* Theme: support custom icons
-* Theme: refine icons
-* NavigationMode: fix issue for input method
-
-## v3.13.1
-* Shortcuts for Copy/Paste/Properties in node explorer
-* Global shortcut to call out main window
-* UnitedEntry: bug fix for macOS
-
-## v3.13.0
-* United Entry: migration of Universal Entry
-
-## v3.12.888
-* Fix shortcuts in key sequence with input method (like `Ctrl+G, E`)
-* Add line ending settings for config files
-* FindAndReplace: fix zero-length search
-* QuickAccess: support folders
-* Upgrade to Qt 5.15.2
-* Support file associations
-* NewNoteDialog: remember default file type
-
-## v3.12.0
-* NotebookExplorer: support separate node explorer
-* Theme: add user-provided VSCode-Dark theme
-* MarkdownEditor: use web to highlight code blocks
-* MarkdownViewWindow
-    * Add switch for code block line number
-    * Fix ParseToMarkdown `<style>` issue
-    * Add config for overridding MathJax script
-* SortDialog: fix sorting issue of date
-* FramelessMainWindow: fix StayOnTop issue
-
-## v3.11.0
-* Task: support a simple task system (@tootal)
-* Theme: add user-provided Solarized-Dark and Solarized-Light themes
-* Export: fix wkhtmltopdf table-of-contents translation
-* Support equation begin in MathJax
-* MainWindow: decide DPI on the screen vnote starts
-* Settings: support searching
-* Fix crash caused by Youdao Dict
-
-## v3.10.1
-* MarkdownEditor: fix view mode issue
-* Support print
-* Refine icons
-
-## v3.10.0
-* MarkdownEditor
-    * Support side-by-side edit with preview
-    * Support config for highlighting whitespace
-* Tag: fix input method issue on macOS
-
-## v3.9.0
-* Remove recycle bin node (now recycle bin is just a simple folder)
-* Quick Access: support removing items directly
-* MarkdownEditor
-    * Support centering images in read mode
-    * Add user.css for user styles in read mode
-    * Add debugger by F12
-    * Support context-sensitive context menu for images and links
-
-## v3.8.0
-* Support tags
-* Introduce notebook database using SQLITE
-* A perfect frameless main window on Windows
-* Add switch to control whether store history in notebook
-* Refine dock widgets of main window
-* NotebookExplorer: support scan notebook and import external files
-
-## v3.7.0
-* PlantUml/Graphviz: support relative path executable
-* macOS: support opening file with VNote in Finder
-* Sort notes by name case-insensitively
-* Export
-    * Support All-in-One in PDF format
-    * Support Custom export format (like Pandoc)
-    * Allow minimizing the export dialog and doing export at background
-* MainWindow: use icon-only bar for docks
-* Support update check
-* Add shortcuts for CloseOtherTabs and CloseTabsToTheRight
-* Search: highlight matched items in opened files
-* Editor: support specifying line ending
-
 ## v3.6.0
 * Support **Image Host**: GitHub and Gitee
 * Add config page for Vi

libs/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_subdirectory(QHotkey)
-add_subdirectory(vtextedit)

libs/QHotkey

@@ -1 +0,0 @@
-Subproject commit 8abe0b2280533af57f423f5785acc4d9d4d73ab8

libs/libs.pro

@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    vtextedit

libs/vtextedit

@@ -1 +1 @@
-Subproject commit 50b1421793af3882ddc62ad4e6cf5537e1d7906f
+Subproject commit 77cf66845ac2dee3e49cee440f5a6b40b777e8bd

package/QtWebEngineProcess.entitlements.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.disable-executable-page-protection</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-write</key>
-    <true/>
-    <key>com.apple.security.network.client</key>
-    <true/>
-    <key>com.apple.security.get-task-allow</key>
-    <true/>
-    <key>com.apple.security.cs.debugger</key>
-    <true/>
-    <key>com.apple.security.inherit</key>
-    <true/>
-</dict>
-</plist>

package/entitlements.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>com.apple.security.files.user-selected.read-write</key>
-        <true/>
-        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-        <true/>
-        <key>com.apple.security.network.client</key>
-        <true/>
-        <key>com.apple.security.cs.allow-jit</key>
-        <true/>
-        <key>com.apple.security.cs.disable-library-validation</key>
-        <true/>
-        <key>com.apple.security.cs.disable-executable-page-protection</key>
-        <true/>
-        <key>com.apple.security.get-task-allow</key>
-        <true/>
-        <key>com.apple.security.cs.debugger</key>
-        <true/>
-        <key>com.apple.security.inherit</key>
-        <true/>
-    </dict>
-</plist>

package/lgpl-3.0.rtf

@@ -1,110 +0,0 @@
-{\rtf1\ansi\deff3\adeflang1025
-{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\fswiss\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f5\froman\fprq0\fcharset128 Helvetica{\*\falt Arial};}{\f6\fnil\fprq2\fcharset0 Droid Sans Fallback;}{\f7\fnil\fprq2\fcharset0 FreeSans;}{\f8\fswiss\fprq0\fcharset128 FreeSans;}}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue128;\red128\green128\blue128;}
-{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033 Normal;}
-{\*\cs15\snext15\cf2\ul\ulc0\langfe255\alang255\lang255 Internet Link;}
-{\s16\sbasedon0\snext17\sb240\sa120\keepn\dbch\af6\dbch\af7\afs28\loch\f4\fs28 Heading;}
-{\s17\sbasedon0\snext17\sl288\slmult1\sb0\sa140 Text Body;}
-{\s18\sbasedon17\snext18\sl288\slmult1\sb0\sa140\dbch\af8 List;}
-{\s19\sbasedon0\snext19\sb120\sa120\noline\i\dbch\af8\afs24\ai\fs24 Caption;}
-{\s20\sbasedon0\snext20\noline\dbch\af8 Index;}
-}{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment LibreOffice}{\vern67241986}}\deftab720
-\viewscale100
-{\*\pgdsctbl
-{\pgdsc0\pgdscuse451\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\pgdscnxt0 Default Style;}}
-\formshade{\*\pgdscno0}\paperh15840\paperw12240\margl1800\margr1800\margt1440\margb1440\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
-\pgndec\pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs28\loch\f5
-GNU LESSER GENERAL PUBLIC LICENSE}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-Version 3, 29 June 2007}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-Copyright \u169\'3f 2007 Free Software Foundation, Inc. <}{{\field{\*\fldinst HYPERLINK "https://fsf.org/" }{\fldrslt {\cf2\ul\ulc0\langfe255\alang255\lang255\ul\ulc0\rtlch \ltrch\loch\loch\f5
-https://fsf.org/}{}}}\rtlch \ltrch\loch\loch\f5
->}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs24\loch\f5
-0. Additional Definitions.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-As used herein, \uc2 \u8220\'81\'67this License\u8221\'81\'68 refers to version 3 of the GNU Lesser General Public License, and the \u8220\'81\'67GNU GPL\u8221\'81\'68 refers to version 3 of the GNU General Public License.\uc1 }
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\f5
-\uc2 \u8220\'81\'67\uc1 }{\rtlch \ltrch\loch\loch\f5
-The Library\uc2 \u8221\'81\'68 refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.\uc1 }
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-An \uc2 \u8220\'81\'67Application\u8221\'81\'68 is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.\uc1 }
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-A \uc2 \u8220\'81\'67Combined Work\u8221\'81\'68 is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the \u8220\'81\'67Linked Version\u8221\'81\'68.\uc1 }
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-The \uc2 \u8220\'81\'67Minimal Corresponding Source\u8221\'81\'68 for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.\uc1 }
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-The \uc2 \u8220\'81\'67Corresponding Application Code\u8221\'81\'68 for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.\uc1 }
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs24\loch\f5
-1. Exception to Section 3 of the GNU GPL.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs24\loch\f5
-2. Conveying Modified Versions.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs24\loch\f5
-3. Object Code Incorporating Material from Library Header Files.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab b) Accompany the object code with a copy of the GNU GPL and this license document.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs24\loch\f5
-4. Combined Works.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab b) Accompany the Combined Work with a copy of the GNU GPL and this license document.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab d) Do one of the following:}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li720\ri0\lin720\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8211\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li720\ri0\lin720\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8211\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs24\loch\f5
-5. Combined Libraries.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li360\ri0\lin360\rin0\fi-360\sb0\sa0{\rtlch \ltrch\loch\f5
-\u8226\'3f}{\rtlch \ltrch\loch\loch\f5
-\tab b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\b\rtlch \ltrch\loch\fs24\loch\f5
-6. Revised Versions of the GNU Lesser General Public License.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.}
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License \uc2 \u8220\'81\'67or any later version\u8221\'81\'68 applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.\uc1 }
-\par \pard\plain \s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\dbch\af6\langfe2052\dbch\af7\afs24\alang1081\loch\f3\fs24\lang1033\ql\li0\ri0\lin0\rin0\fi0\sb0\sa180{\rtlch \ltrch\loch\loch\f5
-If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.}
-\par }

package/qt.conf

@@ -1,2 +0,0 @@
-[Platforms]
-WindowsArguments = fontengine=freetype

privacy_policy.md

@@ -1,26 +0,0 @@
-# Privacy Policy
-
-## Introduction
-Welcome to VNote! We value your privacy and are committed to protecting your personal information. This Privacy Policy explains how we handle your information when you use our application.
-
-## Information We Collect
-VNote does not collect any personal or usage data from its users. Your interactions with the app remain private and are not stored or shared.
-
-## How We Use Your Information
-Since VNote does not collect any user data, we do not use, store, or process any personal information.
-
-## Sharing Your Information
-As VNote does not collect any user data, we do not share any personal information with third parties.
-
-## Security
-While VNote does not collect any user data, we still implement security measures to ensure the integrity and safety of the application itself.
-
-## Your Choices
-Since no data is collected, there are no choices or actions required from users regarding their personal information.
-
-## Children's Privacy
-Our services are not intended for children under the age of 13. We do not knowingly collect personal information from children under 13.
-
-## Changes to This Privacy Policy
-We may update this Privacy Policy from time to time. We will notify you of any changes by posting the new Privacy Policy on our app. You are advised to review this Privacy Policy periodically for any changes.
-

scripts/coc_update.cmd

@@ -0,0 +1,33 @@
+@echo off
+rem Update .ccls project file for ccls LPS and compile_flags.txt for clangd
+
+if "%~1"=="" (
+    echo missing argument: the location of Qt's include directory
+    EXIT /B 0
+)
+
+set qt_inc=%~1
+set qt_inc=%qt_inc:\=\\%
+
+(
+    echo clang
+    echo -fcxx-exceptions
+    echo -std=c++14
+    echo -Isrc\\core
+    echo -Isrc
+    echo -Ilibs\\vtextedit\\src\\editor\\include
+    echo -Ilibs\\vtitlebar\\src
+    echo -I%qt_inc%
+    echo -I%qt_inc%\\QtCore
+    echo -I%qt_inc%\\QtWebEngineWidgets
+    echo -I%qt_inc%\\QtSvg
+    echo -I%qt_inc%\\QtPrintSupport
+    echo -I%qt_inc%\\QtWidgets
+    echo -I%qt_inc%\\QtWebEngineCore
+    echo -I%qt_inc%\\QtGui
+    echo -I%qt_inc%\\QtWebChannel
+    echo -I%qt_inc%\\QtNetwork
+    echo -I%qt_inc%\\QtTest
+) > ".ccls"
+
+copy /Y .ccls compile_flags.txt

scripts/coc_update.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+if [ -n "$1" ]; then
+    echo Qt include directory: $1
+else
+    echo Please specify the Qt include directory.
+    exit
+fi
+
+ccls_file=".ccls"
+
+echo clang > $ccls_file
+echo -fcxx-exceptions >> $ccls_file
+echo -std=c++14 >> $ccls_file
+echo -Isrc/core >> $ccls_file
+echo -Isrc >> $ccls_file
+echo -Ilibs/vtextedit/src/editor/include >> $ccls_file
+echo -Ilibs/vtitlebar/src >> $ccls_file
+echo -I$1 >> $ccls_file
+echo -I$1/QtCore >> $ccls_file
+echo -I$1/QtWebEngineWidgets >> $ccls_file
+echo -I$1/QtSvg >> $ccls_file
+echo -I$1/QtPrintSupport >> $ccls_file
+echo -I$1/QtWidgets >> $ccls_file
+echo -I$1/QtWebEngineCore >> $ccls_file
+echo -I$1/QtGui >> $ccls_file
+echo -I$1/QtWebChannel >> $ccls_file
+echo -I$1/QtNetwork >> $ccls_file
+echo -I$1/QtTest >> $ccls_file
+
+cp -f .ccls compile_flags.txt

scripts/update_version.py

@@ -7,14 +7,8 @@ if len(sys.argv) < 2:
     exit
 
 newVersion = sys.argv[1]
-shortVersion = re.match('^(\\d+\\.\\d+).', newVersion).group(1)
 print("New version: {0}".format(newVersion))
 
-# CMakeList
-regExp = re.compile('(\\s+)VERSION \\S+')
-for line in fileinput.input(['CMakeLists.txt'], inplace = True):
-    print(regExp.sub('\\1VERSION ' + newVersion, line), end='')
-
 # vnotex.json
 regExp = re.compile('(\\s+)"version" : "\\S+"')
 for line in fileinput.input(['src/data/core/vnotex.json'], inplace = True):
@@ -26,14 +20,10 @@ for line in fileinput.input(['.github/workflows/ci-win.yml', '.github/workflows/
     print(regExp.sub('\\1VNOTE_VER: ' + newVersion, line), end='')
 
 # Info.plist
-regExp = re.compile('(\\s+)<string>(?!10\\.15)\\d+\\.\\d+</string>')
-for line in fileinput.input(['src/data/core/Info.plist'], inplace = True):
-    print(regExp.sub('\\1<string>' + shortVersion + '</string>', line), end='')
-
-regExp = re.compile('(\\s+)<string>\\d+\\.\\d+\\.\\d+</string>')
+regExp = re.compile('(\\s+)<string>\\d\\.\\d\\.\\d</string>')
 for line in fileinput.input(['src/data/core/Info.plist'], inplace = True):
     print(regExp.sub('\\1<string>' + newVersion + '</string>', line), end='')
 
-regExp = re.compile('(\\s+)<string>\\d+\\.\\d+\\.\\d+\\.\\d+</string>')
+regExp = re.compile('(\\s+)<string>\\d\\.\\d\\.\\d\\.\\d</string>')
 for line in fileinput.input(['src/data/core/Info.plist'], inplace = True):
     print(regExp.sub('\\1<string>' + newVersion + '.1</string>', line), end='')

src/CMakeLists.txt

@@ -1,179 +0,0 @@
-cmake_minimum_required(VERSION 3.20)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_INSTALL_BINDIR "." CACHE STRING "Binary dir for install")
-
-set(QT_DEFAULT_MAJOR_VERSION 6 CACHE STRING "Qt version to use (5 or 6), defaults to 6")
-find_package(Qt${QT_DEFAULT_MAJOR_VERSION} REQUIRED COMPONENTS Core Gui Network PrintSupport Sql Svg Widgets WebChannel WebEngineWidgets LinguistTools)
-find_package(Qt${QT_DEFAULT_MAJOR_VERSION} OPTIONAL_COMPONENTS Core5Compat)
-
-if ((QT_DEFAULT_MAJOR_VERSION GREATER 5))
-    qt_standard_project_setup()
-else()
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_AUTORCC ON)
-    set(CMAKE_AUTOUIC ON)
-endif()
-
-# Application icon on Windows
-set(VX_APP_ICON_RC_WIN data/core/icons/vnote.rc)
-
-# The MACOSX_BUNDLE_ICON_FILE variable is added to the Info.plist
-# generated by CMake. This variable contains the .icns file name,
-# without the path.
-set(MACOSX_BUNDLE_ICON_FILE vnote.icns)
-# And the following tells CMake where to find and install the file itself.
-set(VX_APP_ICON_MACOS data/core/icons/vnote.icns)
-set_source_files_properties(${VX_APP_ICON_MACOS} PROPERTIES
-    MACOSX_PACKAGE_LOCATION "Resources")
-
-# Translations
-set(VX_TS_FILES data/core/translations/vnote_zh_CN.ts
-    data/core/translations/vnote_ja.ts)
-if((QT_DEFAULT_MAJOR_VERSION EQUAL 6))
-    if((Qt6Widgets_VERSION VERSION_GREATER_EQUAL 6.7.0))
-        qt_add_lupdate(TS_FILES ${VX_TS_FILES}
-            SOURCE_TARGETS vnote)
-    else()
-        qt_add_lupdate(vnote TS_FILES ${VX_TS_FILES})
-    endif()
-endif()
-# Generate .qm files from .ts files (lrelease)
-set_source_files_properties(${VX_TS_FILES} PROPERTIES
-    OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/translations")
-qt_add_translation(VX_QM_FILES ${VX_TS_FILES})
-add_custom_target(lrelease DEPENDS ${VX_QM_FILES})
-
-# TODO: VTextEdit translations
-list(APPEND VX_QM_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/data/core/translations/qdialogbuttonbox_zh_CN.qm
-    ${CMAKE_CURRENT_LIST_DIR}/data/core/translations/qtbase_ja.qm
-    ${CMAKE_CURRENT_LIST_DIR}/data/core/translations/qtbase_zh_CN.qm
-    ${CMAKE_CURRENT_LIST_DIR}/data/core/translations/qtv_ja.qm
-    ${CMAKE_CURRENT_LIST_DIR}/data/core/translations/qtv_zh_CN.qm
-    ${CMAKE_CURRENT_LIST_DIR}/data/core/translations/qwebengine_zh_CN.qm
-)
-
-# Resources
-set(VX_RESOURCE_FILES data/core/core.qrc)
-set(VX_EXTRA_RESOURCE_FILES_RCC ${CMAKE_CURRENT_BINARY_DIR}/vnote_extra.rcc)
-qt_add_binary_resources(VX_EXTRA_RESOURCE data/extra/extra.qrc DESTINATION ${VX_EXTRA_RESOURCE_FILES_RCC} OPTIONS -compress 9)
-
-add_executable(vnote WIN32 MACOSX_BUNDLE
-    application.cpp application.h
-    commandlineoptions.cpp commandlineoptions.h
-    fakeaccessible.cpp fakeaccessible.h
-    main.cpp
-    ${VX_APP_ICON_RC_WIN} ${VX_APP_ICON_MACOS} ${VX_RESOURCE_FILES}
-)
-
-add_dependencies(vnote VX_EXTRA_RESOURCE)
-
-set(VX_LIBS_FOLDER ../libs)
-target_include_directories(vnote PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-find_program(GOLD_LINKER "ld.gold")
-if (NOT ${GOLD_LINKER} STREQUAL GOLD_LINKER-NOTFOUND)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
-endif()
-
-target_compile_definitions(vnote PRIVATE
-    QT_MESSAGELOGCONTEXT
-)
-
-add_subdirectory(core)
-add_subdirectory(export)
-add_subdirectory(imagehost)
-add_subdirectory(search)
-add_subdirectory(snippet)
-add_subdirectory(task)
-add_subdirectory(unitedentry)
-add_subdirectory(utils)
-add_subdirectory(widgets)
-
-target_link_libraries(vnote PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::Network
-    Qt::PrintSupport
-    Qt::Sql
-    Qt::Svg
-    Qt::WebChannel
-    Qt::WebEngineWidgets
-    Qt::Widgets
-    VTextEdit
-    qhotkey
-)
-
-if((QT_DEFAULT_MAJOR_VERSION GREATER 5))
-    target_link_libraries(vnote PRIVATE
-        Qt::Core5Compat
-    )
-endif()
-
-# Copy the qt.conf on Windows
-if(WIN32)
-    add_custom_command(TARGET vnote POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${PROJECT_SOURCE_DIR}/package/qt.conf" $<TARGET_FILE_DIR:vnote>)
-endif()
-
-# Installation
-if (WIN32)
-    install(TARGETS vnote RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-    install(FILES "${PROJECT_SOURCE_DIR}/package/qt.conf" DESTINATION ${CMAKE_INSTALL_BINDIR})
-    install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_BINDIR})
-    install(FILES ${VX_QM_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}/translations" OPTIONAL)
-elseif(APPLE)
-    set(CMAKE_MACOSX_RPATH ON)
-
-    # TODO: declare install for macOS if necessary. For packing, we will manually copy files into
-    # the src/vnote.app bundle.
-
-    # The generated Info.plist will be overridden.
-    set_target_properties(vnote
-        PROPERTIES
-        OUTPUT_NAME "${PROJECT_NAME}"
-        MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
-        MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}"
-        MACOSX_BUNDLE_GUI_IDENTIFIER "fun.vnote.vnote"
-        MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}"
-        MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
-        MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}"
-        MACOSX_BUNDLE_COPYRIGHT "Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun"
-    )
-else()
-    install(TARGETS vnote
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    )
-    install(FILES ${VX_EXTRA_RESOURCE_FILES_RCC} DESTINATION ${CMAKE_INSTALL_DATADIR})
-    install(FILES ${VX_QM_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/translations" OPTIONAL)
-
-    set(desktop.path applications)
-    set(desktop.files data/core/vnote.desktop)
-    set(icon16.path icons/hicolor/16x16/apps)
-    set(icon16.files data/core/logo/16x16/vnote.png)
-    set(icon32.path icons/hicolor/32x32/apps)
-    set(icon32.files data/core/logo/32x32/vnote.png)
-    set(icon48.path icons/hicolor/48x48/apps)
-    set(icon48.files data/core/logo/48x48/vnote.png)
-    set(icon64.path icons/hicolor/64x64/apps)
-    set(icon64.files data/core/logo/64x64/vnote.png)
-    set(icon128.path icons/hicolor/128x128/apps)
-    set(icon128.files data/core/logo/128x128/vnote.png)
-    set(icon256.path icons/hicolor/256x256/apps)
-    set(icon256.files data/core/logo/256x256/vnote.png)
-    set(iconsvg.path icons/hicolor/scalable/apps)
-    set(iconsvg.files data/core/logo/vnote.svg)
-    foreach(item IN ITEMS desktop icon16 icon32 icon48 icon64 icon128 icon256 iconsvg)
-        install(FILES ${CMAKE_CURRENT_LIST_DIR}/${${item}.files}
-            DESTINATION ${CMAKE_INSTALL_DATADIR}/${${item}.path}
-            PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-    endforeach()
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/Packaging.cmake)

src/CPackLinuxDeployQt.cmake.in

@@ -1,16 +0,0 @@
-message(STATUS "VX_APPIMAGE_DEST_DIR ${VX_APPIMAGE_DEST_DIR}")
-message(STATUS "VX_APPIMAGE_DESKTOP_FILE ${VX_APPIMAGE_DESKTOP_FILE}")
-
-execute_process(
-    COMMAND ${CMAKE_MAKE_PROGRAM} DESTDIR=${VX_APPIMAGE_DEST_DIR} install
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-execute_process(
-    COMMAND env QMAKE=${QMAKE_EXECUTABLE} LD_LIBRARY_PATH=/usr/local/lib64:$ENV{LD_LIBRARY_PATH} "${LINUXDEPLOY_EXECUTABLE}" --plugin=qt --output=appimage
-        --appdir=${VX_APPIMAGE_DEST_DIR} -e ${CMAKE_CURRENT_BINARY_DIR}/vnote -d ${VX_APPIMAGE_DESKTOP_FILE}
-        -i ${CMAKE_CURRENT_LIST_DIR}/data/core/logo/64x64/vnote.png
-        -l ${QT_PLUGINS_DIR}/platformthemes/libqgtk3.so
-        -l /usr/local/lib64/libcrypto.so.3
-        -l /usr/local/lib64/libssl.so.3
-        # --exclude-library option does not work as expected
-        # --exclude-library=libssl.so.1.1,libcrypto.so.1.1,libnss3.so,libnssutil3.so
-    WORKING_DIRECTORY ${CPACK_PACKAGE_DIRECTORY})

src/CPackMacDeployQt.cmake.in

@@ -1,6 +0,0 @@
-execute_process(COMMAND "optool" strip -t ${CMAKE_CURRENT_BINARY_DIR}/VNote.app
-    WORKING_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}
-)
-execute_process(COMMAND "${MACDEPLOYQT_EXECUTABLE}" ${CMAKE_CURRENT_BINARY_DIR}/VNote.app -always-overwrite -verbose=1
-    WORKING_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}
-)

src/Packaging.cmake

@@ -1,165 +0,0 @@
-# from: https://github.com/miurahr/cmake-qt-packaging-example
-find_package(Qt${QT_DEFAULT_MAJOR_VERSION} REQUIRED COMPONENTS Core)
-
-get_target_property(QMAKE_EXECUTABLE Qt::qmake IMPORTED_LOCATION)
-get_filename_component(QT_BIN_DIR "${QMAKE_EXECUTABLE}" DIRECTORY)
-execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_VERSION OUTPUT_VARIABLE QT_VERSION)
-
-set(QT_TOOLS_DIR "${QT_BIN_DIR}/../../../Tools")
-cmake_path(NORMAL_PATH QT_TOOLS_DIR OUTPUT_VARIABLE QT_TOOLS_DIR)
-
-set(QT_PLUGINS_DIR "${QT_BIN_DIR}/../plugins")
-cmake_path(NORMAL_PATH QT_PLUGINS_DIR OUTPUT_VARIABLE QT_PLUGINS_DIR)
-
-# To use the specific version of Qt
-set(WINDEPLOYQT_EXECUTABLE "${QT_BIN_DIR}/windeployqt.exe")
-
-find_program(LINUXDEPLOY_EXECUTABLE linuxdeploy linuxdeploy-x86_64.AppImage HINTS "${QT_BIN_DIR}")
-find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QT_BIN_DIR}")
-find_program(MACDEPLOYQTFIX_EXECUTABLE macdeployqtfix.py HINTS "${QT_BIN_DIR}")
-find_package(Python)
-
-function(windeployqt target)
-    # Bundle Library Files
-    string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER)
-
-    if ((QT_DEFAULT_MAJOR_VERSION GREATER 5))
-        if(CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG")
-            set(WINDEPLOYQT_ARGS --debug)
-        else()
-            set(WINDEPLOYQT_ARGS --release)
-        endif()
-    endif()
-
-    add_custom_target(deploy
-        COMMAND "${CMAKE_COMMAND}" -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/winqt/"
-        COMMAND "${CMAKE_COMMAND}" -E
-            env PATH="${QT_BIN_DIR}" "${WINDEPLOYQT_EXECUTABLE}"
-            ${WINDEPLOYQT_ARGS}
-            --no-quick-import
-            --no-opengl-sw
-            --no-compiler-runtime
-            --translations zh_CN,ja
-            --dir "${CMAKE_CURRENT_BINARY_DIR}/winqt/"
-            $<TARGET_FILE:${target}>
-        COMMAND "${CMAKE_COMMAND}" -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/winqt/generic/"
-        COMMAND "${CMAKE_COMMAND}" -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/winqt/styles/"
-        COMMAND "${CMAKE_COMMAND}" -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/winqt/qmltooling/"
-        COMMENT "Deploying Qt..."
-        DEPENDS vnote lrelease
-    )
-
-    add_dependencies(pack deploy)
-
-    install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/winqt/" DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
-
-    set(OPENSSL_ROOT_DIR "${QT_TOOLS_DIR}/OpenSSL/Win_x64" CACHE STRING "OpenSSL dir")
-    file(GLOB OPENSSL_LIBS_FILES "${OPENSSL_ROOT_DIR}/bin/lib*.dll")
-    cmake_path(NORMAL_PATH OPENSSL_LIBS_FILES OUTPUT_VARIABLE OPENSSL_LIBS_FILES)
-    install(FILES ${OPENSSL_LIBS_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
-
-    message(STATUS "OpenSSLExtraLIBDIR:${OPENSSL_EXTRA_LIB_DIR}")
-    file(GLOB OPENSSL_EXTRA_LIB_FILES "${OPENSSL_EXTRA_LIB_DIR}/lib*.dll")
-    cmake_path(NORMAL_PATH OPENSSL_EXTRA_LIB_FILES OUTPUT_VARIABLE OPENSSL_EXTRA_LIB_FILES)
-    message(STATUS "OpenSSLExtraLibFiles:${OPENSSL_EXTRA_LIB_FILES}")
-    install(FILES ${OPENSSL_EXTRA_LIB_FILES} DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
-
-    set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
-    include(InstallRequiredSystemLibraries)
-endfunction()
-
-set(CPACK_PACKAGE_VENDOR "VNoteX")
-set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
-set(CPACK_PACKAGE_CONTACT "Le Tan <tamlokveer@gmail.com>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING.LESSER")
-set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
-
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
-set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}")
-
-# Start menu entry on Windows
-set(CPACK_PACKAGE_EXECUTABLES "vnote" "VNote")
-# Desktop link on Windows
-set(CPACK_CREATE_DESKTOP_LINKS "vnote")
-
-set(CPACK_STRIP_FILES TRUE)
-
-# WIX generator
-set(CPACK_WIX_UPGRADE_GUID BA25F337-991A-4893-9D8A-AD5E89BAF5C4)
-set(CPACK_WIX_PRODUCT_GUID BA25F337-991A-4893-9D8A-AD5E89BAF5C4)
-set(CPACK_WIX_LICENSE_RTF "${PROJECT_SOURCE_DIR}/package/lgpl-3.0.rtf")
-set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_LIST_DIR}/data/core/icons/vnote.ico")
-set(CPACK_WIX_UI_BANNER "${PROJECT_SOURCE_DIR}/package/wix_banner.png")
-set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/package/wix_dialog.png")
-
-#------------------------------------------------------------------------------
-# include CPack, so we get target for packages
-set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/BundleConfig.cmake")
-
-add_custom_target(pack
-                  COMMAND ${CMAKE_CPACK_COMMAND} "--config" "${CMAKE_BINARY_DIR}/BundleConfig.cmake" "--verbose"
-                  COMMENT "Running CPACK. Please wait..."
-                  DEPENDS vnote)
-add_dependencies(pack lrelease)
-
-set(CPACK_GENERATOR)
-
-set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_LIST_DIR}/data/core/logo/64x64/vnote.png")
-
-if(WIN32)
-    find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}" DOC "Path to the windeployqt utility")
-
-    list(APPEND CPACK_GENERATOR ZIP)
-    message(STATUS "Package generation - Windows - Zip")
-
-    find_program(WIX_EXECUTABLE wix HINTS "${QT_BIN_DIR}" DOC "Path to the WiX utility")
-
-    if (NOT WIX_EXECUTABLE-NOTFOUND)
-        list(APPEND CPACK_GENERATOR WIX)
-        message(STATUS "Package generation - Windows - WiX")
-    endif()
-
-    windeployqt(vnote)
-elseif(APPLE)
-    # Manually copy resources.
-    set(VX_BUNDLE_CONTENTS_DIR $<TARGET_FILE_DIR:vnote>/..)
-    add_custom_target(deploy
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${CMAKE_CURRENT_LIST_DIR}/data/core/Info.plist" ${VX_BUNDLE_CONTENTS_DIR}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        ${VX_EXTRA_RESOURCE_FILES_RCC} ${VX_BUNDLE_CONTENTS_DIR}/Resources
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${VX_BUNDLE_CONTENTS_DIR}/Resources/translations
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        ${VX_QM_FILES} ${VX_BUNDLE_CONTENTS_DIR}/Resources/translations
-        COMMENT "Copying resources into bundle Contents ${VX_BUNDLE_CONTENTS_DIR}"
-        DEPENDS vnote lrelease
-    )
-    add_dependencies(pack deploy)
-
-    message(STATUS "MACDeployQtExecutable: ${MACDEPLOYQT_EXECUTABLE}")
-    if (MACDEPLOYQT_EXECUTABLE)
-        message(STATUS "Package generation - MacOS - DMG")
-
-        list(APPEND CPACK_GENERATOR External)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CPackMacDeployQt.cmake.in "${CMAKE_BINARY_DIR}/CPackExternal.cmake")
-        set(CPACK_EXTERNAL_PACKAGE_SCRIPT "${CMAKE_BINARY_DIR}/CPackExternal.cmake")
-        include(InstallRequiredSystemLibraries)
-    endif()
-else()
-    message(STATUS "LinuxDeployExecutable: ${LINUXDEPLOY_EXECUTABLE}")
-    if(LINUXDEPLOY_EXECUTABLE)
-        message(STATUS "Package generation - Linux - AppImage")
-
-        list(APPEND CPACK_GENERATOR External)
-        set(VX_APPIMAGE_DEST_DIR "${CPACK_PACKAGE_DIRECTORY}/_CPack_Packages/Linux/External/AppImage")
-        set(VX_APPIMAGE_DESKTOP_FILE "${VX_APPIMAGE_DEST_DIR}${CMAKE_INSTALL_PREFIX}/share/applications/vnote.desktop")
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/CPackLinuxDeployQt.cmake.in "${CMAKE_BINARY_DIR}/CPackExternal.cmake")
-        set(CPACK_EXTERNAL_PACKAGE_SCRIPT "${CMAKE_BINARY_DIR}/CPackExternal.cmake")
-    endif()
-endif()
-
-include(CPack)

src/application.cpp

@@ -1,75 +0,0 @@
-#include "application.h"
-
-#include <QFileOpenEvent>
-#include <QDebug>
-#include <QDir>
-#include <QStyle>
-#include <QFileSystemWatcher>
-#include <QTimer>
-#include <core/vnotex.h>
-
-using namespace vnotex;
-
-Application::Application(int &p_argc, char **p_argv)
-    : QApplication(p_argc, p_argv)
-{
-}
-
-void Application::watchThemeFolder(const QString &p_themeFolderPath)
-{
-    if (p_themeFolderPath.isEmpty()) {
-        return;
-    }
-
-    // Initialize watchers only when needed
-    if (!m_styleWatcher) {
-        m_styleWatcher = new QFileSystemWatcher(this);
-    }
-    if (!m_reloadTimer) {
-        m_reloadTimer = new QTimer(this);
-        m_reloadTimer->setSingleShot(true);
-        m_reloadTimer->setInterval(500); // 500ms debounce delay
-        connect(m_reloadTimer, &QTimer::timeout,
-                this, &Application::reloadThemeResources);
-
-        // Connect file watcher to timer
-        connect(m_styleWatcher, &QFileSystemWatcher::directoryChanged,
-                m_reloadTimer, qOverload<>(&QTimer::start));
-        connect(m_styleWatcher, &QFileSystemWatcher::fileChanged,
-                m_reloadTimer, qOverload<>(&QTimer::start));
-    }
-
-    // Watch the theme folder and its files
-    m_styleWatcher->addPath(p_themeFolderPath);
-
-    // Also watch individual files in the theme folder
-    QDir themeDir(p_themeFolderPath);
-    QStringList files = themeDir.entryList(QDir::Files);
-    for (const QString &file : files) {
-        m_styleWatcher->addPath(themeDir.filePath(file));
-    }
-}
-
-void Application::reloadThemeResources()
-{
-    VNoteX::getInst().getThemeMgr().refreshCurrentTheme();
-
-    auto stylesheet = VNoteX::getInst().getThemeMgr().fetchQtStyleSheet();
-    if (!stylesheet.isEmpty()) {
-        setStyleSheet(stylesheet);
-        style()->unpolish(this);
-        style()->polish(this);
-    }
-}
-
-bool Application::event(QEvent *p_event)
-{
-    // On macOS, we need this to open file from Finder.
-    if (p_event->type() == QEvent::FileOpen) {
-        QFileOpenEvent *openEvent = static_cast<QFileOpenEvent *>(p_event);
-        qDebug() << "request to open file" << openEvent->file();
-        emit openFileRequested(openEvent->file());
-    }
-
-    return QApplication::event(p_event);
-}

src/application.h

@@ -1,34 +0,0 @@
-#ifndef APPLICATION_H
-#define APPLICATION_H
-#include <QApplication>
-
-class QFileSystemWatcher;
-class QTimer;
-
-namespace vnotex
-{
-    class Application : public QApplication
-    {
-        Q_OBJECT
-    public:
-        Application(int &p_argc, char **p_argv);
-
-        // Set up theme folder watcher for hot-reload
-        void watchThemeFolder(const QString &p_themeFolderPath);
-
-        // Reload the theme resources (stylesheet, icons, etc)
-        void reloadThemeResources();
-
-    signals:
-        void openFileRequested(const QString &p_filePath);
-
-    protected:
-        bool event(QEvent *p_event) Q_DECL_OVERRIDE;
-
-    private:
-        QFileSystemWatcher *m_styleWatcher = nullptr;
-        QTimer *m_reloadTimer = nullptr;
-    };
-}
-
-#endif // APPLICATION_H

src/commandlineoptions.cpp

@@ -22,28 +22,18 @@ CommandLineOptions::ParseResult CommandLineOptions::parse(const QStringList &p_a
     const QCommandLineOption verboseOpt("verbose", MainWindow::tr("Print more logs."));
     parser.addOption(verboseOpt);
 
-    const QCommandLineOption logStderrOpt("log-stderr", MainWindow::tr("Log to stderr."));
-    parser.addOption(logStderrOpt);
-
-    const QCommandLineOption watchThemesOpt("watch-themes", MainWindow::tr("Watch theme folder for changes."));
-    parser.addOption(watchThemesOpt);
-
     // WebEngine options.
     // No need to handle them. Just add them to the parser to avoid parse error.
     {
         QCommandLineOption webRemoteDebuggingPortOpt("remote-debugging-port",
                                                      MainWindow::tr("WebEngine remote debugging port."),
-                                                     MainWindow::tr("port_number"));
+                                                     "port_number");
         webRemoteDebuggingPortOpt.setFlags(QCommandLineOption::HiddenFromHelp);
         parser.addOption(webRemoteDebuggingPortOpt);
 
         QCommandLineOption webNoSandboxOpt("no-sandbox", MainWindow::tr("WebEngine without sandbox."));
         webNoSandboxOpt.setFlags(QCommandLineOption::HiddenFromHelp);
         parser.addOption(webNoSandboxOpt);
-
-        QCommandLineOption webDisableGpu("disable-gpu", MainWindow::tr("WebEngine with GPU disabled."));
-        webDisableGpu.setFlags(QCommandLineOption::HiddenFromHelp);
-        parser.addOption(webDisableGpu);
     }
 
     if (!parser.parse(p_arguments)) {
@@ -69,13 +59,5 @@ CommandLineOptions::ParseResult CommandLineOptions::parse(const QStringList &p_a
         m_verbose = true;
     }
 
-    if (parser.isSet(logStderrOpt)) {
-        m_logToStderr = true;
-    }
-
-    if (parser.isSet(watchThemesOpt)) {
-        m_watchThemes = true;
-    }
-
     return ParseResult::Ok;
 }

src/commandlineoptions.h

@@ -25,11 +25,6 @@ public:
     QStringList m_pathsToOpen;
 
     bool m_verbose = false;
-
-    bool m_logToStderr = false;
-
-    // Whether to watch theme folder for changes
-    bool m_watchThemes = false;
 };
 
 #endif // COMMANDLINEOPTIONS_H

src/core/CMakeLists.txt

@@ -1,87 +0,0 @@
-target_sources(vnote PRIVATE
-    buffer/buffer.cpp buffer/buffer.h
-    buffer/bufferprovider.cpp buffer/bufferprovider.h
-    buffer/filebufferprovider.cpp buffer/filebufferprovider.h
-    buffer/filetypehelper.cpp buffer/filetypehelper.h
-    buffer/ibufferfactory.h
-    buffer/markdownbuffer.cpp buffer/markdownbuffer.h
-    buffer/markdownbufferfactory.cpp buffer/markdownbufferfactory.h
-    buffer/mindmapbuffer.cpp buffer/mindmapbuffer.h
-    buffer/mindmapbufferfactory.cpp buffer/mindmapbufferfactory.h
-    buffer/nodebufferprovider.cpp buffer/nodebufferprovider.h
-    buffer/pdfbuffer.cpp buffer/pdfbuffer.h
-    buffer/pdfbufferfactory.cpp buffer/pdfbufferfactory.h
-    buffer/textbuffer.cpp buffer/textbuffer.h
-    buffer/textbufferfactory.cpp buffer/textbufferfactory.h
-    buffer/urlbasedbufferprovider.h
-    buffermgr.cpp buffermgr.h
-    clipboarddata.cpp clipboarddata.h
-    configmgr.cpp configmgr.h
-    coreconfig.cpp coreconfig.h
-    editorconfig.cpp editorconfig.h
-    events.h
-    exception.h
-    externalfile.cpp externalfile.h
-    file.cpp file.h
-    filelocator.h
-    fileopenparameters.h
-    global.cpp global.h
-    historyitem.cpp historyitem.h
-    historymgr.cpp historymgr.h
-    htmltemplatehelper.cpp htmltemplatehelper.h
-    iconfig.h
-    location.h
-    logger.cpp logger.h
-    mainconfig.cpp mainconfig.h
-    markdowneditorconfig.cpp markdowneditorconfig.h
-    mindmapeditorconfig.cpp mindmapeditorconfig.h
-    namebasedserver.h
-    noncopyable.h
-    notebook/bundlenotebook.cpp notebook/bundlenotebook.h
-    notebook/bundlenotebookfactory.cpp notebook/bundlenotebookfactory.h
-    notebook/externalnode.cpp notebook/externalnode.h
-    notebook/historyi.h
-    notebook/inotebookfactory.h
-    notebook/node.cpp notebook/node.h
-    notebook/nodeparameters.cpp notebook/nodeparameters.h
-    notebook/notebook.cpp notebook/notebook.h
-    notebook/notebookdatabaseaccess.cpp notebook/notebookdatabaseaccess.h
-    notebook/notebookparameters.cpp notebook/notebookparameters.h
-    notebook/notebooktagmgr.cpp notebook/notebooktagmgr.h
-    notebook/tag.cpp notebook/tag.h
-    notebook/tagi.h
-    notebook/vxnode.cpp notebook/vxnode.h
-    notebook/vxnodefile.cpp notebook/vxnodefile.h
-    notebookbackend/inotebookbackend.cpp notebookbackend/inotebookbackend.h
-    notebookbackend/inotebookbackendfactory.h
-    notebookbackend/localnotebookbackend.cpp notebookbackend/localnotebookbackend.h
-    notebookbackend/localnotebookbackendfactory.cpp notebookbackend/localnotebookbackendfactory.h
-    notebookconfigmgr/bundlenotebookconfigmgr.cpp notebookconfigmgr/bundlenotebookconfigmgr.h
-    notebookconfigmgr/inotebookconfigmgr.cpp notebookconfigmgr/inotebookconfigmgr.h
-    notebookconfigmgr/inotebookconfigmgrfactory.h
-    notebookconfigmgr/notebookconfig.cpp notebookconfigmgr/notebookconfig.h
-    notebookconfigmgr/vxnodeconfig.cpp notebookconfigmgr/vxnodeconfig.h
-    notebookconfigmgr/vxnotebookconfigmgr.cpp notebookconfigmgr/vxnotebookconfigmgr.h
-    notebookconfigmgr/vxnotebookconfigmgrfactory.cpp notebookconfigmgr/vxnotebookconfigmgrfactory.h
-    notebookmgr.cpp notebookmgr.h
-    pdfviewerconfig.cpp pdfviewerconfig.h
-    quickaccesshelper.cpp quickaccesshelper.h
-    sessionconfig.cpp sessionconfig.h
-    singleinstanceguard.cpp singleinstanceguard.h
-    templatemgr.cpp templatemgr.h
-    texteditorconfig.cpp texteditorconfig.h
-    theme.cpp theme.h
-    thememgr.cpp thememgr.h
-    versioncontroller/dummyversioncontroller.cpp versioncontroller/dummyversioncontroller.h
-    versioncontroller/dummyversioncontrollerfactory.cpp versioncontroller/dummyversioncontrollerfactory.h
-    versioncontroller/iversioncontroller.h
-    versioncontroller/iversioncontrollerfactory.h
-    versioncontroller/versioncontrollerserver.cpp versioncontroller/versioncontrollerserver.h
-    vnotex.cpp vnotex.h
-    webresource.h
-    widgetconfig.cpp widgetconfig.h
-)
-
-target_include_directories(vnote PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)

src/core/buffer/buffer.cpp

@@ -61,7 +61,6 @@ void Buffer::attachViewWindow(ViewWindow *p_win)
 
 void Buffer::detachViewWindow(ViewWindow *p_win)
 {
-    Q_UNUSED(p_win);
     Q_ASSERT(p_win != m_viewWindowToSync);
 
     --m_attachedViewWindowCount;
@@ -321,8 +320,6 @@ void Buffer::autoSave()
     case EditorConfig::AutoSavePolicy::AutoSave:
         if (save(false) != OperationCode::Success) {
             qWarning() << "AutoSave failed to save buffer, retry later";
-        } else {
-            emit autoSaved();
         }
         break;
 
@@ -358,7 +355,7 @@ void Buffer::writeBackupFile()
 
 QString Buffer::generateBackupFileHead() const
 {
-    return QStringLiteral("vnotex_backup_file %1|").arg(getContentPath());
+    return QString("vnotex_backup_file %1|").arg(getContentPath());
 }
 
 void Buffer::checkBackupFileOfPreviousSession()
@@ -373,7 +370,7 @@ void Buffer::checkBackupFileOfPreviousSession()
     QDir backupDir(backupDirPath);
     QStringList backupFiles;
     {
-        const QString nameFilter = QStringLiteral("%1*%2").arg(getName(), config.getBackupFileExtension());
+        const QString nameFilter = QString("%1*%2").arg(getName(), config.getBackupFileExtension());
         backupFiles = backupDir.entryList(QStringList(nameFilter),
                                           QDir::Files | QDir::Hidden | QDir::NoSymLinks | QDir::NoDotAndDotDot);
     }
@@ -529,11 +526,6 @@ bool Buffer::isAttachment(const QString &p_path) const
     return PathUtils::pathContains(getAttachmentFolderPath(), p_path);
 }
 
-bool Buffer::isTagSupported() const
-{
-    return m_provider->isTagSupported();
-}
-
 Buffer::ProviderType Buffer::getProviderType() const
 {
     return m_provider->getType();

src/core/buffer/buffer.h

@@ -165,8 +165,6 @@ namespace vnotex
         // Judge whether file @p_path is attachment.
         bool isAttachment(const QString &p_path) const;
 
-        bool isTagSupported() const;
-
         ProviderType getProviderType() const;
 
         bool checkFileExistsOnDisk();
@@ -188,9 +186,6 @@ namespace vnotex
 
         void attachmentChanged();
 
-        // This buffer is AutoSavePolicy::AutoSave.
-        void autoSaved();
-
     protected:
         virtual ViewWindow *createViewWindowInternal(const QSharedPointer<FileOpenParameters> &p_paras, QWidget *p_parent) = 0;
 

src/core/buffer/buffer.pri

@@ -0,0 +1,22 @@
+SOURCES += \
+    $$PWD/buffer.cpp \
+    $$PWD/bufferprovider.cpp \
+    $$PWD/filebufferprovider.cpp \
+    $$PWD/markdownbuffer.cpp \
+    $$PWD/markdownbufferfactory.cpp \
+    $$PWD/filetypehelper.cpp \
+    $$PWD/nodebufferprovider.cpp \
+    $$PWD/textbuffer.cpp \
+    $$PWD/textbufferfactory.cpp
+
+HEADERS += \
+    $$PWD/bufferprovider.h \
+    $$PWD/buffer.h \
+    $$PWD/filebufferprovider.h \
+    $$PWD/ibufferfactory.h \
+    $$PWD/markdownbuffer.h \
+    $$PWD/markdownbufferfactory.h \
+    $$PWD/filetypehelper.h \
+    $$PWD/nodebufferprovider.h \
+    $$PWD/textbuffer.h \
+    $$PWD/textbufferfactory.h

src/core/buffer/bufferprovider.cpp

@@ -16,7 +16,6 @@ QDateTime BufferProvider::getLastModifiedFromFile() const
 
 bool BufferProvider::checkFileChangedOutside() const
 {
-    // TODO: support non-local URLs.
     QFileInfo info(getContentPath());
     if (!info.exists() || m_lastModified != info.lastModified()) {
         return true;

src/core/buffer/bufferprovider.h

@@ -68,8 +68,6 @@ namespace vnotex
 
         virtual bool isAttachmentSupported() const = 0;
 
-        virtual bool isTagSupported() const = 0;
-
         virtual bool checkFileExistsOnDisk() const;
 
         virtual bool checkFileChangedOutside() const;

src/core/buffer/filebufferprovider.cpp

@@ -6,7 +6,6 @@
 #include <utils/fileutils.h>
 #include <notebook/node.h>
 #include <core/file.h>
-#include <core/exception.h>
 
 using namespace vnotex;
 
@@ -161,11 +160,7 @@ void FileBufferProvider::removeImage(const QString &p_imagePath)
 {
     auto file = m_file->getImageInterface();
     if (file) {
-        try {
         file->removeImage(p_imagePath);
-        } catch (Exception &e) {
-            qWarning() << "failed to remove image" << p_imagePath << e.what();
-        }
     }
 }
 
@@ -174,11 +169,6 @@ bool FileBufferProvider::isAttachmentSupported() const
     return false;
 }
 
-bool FileBufferProvider::isTagSupported() const
-{
-    return false;
-}
-
 Node *FileBufferProvider::getNode() const
 {
     return c_nodeAttachedTo;

src/core/buffer/filebufferprovider.h

@@ -63,8 +63,6 @@ namespace vnotex
 
         bool isAttachmentSupported() const Q_DECL_OVERRIDE;
 
-        bool isTagSupported() const Q_DECL_OVERRIDE;
-
         bool isReadOnly() const Q_DECL_OVERRIDE;
 
         QSharedPointer<File> getFile() const Q_DECL_OVERRIDE;

src/core/buffer/filetypehelper.cpp

@@ -5,8 +5,6 @@
 
 #include <utils/fileutils.h>
 #include "buffer.h"
-#include <core/configmgr.h>
-#include <core/coreconfig.h>
 
 using namespace vnotex;
 
@@ -20,42 +18,26 @@ bool FileType::isMarkdown() const
     return m_type == Type::Markdown;
 }
 
-QString FileTypeHelper::s_systemDefaultProgram = QStringLiteral("System");
-
 FileTypeHelper::FileTypeHelper()
-{
-    reload();
-}
-
-void FileTypeHelper::reload()
 {
     setupBuiltInTypes();
 
+    // TODO: read configuration file.
+
     setupSuffixTypeMap();
 }
 
 void FileTypeHelper::setupBuiltInTypes()
 {
-    m_fileTypes.clear();
-
-    const auto &coreConfig = ConfigMgr::getInst().getCoreConfig();
-
     {
         FileType type;
         type.m_type = FileType::Markdown;
-        type.m_typeName = QStringLiteral("Markdown");
         type.m_displayName = Buffer::tr("Markdown");
-
-        auto suffixes = coreConfig.findFileTypeSuffix(type.m_typeName);
-        if (suffixes && !suffixes->isEmpty()) {
-            type.m_suffixes = *suffixes;
-        } else {
+        type.m_typeName = QStringLiteral("Markdown");
         type.m_suffixes << QStringLiteral("md")
                         << QStringLiteral("mkd")
                         << QStringLiteral("rmd")
                         << QStringLiteral("markdown");
-        }
-
         m_fileTypes.push_back(type);
     }
 
@@ -64,47 +46,7 @@ void FileTypeHelper::setupBuiltInTypes()
         type.m_type = FileType::Text;
         type.m_typeName = QStringLiteral("Text");
         type.m_displayName = Buffer::tr("Text");
-
-        auto suffixes = coreConfig.findFileTypeSuffix(type.m_typeName);
-        if (suffixes && !suffixes->isEmpty()) {
-            type.m_suffixes = *suffixes;
-        } else {
         type.m_suffixes << QStringLiteral("txt") << QStringLiteral("text") << QStringLiteral("log");
-        }
-
-        m_fileTypes.push_back(type);
-    }
-
-    {
-        FileType type;
-        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()) {
-            type.m_suffixes = *suffixes;
-        } else {
-            type.m_suffixes << QStringLiteral("pdf");
-        }
-
-        m_fileTypes.push_back(type);
-    }
-
-    {
-        FileType type;
-        type.m_type = FileType::MindMap;
-        type.m_typeName = QStringLiteral("MindMap");
-        type.m_displayName = Buffer::tr("Mind Map");
-
-        auto suffixes = coreConfig.findFileTypeSuffix(type.m_typeName);
-        if (suffixes && !suffixes->isEmpty()) {
-            type.m_suffixes = *suffixes;
-        } else {
-            type.m_suffixes << QStringLiteral("emind");
-        }
-
         m_fileTypes.push_back(type);
     }
 
@@ -146,10 +88,10 @@ const FileType &FileTypeHelper::getFileTypeBySuffix(const QString &p_suffix) con
     }
 }
 
+#define ADD(x, y) m_suffixTypeMap.insert((x), (y))
+
 void FileTypeHelper::setupSuffixTypeMap()
 {
-    m_suffixTypeMap.clear();
-
     for (int i = 0; i < m_fileTypes.size(); ++i) {
         for (const auto &suffix : m_fileTypes[i].m_suffixes) {
             if (m_suffixTypeMap.contains(suffix)) {
@@ -167,13 +109,11 @@ const QVector<FileType> &FileTypeHelper::getAllFileTypes() const
 
 const FileType &FileTypeHelper::getFileType(int p_type) const
 {
-    if (p_type >= m_fileTypes.size()) {
-        p_type = FileType::Others;
-    }
+    Q_ASSERT(p_type < m_fileTypes.size());
     return m_fileTypes[p_type];
 }
 
-FileTypeHelper &FileTypeHelper::getInst()
+const FileTypeHelper &FileTypeHelper::getInst()
 {
     static FileTypeHelper helper;
     return helper;

src/core/buffer/filetypehelper.h

@@ -15,15 +15,9 @@ namespace vnotex
         {
             Markdown = 0,
             Text,
-            Pdf,
-            MindMap,
             Others
         };
 
-        QString preferredSuffix() const;
-
-        bool isMarkdown() const;
-
         // Type.
         int m_type = -1;
 
@@ -33,11 +27,11 @@ namespace vnotex
 
         QStringList m_suffixes;
 
-        // Whether we can new this type of file.
-        bool m_isNewable = true;
+        QString preferredSuffix() const;
+
+        bool isMarkdown() const;
     };
 
-    // Only handle built-in editors.
     class FileTypeHelper
     {
     public:
@@ -53,11 +47,7 @@ namespace vnotex
 
         bool checkFileType(const QString &p_filePath, int p_type) const;
 
-        void reload();
-
-        static FileTypeHelper &getInst();
-
-        static QString s_systemDefaultProgram;
+        static const FileTypeHelper &getInst();
 
     private:
         FileTypeHelper();

src/core/buffer/ibufferfactory.h

@@ -18,8 +18,6 @@ namespace vnotex
 
         virtual Buffer *createBuffer(const BufferParameters &p_parameters,
                                      QObject *p_parent) = 0;
-
-        virtual bool isBufferCreatedByFactory(const Buffer *p_buffer) const = 0;
     };
 } // ns vnotex
 

src/core/buffer/markdownbufferfactory.cpp

@@ -9,8 +9,3 @@ Buffer *MarkdownBufferFactory::createBuffer(const BufferParameters &p_parameters
 {
     return new MarkdownBuffer(p_parameters, p_parent);
 }
-
-bool MarkdownBufferFactory::isBufferCreatedByFactory(const Buffer *p_buffer) const
-{
-    return dynamic_cast<const MarkdownBuffer *>(p_buffer) != nullptr;
-}

src/core/buffer/markdownbufferfactory.h

@@ -11,8 +11,6 @@ namespace vnotex
     public:
         Buffer *createBuffer(const BufferParameters &p_parameters,
                              QObject *p_parent) Q_DECL_OVERRIDE;
-
-        bool isBufferCreatedByFactory(const Buffer *p_buffer) const Q_DECL_OVERRIDE;
     };
 } // vnotex
 

src/core/buffer/mindmapbuffer.cpp

@@ -1,17 +0,0 @@
-#include "mindmapbuffer.h"
-
-#include <widgets/mindmapviewwindow.h>
-
-using namespace vnotex;
-
-MindMapBuffer::MindMapBuffer(const BufferParameters &p_parameters,
-                             QObject *p_parent)
-    : Buffer(p_parameters, p_parent)
-{
-}
-
-ViewWindow *MindMapBuffer::createViewWindowInternal(const QSharedPointer<FileOpenParameters> &p_paras, QWidget *p_parent)
-{
-    Q_UNUSED(p_paras);
-    return new MindMapViewWindow(p_parent);
-}

src/core/buffer/mindmapbuffer.h

@@ -1,21 +0,0 @@
-#ifndef MINDMAPBUFFER_H
-#define MINDMAPBUFFER_H
-
-#include "buffer.h"
-
-namespace vnotex
-{
-    class MindMapBuffer : public Buffer
-    {
-        Q_OBJECT
-    public:
-        MindMapBuffer(const BufferParameters &p_parameters,
-                      QObject *p_parent = nullptr);
-
-    protected:
-        ViewWindow *createViewWindowInternal(const QSharedPointer<FileOpenParameters> &p_paras,
-                                             QWidget *p_parent) Q_DECL_OVERRIDE;
-    };
-}
-
-#endif // MINDMAPBUFFER_H

src/core/buffer/mindmapbufferfactory.cpp

@@ -1,16 +0,0 @@
-#include "mindmapbufferfactory.h"
-
-#include "mindmapbuffer.h"
-
-using namespace vnotex;
-
-Buffer *MindMapBufferFactory::createBuffer(const BufferParameters &p_parameters,
-                                           QObject *p_parent)
-{
-    return new MindMapBuffer(p_parameters, p_parent);
-}
-
-bool MindMapBufferFactory::isBufferCreatedByFactory(const Buffer *p_buffer) const
-{
-    return dynamic_cast<const MindMapBuffer *>(p_buffer) != nullptr;
-}

src/core/buffer/mindmapbufferfactory.h

@@ -1,19 +0,0 @@
-#ifndef MINDMAPBUFFERFACTORY_H
-#define MINDMAPBUFFERFACTORY_H
-
-#include "ibufferfactory.h"
-
-namespace vnotex
-{
-    // Buffer factory for MindMap file.
-    class MindMapBufferFactory : public IBufferFactory
-    {
-    public:
-        Buffer *createBuffer(const BufferParameters &p_parameters,
-                             QObject *p_parent) Q_DECL_OVERRIDE;
-
-        bool isBufferCreatedByFactory(const Buffer *p_buffer) const Q_DECL_OVERRIDE;
-    };
-}
-
-#endif // MINDMAPBUFFERFACTORY_H

src/core/buffer/nodebufferprovider.cpp

@@ -3,10 +3,8 @@
 #include <QFileInfo>
 
 #include <notebook/node.h>
-#include <notebook/notebook.h>
 #include <utils/pathutils.h>
 #include <core/file.h>
-#include <core/exception.h>
 
 using namespace vnotex;
 
@@ -141,11 +139,7 @@ void NodeBufferProvider::removeImage(const QString &p_imagePath)
 {
     auto file = m_nodeFile->getImageInterface();
     if (file) {
-        try {
         file->removeImage(p_imagePath);
-        } catch (Exception &e) {
-            qWarning() << "failed to remove image" << p_imagePath << e.what();
-        }
     }
 }
 
@@ -154,11 +148,6 @@ bool NodeBufferProvider::isAttachmentSupported() const
     return true;
 }
 
-bool NodeBufferProvider::isTagSupported() const
-{
-    return m_node->getNotebook()->tag() != nullptr;
-}
-
 Node *NodeBufferProvider::getNode() const
 {
     return m_node.data();

src/core/buffer/nodebufferprovider.h

@@ -65,8 +65,6 @@ namespace vnotex
 
         bool isAttachmentSupported() const Q_DECL_OVERRIDE;
 
-        bool isTagSupported() const Q_DECL_OVERRIDE;
-
         bool isReadOnly() const Q_DECL_OVERRIDE;
 
         QSharedPointer<File> getFile() const Q_DECL_OVERRIDE;

src/core/buffer/pdfbuffer.cpp

@@ -1,17 +0,0 @@
-#include "pdfbuffer.h"
-
-#include <widgets/pdfviewwindow.h>
-
-using namespace vnotex;
-
-PdfBuffer::PdfBuffer(const BufferParameters &p_parameters,
-                     QObject *p_parent)
-    : Buffer(p_parameters, p_parent)
-{
-}
-
-ViewWindow *PdfBuffer::createViewWindowInternal(const QSharedPointer<FileOpenParameters> &p_paras, QWidget *p_parent)
-{
-    Q_UNUSED(p_paras);
-    return new PdfViewWindow(p_parent);
-}

src/core/buffer/pdfbuffer.h

@@ -1,21 +0,0 @@
-#ifndef PDFBUFFER_H
-#define PDFBUFFER_H
-
-#include "buffer.h"
-
-namespace vnotex
-{
-    class PdfBuffer : public Buffer
-    {
-        Q_OBJECT
-    public:
-        PdfBuffer(const BufferParameters &p_parameters,
-                  QObject *p_parent = nullptr);
-
-    protected:
-        ViewWindow *createViewWindowInternal(const QSharedPointer<FileOpenParameters> &p_paras,
-                                             QWidget *p_parent) Q_DECL_OVERRIDE;
-    };
-} // ns vnotex
-
-#endif // PDFBUFFER_H

src/core/buffer/pdfbufferfactory.cpp

@@ -1,19 +0,0 @@
-#include "pdfbufferfactory.h"
-
-#include "pdfbuffer.h"
-#include "urlbasedbufferprovider.h"
-
-using namespace vnotex;
-
-Buffer *PdfBufferFactory::createBuffer(const BufferParameters &p_parameters,
-                                        QObject *p_parent)
-{
-    BufferParameters paras;
-    paras.m_provider = QSharedPointer<UrlBasedBufferProvider>::create(p_parameters.m_provider);
-    return new PdfBuffer(paras, p_parent);
-}
-
-bool PdfBufferFactory::isBufferCreatedByFactory(const Buffer *p_buffer) const
-{
-    return dynamic_cast<const PdfBuffer *>(p_buffer) != nullptr;
-}

src/core/buffer/pdfbufferfactory.h

@@ -1,19 +0,0 @@
-#ifndef PDFBUFFERFACTORY_H
-#define PDFBUFFERFACTORY_H
-
-#include "ibufferfactory.h"
-
-namespace vnotex
-{
-    // Buffer factory for Pdf file.
-    class PdfBufferFactory : public IBufferFactory
-    {
-    public:
-        Buffer *createBuffer(const BufferParameters &p_parameters,
-                             QObject *p_parent) Q_DECL_OVERRIDE;
-
-        bool isBufferCreatedByFactory(const Buffer *p_buffer) const Q_DECL_OVERRIDE;
-    };
-} // vnotex
-
-#endif // PDFBUFFERFACTORY_H

src/core/buffer/textbufferfactory.cpp

@@ -9,8 +9,3 @@ Buffer *TextBufferFactory::createBuffer(const BufferParameters &p_parameters,
 {
     return new TextBuffer(p_parameters, p_parent);
 }
-
-bool TextBufferFactory::isBufferCreatedByFactory(const Buffer *p_buffer) const
-{
-    return dynamic_cast<const TextBuffer *>(p_buffer) != nullptr;
-}

src/core/buffer/textbufferfactory.h

@@ -11,8 +11,6 @@ namespace vnotex
     public:
         Buffer *createBuffer(const BufferParameters &p_parameters,
                              QObject *p_parent) Q_DECL_OVERRIDE;
-
-        bool isBufferCreatedByFactory(const Buffer *p_buffer) const Q_DECL_OVERRIDE;
     };
 }
 

src/core/buffer/urlbasedbufferprovider.h

@@ -1,132 +0,0 @@
-#ifndef URLBASEDBUFFERPROVIDER_H
-#define URLBASEDBUFFERPROVIDER_H
-
-#include "bufferprovider.h"
-
-#include <QSharedPointer>
-
-namespace vnotex
-{
-    // A wrapper provider to provide URL-based buffer (instead of content-based).
-    class UrlBasedBufferProvider : public BufferProvider
-    {
-        Q_OBJECT
-    public:
-        // Will own @p_provider.
-        UrlBasedBufferProvider(const QSharedPointer<BufferProvider> &p_provider, QObject *p_parent = nullptr)
-            : BufferProvider(p_parent),
-              m_provider(p_provider)
-        {
-        }
-
-        Buffer::ProviderType getType() const Q_DECL_OVERRIDE {
-            return m_provider->getType();
-        }
-
-        bool match(const Node *p_node) const Q_DECL_OVERRIDE {
-            return m_provider->match(p_node);
-        }
-
-        bool match(const QString &p_filePath) const Q_DECL_OVERRIDE {
-            return m_provider->match(p_filePath);
-        }
-
-        QString getName() const Q_DECL_OVERRIDE {
-            return m_provider->getName();
-        }
-
-        QString getPath() const Q_DECL_OVERRIDE {
-            return m_provider->getPath();
-        }
-
-        QString getContentPath() const Q_DECL_OVERRIDE {
-            return m_provider->getContentPath();
-        }
-
-        QString getResourcePath() const Q_DECL_OVERRIDE {
-            return m_provider->getResourcePath();
-        }
-
-        void write(const QString &p_content) Q_DECL_OVERRIDE {
-            Q_UNUSED(p_content);
-        }
-
-        QString read() const Q_DECL_OVERRIDE {
-            const_cast<UrlBasedBufferProvider *>(this)->m_lastModified = getLastModifiedFromFile();
-            return QString();
-        }
-
-        QString fetchImageFolderPath() Q_DECL_OVERRIDE {
-            return m_provider->fetchImageFolderPath();
-        }
-
-        bool isChildOf(const Node *p_node) const Q_DECL_OVERRIDE {
-            return m_provider->isChildOf(p_node);
-        }
-
-        Node *getNode() const Q_DECL_OVERRIDE {
-            return m_provider->getNode();
-        }
-
-        QString getAttachmentFolder() const Q_DECL_OVERRIDE {
-            return m_provider->getAttachmentFolder();
-        }
-
-        QString fetchAttachmentFolderPath() Q_DECL_OVERRIDE {
-            return m_provider->fetchAttachmentFolderPath();
-        }
-
-        QStringList addAttachment(const QString &p_destFolderPath, const QStringList &p_files) Q_DECL_OVERRIDE {
-            return m_provider->addAttachment(p_destFolderPath, p_files);
-        }
-
-        QString newAttachmentFile(const QString &p_destFolderPath, const QString &p_name) Q_DECL_OVERRIDE {
-            return m_provider->newAttachmentFile(p_destFolderPath, p_name);
-        }
-
-        QString newAttachmentFolder(const QString &p_destFolderPath, const QString &p_name) Q_DECL_OVERRIDE {
-            return m_provider->newAttachmentFolder(p_destFolderPath, p_name);
-        }
-
-        QString renameAttachment(const QString &p_path, const QString &p_name) Q_DECL_OVERRIDE {
-            return m_provider->renameAttachment(p_path, p_name);
-        }
-
-        void removeAttachment(const QStringList &p_paths) Q_DECL_OVERRIDE {
-            m_provider->removeAttachment(p_paths);
-        }
-
-        QString insertImage(const QString &p_srcImagePath, const QString &p_imageFileName) Q_DECL_OVERRIDE {
-            return m_provider->insertImage(p_srcImagePath, p_imageFileName);
-        }
-
-        QString insertImage(const QImage &p_image, const QString &p_imageFileName) Q_DECL_OVERRIDE {
-            return m_provider->insertImage(p_image, p_imageFileName);
-        }
-
-        void removeImage(const QString &p_imagePath) Q_DECL_OVERRIDE {
-            m_provider->removeImage(p_imagePath);
-        }
-
-        bool isAttachmentSupported() const Q_DECL_OVERRIDE {
-            return m_provider->isAttachmentSupported();
-        }
-
-        bool isTagSupported() const Q_DECL_OVERRIDE {
-            return m_provider->isTagSupported();
-        }
-
-        bool isReadOnly() const Q_DECL_OVERRIDE {
-            return true;
-        }
-
-        QSharedPointer<File> getFile() const Q_DECL_OVERRIDE {
-            return m_provider->getFile();
-        }
-
-    private:
-        QSharedPointer<BufferProvider> m_provider;
-    };
-}
-
-#endif // URLBASEDBUFFERPROVIDER_H

src/core/buffermgr.cpp

@@ -7,25 +7,18 @@
 #include <buffer/filetypehelper.h>
 #include <buffer/markdownbufferfactory.h>
 #include <buffer/textbufferfactory.h>
-#include <buffer/pdfbufferfactory.h>
-#include <buffer/mindmapbufferfactory.h>
 #include <buffer/buffer.h>
 #include <buffer/nodebufferprovider.h>
 #include <buffer/filebufferprovider.h>
 #include <utils/widgetutils.h>
-#include <utils/processutils.h>
 #include "notebookmgr.h"
 #include "vnotex.h"
 #include "externalfile.h"
-#include "sessionconfig.h"
-#include "configmgr.h"
 
 #include "fileopenparameters.h"
 
 using namespace vnotex;
 
-QMap<QString, QString> BufferMgr::s_suffixToFileType;
-
 BufferMgr::BufferMgr(QObject *p_parent)
     : QObject(p_parent)
 {
@@ -54,14 +47,6 @@ void BufferMgr::initBufferServer()
     // Text.
     auto textFactory = QSharedPointer<TextBufferFactory>::create();
     m_bufferServer->registerItem(helper.getFileType(FileType::Text).m_typeName, textFactory);
-
-    // Pdf.
-    auto pdfFactory = QSharedPointer<PdfBufferFactory>::create();
-    m_bufferServer->registerItem(helper.getFileType(FileType::Pdf).m_typeName, pdfFactory);
-
-    // MindMap.
-    auto mindMapFactory = QSharedPointer<MindMapBufferFactory>::create();
-    m_bufferServer->registerItem(helper.getFileType(FileType::MindMap).m_typeName, mindMapFactory);
 }
 
 void BufferMgr::open(Node *p_node, const QSharedPointer<FileOpenParameters> &p_paras)
@@ -75,33 +60,18 @@ void BufferMgr::open(Node *p_node, const QSharedPointer<FileOpenParameters> &p_p
     }
 
     if (!p_node->checkExists()) {
-        auto msg = QStringLiteral("Failed to open node that does not exist (%1)").arg(p_node->fetchAbsolutePath());
+        auto msg = QString("Failed to open node that does not exist (%1)").arg(p_node->fetchAbsolutePath());
         qWarning() << msg;
         VNoteX::getInst().showStatusMessageShort(msg);
         return;
     }
 
-    const auto nodePath = p_node->fetchAbsolutePath();
-
-    auto fileType = p_paras->m_fileType;
-    if (fileType.isEmpty()) {
-        // Check if we need to open it with external program by default according to the suffix.
-        fileType = findFileTypeByFile(nodePath);
-        if (openWithExternalProgram(nodePath, fileType)) {
-            return;
-        }
-    }
-
     auto buffer = findBuffer(p_node);
-    if (!buffer || !isSameTypeBuffer(buffer, fileType)) {
+    if (!buffer) {
+        auto nodePath = p_node->fetchAbsolutePath();
         auto nodeFile = p_node->getContentFile();
         Q_ASSERT(nodeFile);
-        if (fileType.isEmpty()) {
-            fileType = nodeFile->getContentType().m_typeName;
-        } else if (fileType != nodeFile->getContentType().m_typeName) {
-            nodeFile->setContentType(FileTypeHelper::getInst().getFileTypeByName(fileType).m_type);
-        }
-
+        auto fileType = nodeFile->getContentType().m_typeName;
         auto factory = m_bufferServer->getItem(fileType);
         if (!factory) {
             // No factory to open this file type.
@@ -126,17 +96,11 @@ void BufferMgr::open(const QString &p_filePath, const QSharedPointer<FileOpenPar
         return;
     }
 
-    // Check if it is requested to open with external program.
-    if (openWithExternalProgram(p_filePath, p_paras->m_fileType)) {
-        return;
-    }
-
     QFileInfo finfo(p_filePath);
     if (!finfo.exists()) {
-        auto msg = QStringLiteral("Failed to open file that does not exist (%1)").arg(p_filePath);
+        auto msg = QString("Failed to open file that does not exist (%1)").arg(p_filePath);
         qWarning() << msg;
         VNoteX::getInst().showStatusMessageShort(msg);
-        WidgetUtils::openUrlByDesktop(QUrl::fromUserInput(p_filePath));
         return;
     }
 
@@ -158,25 +122,11 @@ void BufferMgr::open(const QString &p_filePath, const QSharedPointer<FileOpenPar
         return;
     }
 
-    auto fileType = p_paras->m_fileType;
-    if (fileType.isEmpty()) {
-        // Check if we need to open it with external program by default according to the suffix.
-        fileType = findFileTypeByFile(p_filePath);
-        if (openWithExternalProgram(p_filePath, fileType)) {
-            return;
-        }
-    }
-
     auto buffer = findBuffer(p_filePath);
-    if (!buffer || !isSameTypeBuffer(buffer, fileType)) {
+    if (!buffer) {
         // Open it as external file.
         auto externalFile = QSharedPointer<ExternalFile>::create(p_filePath);
-        if (fileType.isEmpty()) {
-            fileType = externalFile->getContentType().m_typeName;
-        } else if (fileType != externalFile->getContentType().m_typeName) {
-            externalFile->setContentType(FileTypeHelper::getInst().getFileTypeByName(fileType).m_type);
-        }
-
+        auto fileType = externalFile->getContentType().m_typeName;
         auto factory = m_bufferServer->getItem(fileType);
         if (!factory) {
             // No factory to open this file type.
@@ -237,72 +187,3 @@ void BufferMgr::addBuffer(Buffer *p_buffer)
                 p_buffer->deleteLater();
             });
 }
-
-bool BufferMgr::openWithExternalProgram(const QString &p_filePath, const QString &p_name) const
-{
-    if (p_name.isEmpty()) {
-        return false;
-    }
-
-    if (p_name == FileTypeHelper::s_systemDefaultProgram) {
-        // Open it by system default program.
-        qInfo() << "file will be opened by default program" << p_filePath;
-        WidgetUtils::openUrlByDesktop(QUrl::fromLocalFile(p_filePath));
-        return true;
-    }
-
-    if (auto pro = ConfigMgr::getInst().getSessionConfig().findExternalProgram(p_name)) {
-        const auto command = pro->fetchCommand(p_filePath);
-        qDebug() << "external program" << command;
-        if (!command.isEmpty()) {
-            ProcessUtils::startDetached(command);
-        }
-        return true;
-    }
-
-    return false;
-}
-
-bool BufferMgr::isSameTypeBuffer(const Buffer *p_buffer, const QString &p_typeName) const
-{
-    if (p_typeName.isEmpty()) {
-        return true;
-    }
-
-    auto factory = m_bufferServer->getItem(p_typeName);
-    Q_ASSERT(factory);
-    if (factory) {
-        return factory->isBufferCreatedByFactory(p_buffer);
-    }
-
-    return true;
-}
-
-void BufferMgr::updateSuffixToFileType(const QVector<CoreConfig::FileTypeSuffix> &p_fileTypeSuffixes)
-{
-    s_suffixToFileType.clear();
-
-    for (const auto &fts : p_fileTypeSuffixes) {
-        for (const auto &suf : fts.m_suffixes) {
-            auto it = s_suffixToFileType.find(suf);
-            if (it != s_suffixToFileType.end()) {
-                qWarning() << "suffix conflicts for file types" << fts.m_name << it.value();
-                it.value() = fts.m_name;
-            } else {
-                s_suffixToFileType.insert(suf, fts.m_name);
-            }
-        }
-    }
-}
-
-QString BufferMgr::findFileTypeByFile(const QString &p_filePath)
-{
-    QFileInfo fi(p_filePath);
-    auto suffix = fi.suffix().toLower();
-    auto it = s_suffixToFileType.find(suffix);
-    if (it != s_suffixToFileType.end()) {
-        return it.value();
-    } else {
-        return QString();
-    }
-}

src/core/buffermgr.h

@@ -5,10 +5,8 @@
 #include <QScopedPointer>
 #include <QSharedPointer>
 #include <QVector>
-#include <QMap>
 
 #include "namebasedserver.h"
-#include "coreconfig.h"
 
 namespace vnotex
 {
@@ -32,8 +30,6 @@ namespace vnotex
 
         void open(const QString &p_filePath, const QSharedPointer<FileOpenParameters> &p_paras);
 
-        static void updateSuffixToFileType(const QVector<CoreConfig::FileTypeSuffix> &p_fileTypeSuffixes);
-
     signals:
         void bufferRequested(Buffer *p_buffer, const QSharedPointer<FileOpenParameters> &p_paras);
 
@@ -46,19 +42,10 @@ namespace vnotex
 
         void addBuffer(Buffer *p_buffer);
 
-        bool openWithExternalProgram(const QString &p_filePath, const QString &p_name) const;
-
-        bool isSameTypeBuffer(const Buffer *p_buffer, const QString &p_typeName) const;
-
-        static QString findFileTypeByFile(const QString &p_filePath);
-
         QSharedPointer<NameBasedServer<IBufferFactory>> m_bufferServer;
 
         // Managed by QObject.
         QVector<Buffer *> m_buffers;
-
-        // Mapping from suffix to file type or external program name.
-        static QMap<QString, QString> s_suffixToFileType;
     };
 } // ns vnotex
 

src/core/clipboarddata.cpp

@@ -63,14 +63,14 @@ void ClipboardData::fromJson(const QJsonObject &p_jobj)
         || !p_jobj.contains(c_action)
         || !p_jobj.contains(c_data)) {
         Exception::throwOne(Exception::Type::InvalidArgument,
-                            QStringLiteral("fail to parse ClipboardData from json (%1)").arg(p_jobj.keys().join(',')));
+                            QString("fail to parse ClipboardData from json (%1)").arg(p_jobj.keys().join(',')));
         return;
     }
 
     auto idRet = stringToID(p_jobj[c_instanceId].toString());
     if (!idRet.first) {
         Exception::throwOne(Exception::Type::InvalidArgument,
-                            QStringLiteral("fail to parse ClipboardData from json (%1)").arg(p_jobj.keys().join(',')));
+                            QString("fail to parse ClipboardData from json (%1)").arg(p_jobj.keys().join(',')));
         return;
     }
     m_instanceId = idRet.second;
@@ -79,7 +79,7 @@ void ClipboardData::fromJson(const QJsonObject &p_jobj)
     m_action = intToAction(act);
     if (m_action == Action::Invalid) {
         Exception::throwOne(Exception::Type::InvalidArgument,
-                            QStringLiteral("fail to parse ClipboardData from json (%1)").arg(p_jobj.keys().join(',')));
+                            QString("fail to parse ClipboardData from json (%1)").arg(p_jobj.keys().join(',')));
         return;
     }
 

src/core/configmgr.cpp

@@ -11,7 +11,6 @@
 #include <QPixmap>
 #include <QSplashScreen>
 #include <QScopedPointer>
-#include <QTemporaryDir>
 
 #include <utils/pathutils.h>
 #include <utils/fileutils.h>
@@ -36,10 +35,6 @@ const QString ConfigMgr::c_configFileName = "vnotex.json";
 
 const QString ConfigMgr::c_sessionFileName = "session.json";
 
-const QString ConfigMgr::c_userFilesFolder = "user_files";
-
-const QString ConfigMgr::c_appFilesFolder = "vnotex_files";
-
 const QJsonObject &ConfigMgr::Settings::getJson() const
 {
     return m_jobj;
@@ -61,33 +56,14 @@ void ConfigMgr::Settings::writeToFile(const QString &p_jsonFilePath) const
     FileUtils::writeFile(p_jsonFilePath, QJsonDocument(this->m_jobj).toJson());
 }
 
-ConfigMgr::ConfigMgr(bool p_isUnitTest, QObject *p_parent)
+ConfigMgr::ConfigMgr(QObject *p_parent)
     : QObject(p_parent),
       m_config(new MainConfig(this)),
       m_sessionConfig(new SessionConfig(this))
 {
-    if (p_isUnitTest) {
-        m_dirForUnitTest.reset(new QTemporaryDir());
-        if (!m_dirForUnitTest->isValid()) {
-            qWarning() << "failed to init ConfigMgr for UnitTest";
-            return;
-        }
-
-        QDir dir(m_dirForUnitTest->path());
-        dir.mkdir(c_appFilesFolder);
-        dir.mkdir(c_userFilesFolder);
-
-        m_appConfigFolderPath = m_dirForUnitTest->filePath(c_appFilesFolder);
-        m_userConfigFolderPath = m_dirForUnitTest->filePath(c_userFilesFolder);
-        return;
-    }
-
     locateConfigFolder();
 
-    bool needUpdate = checkAppConfig();
-    if (needUpdate) {
-        checkUserConfig();
-    }
+    checkAppConfig();
 
     m_config->init();
     m_sessionConfig->init();
@@ -97,24 +73,14 @@ ConfigMgr::~ConfigMgr()
 {
 }
 
-ConfigMgr &ConfigMgr::getInst(bool p_isUnitTest)
-{
-    static ConfigMgr inst(p_isUnitTest);
-    return inst;
-}
-
-void ConfigMgr::initForUnitTest()
-{
-    getInst(true);
-}
-
 void ConfigMgr::locateConfigFolder()
 {
     const auto appDirPath = getApplicationDirPath();
     qInfo() << "app folder" << appDirPath;
     // Check app config.
     {
-        QString folderPath(appDirPath + '/' + c_appFilesFolder);
+        const QString configFolderName("vnotex_files");
+        QString folderPath(appDirPath + '/' + configFolderName);
         if (QDir(folderPath).exists()) {
             // Config folder in app/.
             m_appConfigFolderPath = PathUtils::cleanPath(folderPath);
@@ -125,7 +91,8 @@ void ConfigMgr::locateConfigFolder()
 
     // Check user config.
     {
-        QString folderPath(appDirPath + '/' + c_userFilesFolder);
+        const QString configFolderName("user_files");
+        QString folderPath(appDirPath + '/' + configFolderName);
         if (QDir(folderPath).exists()) {
             // Config folder in app/.
             m_userConfigFolderPath = PathUtils::cleanPath(folderPath);
@@ -143,7 +110,7 @@ void ConfigMgr::locateConfigFolder()
     qInfo() << "user config folder" << m_userConfigFolderPath;
 }
 
-bool ConfigMgr::checkAppConfig()
+void ConfigMgr::checkAppConfig()
 {
     bool needUpdate = false;
     QDir appConfigDir(m_appConfigFolderPath);
@@ -177,7 +144,7 @@ bool ConfigMgr::checkAppConfig()
 
 #ifndef VX_DEBUG_WEB
     if (!needUpdate) {
-        return false;
+        return;
     }
 #endif
 
@@ -191,11 +158,12 @@ bool ConfigMgr::checkAppConfig()
 
     // Load extra data.
     splash->showMessage("Loading extra resource data");
-    const QString extraRcc("app:vnote_extra.rcc");
+    const QString extraRcc(PathUtils::concatenateFilePath(QCoreApplication::applicationDirPath(),
+                                                          QStringLiteral("vnote_extra.rcc")));
     bool ret = QResource::registerResource(extraRcc);
     if (!ret) {
         Exception::throwOne(Exception::Type::FailToReadFile,
-                            QStringLiteral("failed to register resource file %1").arg(extraRcc));
+                            QString("failed to register resource file %1").arg(extraRcc));
     }
     auto cleanup = qScopeGuard([extraRcc]() {
         QResource::unregisterResource(extraRcc);
@@ -220,7 +188,7 @@ bool ConfigMgr::checkAppConfig()
         FileUtils::copyFile(getConfigFilePath(Source::Default), mainConfigFilePath);
         FileUtils::copyDir(extraDataRoot + QStringLiteral("/web"),
                            appConfigDir.filePath(QStringLiteral("web")));
-        return false;
+        return;
     }
 #else
     Q_ASSERT(needUpdate);
@@ -232,12 +200,6 @@ bool ConfigMgr::checkAppConfig()
     FileUtils::copyDir(extraDataRoot + QStringLiteral("/themes"),
                        appConfigDir.filePath(QStringLiteral("themes")));
 
-    // Copy tasks.
-    qApp->processEvents();
-    splash->showMessage("Copying tasks");
-    FileUtils::copyDir(extraDataRoot + QStringLiteral("/tasks"),
-                       appConfigDir.filePath(QStringLiteral("tasks")));
-
     // Copy docs.
     qApp->processEvents();
     splash->showMessage("Copying docs");
@@ -265,27 +227,6 @@ bool ConfigMgr::checkAppConfig()
     // Main config file.
     FileUtils::copyFile(getConfigFilePath(Source::Default), appConfigDir.filePath(c_configFileName));
 
-    return needUpdate;
-}
-
-void ConfigMgr::checkUserConfig()
-{
-    // Mainly check if the user config and session config is read-only.
-    const auto userFile = getConfigFilePath(Source::User);
-    if (QFileInfo::exists(userFile)) {
-        if (!(QFile::permissions(userFile) & QFile::WriteUser)) {
-            qDebug() << "make user config file writable" << userFile;
-            QFile::setPermissions(userFile, QFile::WriteUser);
-        }
-    }
-
-    const auto sessionFile = getConfigFilePath(Source::Session);
-    if (QFileInfo::exists(sessionFile)) {
-        if (!(QFile::permissions(sessionFile) & QFile::WriteUser)) {
-            qDebug() << "make session config file writable" << sessionFile;
-            QFile::setPermissions(sessionFile, QFile::WriteUser);
-        }
-    }
 }
 
 QString ConfigMgr::getConfigFilePath(Source p_src) const
@@ -388,18 +329,6 @@ QString ConfigMgr::getUserThemeFolder() const
     return folderPath;
 }
 
-QString ConfigMgr::getAppTaskFolder() const
-{
-    return PathUtils::concatenateFilePath(m_appConfigFolderPath, QStringLiteral("tasks"));
-}
-
-QString ConfigMgr::getUserTaskFolder() const
-{
-    auto folderPath = PathUtils::concatenateFilePath(m_userConfigFolderPath, QStringLiteral("tasks"));
-    QDir().mkpath(folderPath);
-    return folderPath;
-}
-
 QString ConfigMgr::getAppWebStylesFolder() const
 {
     return PathUtils::concatenateFilePath(m_appConfigFolderPath, QStringLiteral("web-styles"));
@@ -466,17 +395,6 @@ QString ConfigMgr::getUserSnippetFolder() const
     return folderPath;
 }
 
-QString ConfigMgr::getUserMarkdownUserStyleFile() const
-{
-    auto folderPath = PathUtils::concatenateFilePath(m_userConfigFolderPath, QStringLiteral("web/css"));
-    auto filePath = PathUtils::concatenateFilePath(folderPath, QStringLiteral("user.css"));
-    if (!QFileInfo::exists(filePath)) {
-        QDir().mkpath(folderPath);
-        FileUtils::writeFile(filePath, QByteArray());
-    }
-    return filePath;
-}
-
 QString ConfigMgr::getUserOrAppFile(const QString &p_filePath) const
 {
     QFileInfo fi(p_filePath);
@@ -569,46 +487,3 @@ QString ConfigMgr::getApplicationVersion()
 
     return appVersion;
 }
-
-void ConfigMgr::initAppPrefixPath()
-{
-    // Support QFile("app:abc.txt").
-    QStringList potential_dirs;
-    auto app_dir_path = QCoreApplication::applicationDirPath();
-    qInfo() << "app prefix path: " << app_dir_path;
-    potential_dirs << app_dir_path;
-
-#if defined(Q_OS_LINUX)
-    QDir localBinDir(app_dir_path);
-    if (localBinDir.exists("../local/bin/vnote")) {
-        auto app_dir_path2 = localBinDir.cleanPath(localBinDir.filePath("../local/share"));
-        qInfo() << "app prefix path: " << app_dir_path2;
-        potential_dirs << app_dir_path2;
-    }
-    if (localBinDir.exists("../share")) {
-        auto app_dir_path3 = localBinDir.cleanPath(localBinDir.filePath("../share"));
-        qInfo() << "app prefix path: " << app_dir_path3;
-        potential_dirs << app_dir_path3;
-    }
-#elif defined(Q_OS_MACOS)
-    QDir localBinDir(app_dir_path);
-    if (localBinDir.exists("../Resources")) {
-        auto app_dir_path2 = localBinDir.cleanPath(localBinDir.filePath("../Resources"));
-        qInfo() << "app prefix path: " << app_dir_path2;
-        potential_dirs << app_dir_path2;
-    }
-#endif
-
-    QDir::setSearchPaths("app", potential_dirs);
-}
-
-QJsonValue ConfigMgr::parseAndReadConfig(const QString &p_exp) const
-{
-    if (p_exp.startsWith(QStringLiteral("main."))) {
-        return Utils::parseAndReadJson(m_config->toJson(), p_exp.mid(5));
-    } else if (p_exp.startsWith(QStringLiteral("session."))) {
-        return Utils::parseAndReadJson(m_sessionConfig->toJson(), p_exp.mid(8));
-    } else {
-        return QJsonValue();
-    }
-}

src/core/configmgr.h

@@ -8,8 +8,6 @@
 
 #include "noncopyable.h"
 
-class QTemporaryDir;
-
 namespace vnotex
 {
     class MainConfig;
@@ -50,9 +48,13 @@ namespace vnotex
             QJsonObject m_jobj;
         };
 
-        ~ConfigMgr();
+        static ConfigMgr &getInst()
+        {
+            static ConfigMgr inst;
+            return inst;
+        }
 
-        static ConfigMgr &getInst(bool p_isUnitTest = false);
+        ~ConfigMgr();
 
         MainConfig &getConfig();
 
@@ -74,10 +76,6 @@ namespace vnotex
 
         QString getUserThemeFolder() const;
 
-        QString getAppTaskFolder() const;
-
-        QString getUserTaskFolder() const;
-
         QString getAppWebStylesFolder() const;
 
         QString getUserWebStylesFolder() const;
@@ -97,18 +95,12 @@ namespace vnotex
 
         QString getUserSnippetFolder() const;
 
-        // web/css/user.css.
-        QString getUserMarkdownUserStyleFile() const;
-
         // If @p_filePath is absolute, just return it.
         // Otherwise, first try to find it in user folder, then in app folder.
         QString getUserOrAppFile(const QString &p_filePath) const;
 
         QString getConfigFilePath(Source p_src) const;
 
-        // Parse exp like "[main|session].core.shortcuts.FullScreen" and return the config value.
-        QJsonValue parseAndReadConfig(const QString &p_exp) const;
-
         // Called at boostrap without QApplication instance.
         static QString locateSessionConfigFilePathAtBootstrap();
 
@@ -120,10 +112,6 @@ namespace vnotex
 
         static QString getApplicationVersion();
 
-        static void initAppPrefixPath();
-
-        static void initForUnitTest();
-
         static const QString c_orgName;
 
         static const QString c_appName;
@@ -140,17 +128,14 @@ namespace vnotex
         void editorConfigChanged();
 
     private:
-        ConfigMgr(bool p_isUnitTest, QObject *p_parent = nullptr);
+        explicit ConfigMgr(QObject *p_parent = nullptr);
 
         // Locate the folder path where the config file exists.
         void locateConfigFolder();
 
         // Check if app config exists and is updated.
         // Update it if in need.
-        // Return true if there is update.
-        bool checkAppConfig();
-
-        void checkUserConfig();
+        void checkAppConfig();
 
         static QString getDefaultConfigFilePath();
 
@@ -165,18 +150,11 @@ namespace vnotex
         // Absolute path of the user config folder.
         QString m_userConfigFolderPath;
 
-        // In UnitTest, we use a temp dir to hold the user files and app files.
-        QScopedPointer<QTemporaryDir> m_dirForUnitTest;
-
         // Name of the core config file.
         static const QString c_configFileName;
 
         // Name of the session config file.
         static const QString c_sessionFileName;
-
-        static const QString c_userFilesFolder;
-
-        static const QString c_appFilesFolder;
     };
 } // ns vnotex
 

src/core/core.pri

@@ -0,0 +1,71 @@
+INCLUDEPATH *= $$PWD
+
+include($$PWD/notebookbackend/notebookbackend.pri)
+
+include($$PWD/versioncontroller/versioncontroller.pri)
+
+include($$PWD/notebookconfigmgr/notebookconfigmgr.pri)
+
+include($$PWD/notebook/notebook.pri)
+
+include($$PWD/buffer/buffer.pri)
+
+SOURCES += \
+    $$PWD/buffermgr.cpp \
+    $$PWD/configmgr.cpp \
+    $$PWD/coreconfig.cpp \
+    $$PWD/editorconfig.cpp \
+    $$PWD/externalfile.cpp \
+    $$PWD/file.cpp \
+    $$PWD/historyitem.cpp \
+    $$PWD/historymgr.cpp \
+    $$PWD/htmltemplatehelper.cpp \
+    $$PWD/logger.cpp \
+    $$PWD/mainconfig.cpp \
+    $$PWD/markdowneditorconfig.cpp \
+    $$PWD/quickaccesshelper.cpp \
+    $$PWD/singleinstanceguard.cpp \
+    $$PWD/templatemgr.cpp \
+    $$PWD/texteditorconfig.cpp \
+    $$PWD/vnotex.cpp \
+    $$PWD/thememgr.cpp \
+    $$PWD/notebookmgr.cpp \
+    $$PWD/theme.cpp \
+    $$PWD/sessionconfig.cpp \
+    $$PWD/clipboarddata.cpp \
+    $$PWD/widgetconfig.cpp
+
+HEADERS += \
+    $$PWD/buffermgr.h \
+    $$PWD/configmgr.h \
+    $$PWD/coreconfig.h \
+    $$PWD/editorconfig.h \
+    $$PWD/events.h \
+    $$PWD/externalfile.h \
+    $$PWD/file.h \
+    $$PWD/filelocator.h \
+    $$PWD/fileopenparameters.h \
+    $$PWD/historyitem.h \
+    $$PWD/historymgr.h \
+    $$PWD/htmltemplatehelper.h \
+    $$PWD/location.h \
+    $$PWD/logger.h \
+    $$PWD/mainconfig.h \
+    $$PWD/markdowneditorconfig.h \
+    $$PWD/noncopyable.h \
+    $$PWD/quickaccesshelper.h \
+    $$PWD/singleinstanceguard.h \
+    $$PWD/iconfig.h \
+    $$PWD/templatemgr.h \
+    $$PWD/texteditorconfig.h \
+    $$PWD/vnotex.h \
+    $$PWD/thememgr.h \
+    $$PWD/global.h \
+    $$PWD/namebasedserver.h \
+    $$PWD/exception.h \
+    $$PWD/notebookmgr.h \
+    $$PWD/theme.h \
+    $$PWD/sessionconfig.h \
+    $$PWD/clipboarddata.h \
+    $$PWD/webresource.h \
+    $$PWD/widgetconfig.h

src/core/coreconfig.cpp

@@ -3,9 +3,6 @@
 #include <QMetaEnum>
 #include <QLocale>
 
-#include <utils/utils.h>
-#include <buffer/filetypehelper.h>
-
 using namespace vnotex;
 
 #define READSTR(key) readString(appObj, userObj, (key))
@@ -13,17 +10,6 @@ using namespace vnotex;
 #define READBOOL(key) readBool(appObj, userObj, (key))
 #define READSTRLIST(key) readStringList(appObj, userObj, (key))
 
-CoreConfig::FileTypeSuffix::FileTypeSuffix(const QString &p_name, const QStringList &p_suffixes)
-    : m_name(p_name),
-      m_suffixes(p_suffixes)
-{
-}
-
-bool CoreConfig::FileTypeSuffix::operator==(const FileTypeSuffix &p_other) const
-{
-    return m_name == p_other.m_name && m_suffixes == p_other.m_suffixes;
-}
-
 QStringList CoreConfig::s_availableLocales;
 
 CoreConfig::CoreConfig(ConfigMgr *p_mgr, IConfig *p_topConfig)
@@ -57,44 +43,19 @@ void CoreConfig::init(const QJsonObject &p_app,
 
     loadShortcuts(appObj, userObj);
 
-    m_shortcutLeaderKey = READSTR(QStringLiteral("shortcut_leader_key"));
-
     m_toolBarIconSize = READINT(QStringLiteral("toolbar_icon_size"));
     if (m_toolBarIconSize <= 0) {
-        m_toolBarIconSize = 18;
-    }
-
-    m_docksTabBarIconSize = READINT(QStringLiteral("docks_tabbar_icon_size"));
-    if (m_docksTabBarIconSize <= 0) {
-        m_docksTabBarIconSize = 18;
+        m_toolBarIconSize = 16;
     }
 
     loadNoteManagement(appObj, userObj);
 
     m_recoverLastSessionOnStartEnabled = READBOOL(QStringLiteral("recover_last_session_on_start"));
 
-    m_checkForUpdatesOnStartEnabled = READBOOL(QStringLiteral("check_for_updates_on_start"));
-
     m_historyMaxCount = READINT(QStringLiteral("history_max_count"));
     if (m_historyMaxCount < 0) {
         m_historyMaxCount = 100;
     }
-
-    m_perNotebookHistoryEnabled = READBOOL(QStringLiteral("per_notebook_history"));
-
-    {
-        auto lineEnding = READSTR(QStringLiteral("line_ending"));
-        m_lineEnding = stringToLineEndingPolicy(lineEnding);
-    }
-
-    {
-        auto mode = READSTR(QStringLiteral("default_open_mode"));
-        m_defaultOpenMode = stringToViewWindowMode(mode);
-    }
-
-    loadFileTypeSuffixes(appObj, userObj);
-
-    loadUnitedEntry(appObj, userObj);
 }
 
 QJsonObject CoreConfig::toJson() const
@@ -103,17 +64,9 @@ QJsonObject CoreConfig::toJson() const
     obj[QStringLiteral("theme")] = m_theme;
     obj[QStringLiteral("locale")] = m_locale;
     obj[QStringLiteral("shortcuts")] = saveShortcuts();
-    obj[QStringLiteral("shortcut_leader_key")] = m_shortcutLeaderKey;
     obj[QStringLiteral("toolbar_icon_size")] = m_toolBarIconSize;
-    obj[QStringLiteral("docks_tabbar_icon_size")] = m_docksTabBarIconSize;
     obj[QStringLiteral("recover_last_session_on_start")] = m_recoverLastSessionOnStartEnabled;
-    obj[QStringLiteral("check_for_updates_on_start")] = m_checkForUpdatesOnStartEnabled;
     obj[QStringLiteral("history_max_count")] = m_historyMaxCount;
-    obj[QStringLiteral("per_notebook_history")] = m_perNotebookHistoryEnabled;
-    obj[QStringLiteral("line_ending")] = lineEndingPolicyToString(m_lineEnding);
-    obj[QStringLiteral("file_type_suffixes")] = saveFileTypeSuffixes();
-    obj[QStringLiteral("united_entry")] = saveUnitedEntry();
-    obj[QStringLiteral("default_open_mode")] = viewWindowModeToString(m_defaultOpenMode);
     return obj;
 }
 
@@ -201,17 +154,6 @@ void CoreConfig::setToolBarIconSize(int p_size)
     updateConfig(m_toolBarIconSize, p_size, this);
 }
 
-int CoreConfig::getDocksTabBarIconSize() const
-{
-    return m_docksTabBarIconSize;
-}
-
-void CoreConfig::setDocksTabBarIconSize(int p_size)
-{
-    Q_ASSERT(p_size > 0);
-    updateConfig(m_docksTabBarIconSize, p_size, this);
-}
-
 const QStringList &CoreConfig::getExternalNodeExcludePatterns() const
 {
     return m_externalNodeExcludePatterns;
@@ -227,173 +169,7 @@ void CoreConfig::setRecoverLastSessionOnStartEnabled(bool p_enabled)
     updateConfig(m_recoverLastSessionOnStartEnabled, p_enabled, this);
 }
 
-bool CoreConfig::isCheckForUpdatesOnStartEnabled() const
-{
-    return m_checkForUpdatesOnStartEnabled;
-}
-
-void CoreConfig::setCheckForUpdatesOnStartEnabled(bool p_enabled)
-{
-    updateConfig(m_checkForUpdatesOnStartEnabled, p_enabled, this);
-}
-
 int CoreConfig::getHistoryMaxCount() const
 {
     return m_historyMaxCount;
 }
-
-bool CoreConfig::isPerNotebookHistoryEnabled() const
-{
-    return m_perNotebookHistoryEnabled;
-}
-
-void CoreConfig::setPerNotebookHistoryEnabled(bool p_enabled)
-{
-    updateConfig(m_perNotebookHistoryEnabled, p_enabled, this);
-}
-
-const QString &CoreConfig::getShortcutLeaderKey() const
-{
-    return m_shortcutLeaderKey;
-}
-
-LineEndingPolicy CoreConfig::getLineEndingPolicy() const
-{
-    return m_lineEnding;
-}
-
-void CoreConfig::setLineEndingPolicy(LineEndingPolicy p_ending)
-{
-    updateConfig(m_lineEnding, p_ending, this);
-}
-
-void CoreConfig::loadFileTypeSuffixes(const QJsonObject &p_app, const QJsonObject &p_user)
-{
-    m_fileTypeSuffixes.clear();
-
-    QJsonArray arr;
-    if (p_user.contains(QStringLiteral("file_type_suffixes"))) {
-        arr = p_user[QStringLiteral("file_type_suffixes")].toArray();
-    } else {
-        arr = p_app[QStringLiteral("file_type_suffixes")].toArray();
-    }
-
-    m_fileTypeSuffixes.reserve(arr.size());
-
-    bool hasSystemDefined = false;
-
-    for (int i = 0; i < arr.size(); ++i) {
-        const auto obj = arr[i].toObject();
-        const auto name = obj[QStringLiteral("name")].toString();
-        if (name.isEmpty()) {
-            continue;
-        }
-
-        if (!hasSystemDefined && name == FileTypeHelper::s_systemDefaultProgram) {
-            hasSystemDefined = true;
-        }
-
-        const auto suffixes = readStringList(obj, QStringLiteral("suffixes"));
-        m_fileTypeSuffixes.push_back(FileTypeSuffix(name, Utils::toLower(suffixes)));
-    }
-
-    if (!hasSystemDefined) {
-        m_fileTypeSuffixes.push_back(FileTypeSuffix(FileTypeHelper::s_systemDefaultProgram, QStringList()));
-    }
-}
-
-QJsonArray CoreConfig::saveFileTypeSuffixes() const
-{
-    QJsonArray arr;
-    for (const auto &fts : m_fileTypeSuffixes) {
-        QJsonObject obj;
-        obj[QStringLiteral("name")] = fts.m_name;
-        writeStringList(obj, QStringLiteral("suffixes"), fts.m_suffixes);
-        arr.push_back(obj);
-    }
-    return arr;
-}
-
-void CoreConfig::loadUnitedEntry(const QJsonObject &p_app, const QJsonObject &p_user)
-{
-    QJsonObject unitedObj;
-    if (p_user.contains(QStringLiteral("united_entry"))) {
-        unitedObj = p_user[QStringLiteral("united_entry")].toObject();
-    } else {
-        unitedObj = p_app[QStringLiteral("united_entry")].toObject();
-    }
-
-    m_unitedEntryAlias = unitedObj[QStringLiteral("alias")].toArray();
-}
-
-QJsonObject CoreConfig::saveUnitedEntry() const
-{
-    QJsonObject unitedObj;
-    unitedObj[QStringLiteral("alias")] = m_unitedEntryAlias;
-    return unitedObj;
-}
-
-const QVector<CoreConfig::FileTypeSuffix> &CoreConfig::getFileTypeSuffixes() const
-{
-    return m_fileTypeSuffixes;
-}
-
-void CoreConfig::setFileTypeSuffixes(const QVector<CoreConfig::FileTypeSuffix> &p_fileTypeSuffixes)
-{
-    updateConfig(m_fileTypeSuffixes, p_fileTypeSuffixes, this);
-}
-
-const QStringList *CoreConfig::findFileTypeSuffix(const QString &p_name) const
-{
-    if (p_name.isEmpty()) {
-        return nullptr;
-    }
-
-    for (const auto &fts : m_fileTypeSuffixes) {
-        if (fts.m_name == p_name) {
-            return &fts.m_suffixes;
-        }
-    }
-
-    return nullptr;
-}
-
-const QJsonArray &CoreConfig::getUnitedEntryAlias() const
-{
-    return m_unitedEntryAlias;
-}
-
-void CoreConfig::setUnitedEntryAlias(const QJsonArray &p_alias)
-{
-    updateConfig(m_unitedEntryAlias, p_alias, this);
-}
-
-ViewWindowMode CoreConfig::getDefaultOpenMode() const
-{
-    return m_defaultOpenMode;
-}
-
-void CoreConfig::setDefaultOpenMode(ViewWindowMode p_mode)
-{
-    updateConfig(m_defaultOpenMode, p_mode, this);
-}
-
-ViewWindowMode CoreConfig::stringToViewWindowMode(const QString &p_mode)
-{
-    if (p_mode == "edit") {
-        return ViewWindowMode::Edit;
-    }
-
-    return ViewWindowMode::Read;
-}
-
-QString CoreConfig::viewWindowModeToString(ViewWindowMode p_mode)
-{
-    switch (p_mode) {
-    case ViewWindowMode::Edit:
-        return "edit";
-
-    default:
-        return "read";
-    }
-}

src/core/coreconfig.h

@@ -7,8 +7,6 @@
 #include <QString>
 #include <QStringList>
 
-#include "global.h"
-
 namespace vnotex
 {
     class CoreConfig : public IConfig
@@ -22,21 +20,13 @@ namespace vnotex
             ExpandContentArea,
             Settings,
             NewNote,
-            NewQuickNote,
-            NewFolder,
             CloseTab,
-            CloseAllTabs,
-            CloseOtherTabs,
-            CloseTabsToTheLeft,
-            CloseTabsToTheRight,
             NavigationDock,
             OutlineDock,
             SearchDock,
             SnippetDock,
             LocationListDock,
             HistoryDock,
-            WindowsDock,
-            TagDock,
             Search,
             NavigationMode,
             LocateNode,
@@ -73,29 +63,10 @@ namespace vnotex
             MoveOneSplitUp,
             MoveOneSplitRight,
             OpenLastClosedFile,
-            UnitedEntry,
-            Copy,
-            Paste,
-            Cut,
-            Properties,
-            Global_WakeUp,
             MaxShortcut
         };
         Q_ENUM(Shortcut)
 
-        struct FileTypeSuffix
-        {
-            FileTypeSuffix() = default;
-
-            FileTypeSuffix(const QString &p_name, const QStringList &p_suffixes);
-
-            bool operator==(const FileTypeSuffix &p_other) const;
-
-            QString m_name;
-
-            QStringList m_suffixes;
-        };
-
         CoreConfig(ConfigMgr *p_mgr, IConfig *p_topConfig);
 
         void init(const QJsonObject &p_app, const QJsonObject &p_user) Q_DECL_OVERRIDE;
@@ -116,9 +87,6 @@ namespace vnotex
         int getToolBarIconSize() const;
         void setToolBarIconSize(int p_size);
 
-        int getDocksTabBarIconSize() const;
-        void setDocksTabBarIconSize(int p_size);
-
         const QStringList &getExternalNodeExcludePatterns() const;
 
         static const QStringList &getAvailableLocales();
@@ -126,30 +94,8 @@ namespace vnotex
         bool isRecoverLastSessionOnStartEnabled() const;
         void setRecoverLastSessionOnStartEnabled(bool p_enabled);
 
-        bool isCheckForUpdatesOnStartEnabled() const;
-        void setCheckForUpdatesOnStartEnabled(bool p_enabled);
-
         int getHistoryMaxCount() const;
 
-        bool isPerNotebookHistoryEnabled() const;
-        void setPerNotebookHistoryEnabled(bool p_enabled);
-
-        const QString &getShortcutLeaderKey() const;
-
-        LineEndingPolicy getLineEndingPolicy() const;
-        void setLineEndingPolicy(LineEndingPolicy p_ending);
-
-        const QVector<FileTypeSuffix> &getFileTypeSuffixes() const;
-        void setFileTypeSuffixes(const QVector<FileTypeSuffix> &p_fileTypeSuffixes);
-
-        const QStringList *findFileTypeSuffix(const QString &p_name) const;
-
-        const QJsonArray &getUnitedEntryAlias() const;
-        void setUnitedEntryAlias(const QJsonArray &p_alias);
-
-        ViewWindowMode getDefaultOpenMode() const;
-        void setDefaultOpenMode(ViewWindowMode p_mode);
-
     private:
         friend class MainConfig;
 
@@ -159,17 +105,6 @@ namespace vnotex
 
         QJsonObject saveShortcuts() const;
 
-        void loadFileTypeSuffixes(const QJsonObject &p_app, const QJsonObject &p_user);
-
-        QJsonArray saveFileTypeSuffixes() const;
-
-        void loadUnitedEntry(const QJsonObject &p_app, const QJsonObject &p_user);
-
-        QJsonObject saveUnitedEntry() const;
-
-        static ViewWindowMode stringToViewWindowMode(const QString &p_mode);
-        static QString viewWindowModeToString(ViewWindowMode p_mode);
-
         // Theme name.
         QString m_theme;
 
@@ -179,36 +114,17 @@ namespace vnotex
 
         QString m_shortcuts[Shortcut::MaxShortcut];
 
-        // Leader key of shortcuts defined in m_shortctus.
-        QString m_shortcutLeaderKey;
-
         // Icon size of MainWindow tool bar.
-        int m_toolBarIconSize = 18;
-
-        // Icon size of MainWindow QDockWidgets tab bar.
-        int m_docksTabBarIconSize = 20;
+        int m_toolBarIconSize = 16;
 
         QStringList m_externalNodeExcludePatterns;
 
         // Whether recover last session on start.
         bool m_recoverLastSessionOnStartEnabled = true;
 
-        bool m_checkForUpdatesOnStartEnabled = true;
-
         // Max count of the history items for each notebook and session config.
         int m_historyMaxCount = 100;
 
-        // Whether store history in each notebook.
-        bool m_perNotebookHistoryEnabled = false;
-
-        LineEndingPolicy m_lineEnding = LineEndingPolicy::LF;
-
-        QVector<FileTypeSuffix> m_fileTypeSuffixes;
-
-        QJsonArray m_unitedEntryAlias;
-
-        ViewWindowMode m_defaultOpenMode = ViewWindowMode::Read;
-
         static QStringList s_availableLocales;
     };
 } // ns vnotex

src/core/editorconfig.cpp

@@ -5,8 +5,6 @@
 
 #include "texteditorconfig.h"
 #include "markdowneditorconfig.h"
-#include "pdfviewerconfig.h"
-#include "mindmapeditorconfig.h"
 
 #include <vtextedit/viconfig.h>
 
@@ -43,9 +41,7 @@ QJsonObject EditorConfig::ImageHostItem::toJson() const
 EditorConfig::EditorConfig(ConfigMgr *p_mgr, IConfig *p_topConfig)
     : IConfig(p_mgr, p_topConfig),
       m_textEditorConfig(new TextEditorConfig(p_mgr, p_topConfig)),
-      m_markdownEditorConfig(new MarkdownEditorConfig(p_mgr, p_topConfig, m_textEditorConfig)),
-      m_pdfViewerConfig(new PdfViewerConfig(p_mgr, p_topConfig)),
-      m_mindMapEditorConfig(new MindMapEditorConfig(p_mgr, p_topConfig))
+      m_markdownEditorConfig(new MarkdownEditorConfig(p_mgr, p_topConfig, m_textEditorConfig))
 {
     m_sessionName = QStringLiteral("editor");
 }
@@ -69,8 +65,6 @@ void EditorConfig::init(const QJsonObject &p_app,
 
     m_textEditorConfig->init(appObj, userObj);
     m_markdownEditorConfig->init(appObj, userObj);
-    m_pdfViewerConfig->init(appObj, userObj);
-    m_mindMapEditorConfig->init(appObj, userObj);
 }
 
 void EditorConfig::loadCore(const QJsonObject &p_app, const QJsonObject &p_user)
@@ -101,11 +95,6 @@ void EditorConfig::loadCore(const QJsonObject &p_app, const QJsonObject &p_user)
     if (m_spellCheckDefaultDictionary.isEmpty()) {
         m_spellCheckDefaultDictionary = QStringLiteral("en_US");
     }
-
-    {
-        auto lineEnding = READSTR(QStringLiteral("line_ending"));
-        m_lineEnding = stringToLineEndingPolicy(lineEnding);
-    }
 }
 
 QJsonObject EditorConfig::saveCore() const
@@ -118,7 +107,6 @@ QJsonObject EditorConfig::saveCore() const
     obj[QStringLiteral("shortcuts")] = saveShortcuts();
     obj[QStringLiteral("spell_check_auto_detect_language")] = m_spellCheckAutoDetectLanguageEnabled;
     obj[QStringLiteral("spell_check_default_dictionary")] = m_spellCheckDefaultDictionary;
-    obj[QStringLiteral("line_ending")] = lineEndingPolicyToString(m_lineEnding);
     return obj;
 }
 
@@ -154,15 +142,9 @@ QJsonObject EditorConfig::toJson() const
     QJsonObject obj;
     obj[m_textEditorConfig->getSessionName()] = m_textEditorConfig->toJson();
     obj[m_markdownEditorConfig->getSessionName()] = m_markdownEditorConfig->toJson();
-    obj[m_pdfViewerConfig->getSessionName()] = m_pdfViewerConfig->toJson();
-    obj[m_mindMapEditorConfig->getSessionName()] = m_mindMapEditorConfig->toJson();
     obj[QStringLiteral("core")] = saveCore();
     obj[QStringLiteral("image_host")] = saveImageHost();
-
-    // In UT, it may be nullptr.
-    if (m_viConfig) {
     obj[QStringLiteral("vi")] = m_viConfig->toJson();
-    }
     return obj;
 }
 
@@ -186,26 +168,6 @@ const MarkdownEditorConfig &EditorConfig::getMarkdownEditorConfig() const
     return *m_markdownEditorConfig;
 }
 
-PdfViewerConfig &EditorConfig::getPdfViewerConfig()
-{
-    return *m_pdfViewerConfig;
-}
-
-const PdfViewerConfig &EditorConfig::getPdfViewerConfig() const
-{
-    return *m_pdfViewerConfig;
-}
-
-MindMapEditorConfig &EditorConfig::getMindMapEditorConfig()
-{
-    return *m_mindMapEditorConfig;
-}
-
-const MindMapEditorConfig &EditorConfig::getMindMapEditorConfig() const
-{
-    return *m_mindMapEditorConfig;
-}
-
 int EditorConfig::getToolBarIconSize() const
 {
     return m_toolBarIconSize;
@@ -259,16 +221,6 @@ void EditorConfig::setAutoSavePolicy(EditorConfig::AutoSavePolicy p_policy)
     updateConfig(m_autoSavePolicy, p_policy, this);
 }
 
-LineEndingPolicy EditorConfig::getLineEndingPolicy() const
-{
-    return m_lineEnding;
-}
-
-void EditorConfig::setLineEndingPolicy(LineEndingPolicy p_ending)
-{
-    updateConfig(m_lineEnding, p_ending, this);
-}
-
 const QString &EditorConfig::getBackupFileDirectory() const
 {
     return m_backupFileDirectory;

src/core/editorconfig.h

@@ -8,8 +8,6 @@
 #include <QObject>
 #include <QVector>
 
-#include "global.h"
-
 namespace vte
 {
     class ViConfig;
@@ -19,8 +17,6 @@ namespace vnotex
 {
     class TextEditorConfig;
     class MarkdownEditorConfig;
-    class PdfViewerConfig;
-    class MindMapEditorConfig;
 
     class EditorConfig : public IConfig
     {
@@ -55,19 +51,11 @@ namespace vnotex
             TypeTable,
             TypeMark,
             Outline,
-            AltPaste,
+            RichPaste,
             FindAndReplace,
             FindNext,
             FindPrevious,
             ApplySnippet,
-            Tag,
-            Debug,
-            Print,
-            ClearHighlights,
-            WordCount,
-            Attachment,
-            AlternateViewMode,
-            ParseToMarkdownAndPaste,
             MaxShortcut
         };
         Q_ENUM(Shortcut)
@@ -107,12 +95,6 @@ namespace vnotex
         MarkdownEditorConfig &getMarkdownEditorConfig();
         const MarkdownEditorConfig &getMarkdownEditorConfig() const;
 
-        PdfViewerConfig &getPdfViewerConfig();
-        const PdfViewerConfig &getPdfViewerConfig() const;
-
-        MindMapEditorConfig &getMindMapEditorConfig();
-        const MindMapEditorConfig &getMindMapEditorConfig() const;
-
         void init(const QJsonObject &p_app, const QJsonObject &p_user) Q_DECL_OVERRIDE;
 
         QJsonObject toJson() const Q_DECL_OVERRIDE;
@@ -145,9 +127,6 @@ namespace vnotex
 
         const QSharedPointer<vte::ViConfig> &getViConfig() const;
 
-        LineEndingPolicy getLineEndingPolicy() const;
-        void setLineEndingPolicy(LineEndingPolicy p_ending);
-
     private:
         friend class MainConfig;
 
@@ -184,10 +163,6 @@ namespace vnotex
 
         QScopedPointer<MarkdownEditorConfig> m_markdownEditorConfig;
 
-        QScopedPointer<PdfViewerConfig> m_pdfViewerConfig;
-
-        QScopedPointer<MindMapEditorConfig> m_mindMapEditorConfig;
-
         bool m_spellCheckAutoDetectLanguageEnabled = false;
 
         QString m_spellCheckDefaultDictionary;
@@ -199,8 +174,6 @@ namespace vnotex
         bool m_clearObsoleteImageAtImageHost = false;
 
         QSharedPointer<vte::ViConfig> m_viConfig;
-
-        LineEndingPolicy m_lineEnding = LineEndingPolicy::LF;
     };
 }
 

src/core/exception.h

@@ -23,8 +23,6 @@ namespace vnotex
             FailToRemoveDir,
             FileMissingOnDisk,
             EssentialFileMissing,
-            FileExistsOnCreate,
-            DirExistsOnCreate,
             InvalidArgument
         };
 
@@ -47,46 +45,40 @@ namespace vnotex
         {
             switch (p_type) {
             case Type::InvalidPath:
-                return QStringLiteral("InvalidPath");
+                return QString("InvalidPath");
 
             case Type::FailToCreateDir:
-                return QStringLiteral("FailToCreateDir");
+                return QString("FailToCreateDir");
 
             case Type::FailToWriteFile:
-                return QStringLiteral("FailToWriteFile");
+                return QString("FailToWriteFile");
 
             case Type::FailToReadFile:
-                return QStringLiteral("FailToReadFile");
+                return QString("FailToReadFile");
 
             case Type::FailToRenameFile:
-                return QStringLiteral("FailToRenameFile");
+                return QString("FailToRenameFile");
 
             case Type::FailToCopyFile:
-                return QStringLiteral("FailToCopyFile");
+                return QString("FailToCopyFile");
 
             case Type::FailToCopyDir:
-                return QStringLiteral("FailToCopyDir");
+                return QString("FailToCopyDir");
 
             case Type::FailToRemoveFile:
-                return QStringLiteral("FailToRemoveFile");
+                return QString("FailToRemoveFile");
 
             case Type::FailToRemoveDir:
-                return QStringLiteral("FailToRemoveDir");
+                return QString("FailToRemoveDir");
 
             case Type::FileMissingOnDisk:
-                return QStringLiteral("FileMissingOnDisk");
+                return QString("FileMissingOnDisk");
 
             case Type::EssentialFileMissing:
-                return QStringLiteral("EssentialFileMissing");
-
-            case Type::FileExistsOnCreate:
-                return QStringLiteral("FileExistsOnCreate");
-
-            case Type::DirExistsOnCreate:
-                return QStringLiteral("DirExistsOnCreate");
+                return QString("EssentialFileMissing");
 
             case Type::InvalidArgument:
-                return QStringLiteral("InvalidArgument");
+                return QString("InvalidArgument");
             }
 
             return QString::number(static_cast<int>(p_type));

src/core/file.h

@@ -59,6 +59,7 @@ namespace vnotex
 
         const FileType &getContentType() const;
 
+    protected:
         void setContentType(int p_type);
 
     private:

src/core/fileopenparameters.h

@@ -1,25 +1,14 @@
 #ifndef FILEOPENPARAMETERS_H
 #define FILEOPENPARAMETERS_H
 
-#include <functional>
-
-#include <QSharedPointer>
-
 #include "global.h"
 
 namespace vnotex
 {
     class Node;
-    class SearchToken;
 
     struct FileOpenParameters
     {
-        enum Hook
-        {
-            PostSave,
-            MaxHook
-        };
-
         ViewWindowMode m_mode = ViewWindowMode::Read;
 
         // Force to enter m_mode.
@@ -43,17 +32,6 @@ namespace vnotex
 
         // Whether always open a new window for file.
         bool m_alwaysNewWindow = false;
-
-        // If not empty, use this token to do a search text highlight.
-        QSharedPointer<SearchToken> m_searchToken;
-
-        // Whether should save this file into session.
-        bool m_sessionEnabled = true;
-
-        // Whether specify the built-in file type to open as or the external program to open with.
-        QString m_fileType;
-
-        std::function<void()> m_hooks[Hook::MaxHook];
     };
 }
 

src/core/global.cpp

@@ -1,3 +0,0 @@
-#include "global.h"
-
-using namespace vnotex;

src/core/global.h

@@ -94,6 +94,8 @@ namespace vnotex
     {
         Read,
         Edit,
+        FullPreview,
+        FocusPreview,
         Invalid
     };
 
@@ -131,73 +133,6 @@ namespace vnotex
         int m_length = -1;
     };
 
-    enum class LineEndingPolicy
-    {
-        Platform,
-        File,
-        LF,
-        CRLF,
-        CR
-    };
-
-    inline QString lineEndingPolicyToString(LineEndingPolicy p_ending)
-    {
-        switch (p_ending) {
-        case LineEndingPolicy::Platform:
-            return QStringLiteral("platform");
-
-        case LineEndingPolicy::File:
-            return QStringLiteral("file");
-
-        case LineEndingPolicy::LF:
-            return QStringLiteral("lf");
-
-        case LineEndingPolicy::CRLF:
-            return QStringLiteral("crlf");
-
-        case LineEndingPolicy::CR:
-            return QStringLiteral("cr");
-        }
-
-        return QStringLiteral("platform");
-    }
-
-    inline LineEndingPolicy stringToLineEndingPolicy(const QString &p_str)
-    {
-        auto ending = p_str.toLower();
-        if (ending == QStringLiteral("file")) {
-            return LineEndingPolicy::File;
-        } else if (ending == QStringLiteral("lf")) {
-            return LineEndingPolicy::LF;
-        } else if (ending == QStringLiteral("crlf")) {
-            return LineEndingPolicy::CRLF;
-        } else if (ending == QStringLiteral("cr")) {
-            return LineEndingPolicy::CR;
-        } else {
-            return LineEndingPolicy::Platform;
-        }
-    }
-
-    enum Role
-    {
-        // Qt::UserRole = 0x0100
-        UserRole2 = 0x0101,
-        HighlightsRole = 0x0102,
-        // Used for comparison.
-        ComparisonRole = 0x0103
-    };
-
-    enum ViewOrder
-    {
-        OrderedByConfiguration = 0,
-        OrderedByName,
-        OrderedByNameReversed,
-        OrderedByCreatedTime,
-        OrderedByCreatedTimeReversed,
-        OrderedByModifiedTime,
-        OrderedByModifiedTimeReversed,
-        ViewOrderMax
-    };
 } // ns vnotex
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(vnotex::FindOptions);

src/core/historymgr.cpp

@@ -8,7 +8,6 @@
 #include "vnotex.h"
 #include "notebookmgr.h"
 #include <notebook/notebook.h>
-#include <notebook/historyi.h>
 #include <notebookbackend/inotebookbackend.h>
 #include "exception.h"
 
@@ -26,9 +25,12 @@ bool HistoryItemFull::operator<(const HistoryItemFull &p_other) const
 }
 
 
+int HistoryMgr::s_maxHistoryCount = 100;
+
 HistoryMgr::HistoryMgr()
-    : m_perNotebookHistoryEnabled(ConfigMgr::getInst().getCoreConfig().isPerNotebookHistoryEnabled())
 {
+    s_maxHistoryCount = ConfigMgr::getInst().getCoreConfig().getHistoryMaxCount();
+
     connect(&VNoteX::getInst().getNotebookMgr(), &NotebookMgr::notebooksUpdated,
             this, &HistoryMgr::loadHistory);
 
@@ -55,14 +57,10 @@ void HistoryMgr::loadHistory()
     }
 
     // Load from notebooks.
-    if (m_perNotebookHistoryEnabled) {
+    {
         const auto &notebooks = VNoteX::getInst().getNotebookMgr().getNotebooks();
         for (const auto &nb : notebooks) {
-            auto historyI = nb->history();
-            if (!historyI) {
-                continue;
-            }
-            const auto &history = historyI->getHistory();
+            const auto &history = nb->getHistory();
             const auto &backend = nb->getBackend();
             for (const auto &item : history) {
                 auto fullItem = QSharedPointer<HistoryItemFull>::create();
@@ -94,31 +92,20 @@ const QVector<QSharedPointer<HistoryItemFull>> &HistoryMgr::getHistory() const
     return m_history;
 }
 
-void HistoryMgr::removeFromHistory(const QString &p_itemPath)
-{
-    for (int i = m_history.size() - 1; i >= 0; --i) {
-        if (m_history[i]->m_item.m_path == p_itemPath) {
-            m_history.remove(i);
-            break;
-        }
-    }
-}
-
 void HistoryMgr::add(const QString &p_path,
                      int p_lineNumber,
                      ViewWindowMode p_mode,
                      bool p_readOnly,
                      Notebook *p_notebook)
 {
-    const int maxHistoryCount = ConfigMgr::getInst().getCoreConfig().getHistoryMaxCount();
-    if (p_path.isEmpty() || maxHistoryCount == 0) {
+    if (p_path.isEmpty() || s_maxHistoryCount == 0) {
         return;
     }
 
     HistoryItem item(p_path, p_lineNumber, QDateTime::currentDateTimeUtc());
 
-    if (p_notebook && m_perNotebookHistoryEnabled && p_notebook->history()) {
-        p_notebook->history()->addHistory(item);
+    if (p_notebook) {
+        p_notebook->addHistory(item);
     } else {
         auto &sessionConfig = ConfigMgr::getInst().getSessionConfig();
         sessionConfig.addHistory(item);
@@ -126,7 +113,13 @@ void HistoryMgr::add(const QString &p_path,
 
     // Maintain the combined queue.
     {
-        removeFromHistory(item.m_path);
+        for (int i = m_history.size() - 1; i >= 0; --i) {
+            if (m_history[i]->m_item.m_path == item.m_path) {
+                // Erase it.
+                m_history.remove(i);
+                break;
+            }
+        }
 
         auto fullItem = QSharedPointer<HistoryItemFull>::create();
         fullItem->m_item = item;
@@ -152,48 +145,28 @@ void HistoryMgr::add(const QString &p_path,
         file.m_mode = p_mode;
         file.m_readOnly = p_readOnly;
 
-        if (m_lastClosedFiles.size() > maxHistoryCount) {
-            m_lastClosedFiles.remove(0, m_lastClosedFiles.size() - maxHistoryCount);
+        if (m_lastClosedFiles.size() > 100) {
+            m_lastClosedFiles.remove(0, m_lastClosedFiles.size() - 100);
         }
     }
 
     emit historyUpdated();
 }
 
-void HistoryMgr::remove(const QVector<QString> &p_paths, Notebook *p_notebook)
-{
-    for(const QString &p_itemPath : p_paths) {
-        if (p_notebook && m_perNotebookHistoryEnabled && p_notebook->history()) {
-            p_notebook->history()->removeHistory(p_itemPath);
-        } else {
-            auto &sessionConfig = ConfigMgr::getInst().getSessionConfig();
-            sessionConfig.removeHistory(p_itemPath);
-        }
-
-        removeFromHistory(p_itemPath);
-    }
-
-    emit historyUpdated();
-}
-
-void HistoryMgr::removeHistoryItem(QVector<HistoryItem> &p_history, const QString &p_itemPath)
-{
-    for (int i = p_history.size() - 1; i >= 0; --i) {
-        if (p_history[i].m_path == p_itemPath) {
-            p_history.remove(i);
-            break;
-        }
-    }
-}
-
 void HistoryMgr::insertHistoryItem(QVector<HistoryItem> &p_history, const HistoryItem &p_item)
 {
-    removeHistoryItem(p_history, p_item.m_path);
+    for (int i = p_history.size() - 1; i >= 0; --i) {
+        if (p_history[i].m_path == p_item.m_path) {
+            // Erase it.
+            p_history.remove(i);
+            break;
+        }
+    }
+
     p_history.append(p_item);
 
-    const int maxHistoryCount = ConfigMgr::getInst().getCoreConfig().getHistoryMaxCount();
-    if (p_history.size() > maxHistoryCount) {
-        p_history.remove(0, p_history.size() - maxHistoryCount);
+    if (p_history.size() > s_maxHistoryCount) {
+        p_history.remove(0, p_history.size() - s_maxHistoryCount);
     }
 }
 
@@ -201,13 +174,9 @@ void HistoryMgr::clear()
 {
     ConfigMgr::getInst().getSessionConfig().clearHistory();
 
-    if (m_perNotebookHistoryEnabled) {
     const auto &notebooks = VNoteX::getInst().getNotebookMgr().getNotebooks();
     for (const auto &nb : notebooks) {
-            if (auto historyI = nb->history()) {
-                historyI->clearHistory();
-            }
-        }
+        nb->clearHistory();
     }
 
     loadHistory();

src/core/historymgr.h

@@ -55,14 +55,10 @@ namespace vnotex
                  bool p_readOnly,
                  Notebook *p_notebook);
 
-        void remove(const QVector<QString> &p_paths, Notebook *p_notebook);
-
         void clear();
 
         LastClosedFile popLastClosedFile();
 
-        static void removeHistoryItem(QVector<HistoryItem> &p_history, const QString &p_itemPath);
-
         static void insertHistoryItem(QVector<HistoryItem> &p_history, const HistoryItem &p_item);
 
     signals:
@@ -76,11 +72,9 @@ namespace vnotex
         // Sorted by last accessed time ascendingly.
         QVector<QSharedPointer<HistoryItemFull>> m_history;
 
-        void removeFromHistory(const QString &p_itemPath);
-
         QVector<LastClosedFile> m_lastClosedFiles;
 
-        const bool m_perNotebookHistoryEnabled = false;
+        static int s_maxHistoryCount;
     };
 }
 

src/core/htmltemplatehelper.cpp

@@ -3,8 +3,6 @@
 #include <QDebug>
 
 #include <core/markdowneditorconfig.h>
-#include <core/pdfviewerconfig.h>
-#include <core/mindmapeditorconfig.h>
 #include <core/configmgr.h>
 #include <utils/utils.h>
 #include <utils/fileutils.h>
@@ -12,40 +10,32 @@
 #include <utils/htmlutils.h>
 #include <core/thememgr.h>
 #include <core/vnotex.h>
-#include <core/exception.h>
 
 using namespace vnotex;
 
 HtmlTemplateHelper::Template HtmlTemplateHelper::s_markdownViewerTemplate;
 
-HtmlTemplateHelper::Template HtmlTemplateHelper::s_pdfViewerTemplate;
+static const QString c_globalStylesPlaceholder = "/* VX_GLOBAL_STYLES_PLACEHOLDER */";
 
-HtmlTemplateHelper::Template HtmlTemplateHelper::s_mindMapEditorTemplate;
-
-QString MarkdownWebGlobalOptions::toJavascriptObject() const
+QString WebGlobalOptions::toJavascriptObject() const
 {
     return QStringLiteral("window.vxOptions = {\n")
-           + QStringLiteral("webPlantUml: %1,\n").arg(Utils::boolToString(m_webPlantUml))
-           + QStringLiteral("plantUmlWebService: '%1',\n").arg(m_plantUmlWebService)
-           + QStringLiteral("webGraphviz: %1,\n").arg(Utils::boolToString(m_webGraphviz))
-           + QStringLiteral("mathJaxScript: '%1',\n").arg(m_mathJaxScript)
-           + QStringLiteral("constrainImageWidthEnabled: %1,\n").arg(Utils::boolToString(m_constrainImageWidthEnabled))
-           + QStringLiteral("imageAlignCenterEnabled: %1,\n").arg(Utils::boolToString(m_imageAlignCenterEnabled))
-           + QStringLiteral("protectFromXss: %1,\n").arg(Utils::boolToString(m_protectFromXss))
-           + QStringLiteral("htmlTagEnabled: %1,\n").arg(Utils::boolToString(m_htmlTagEnabled))
-           + QStringLiteral("autoBreakEnabled: %1,\n").arg(Utils::boolToString(m_autoBreakEnabled))
-           + QStringLiteral("linkifyEnabled: %1,\n").arg(Utils::boolToString(m_linkifyEnabled))
-           + QStringLiteral("indentFirstLineEnabled: %1,\n").arg(Utils::boolToString(m_indentFirstLineEnabled))
-           + QStringLiteral("codeBlockLineNumberEnabled: %1,\n").arg(Utils::boolToString(m_codeBlockLineNumberEnabled))
-           + QStringLiteral("sectionNumberEnabled: %1,\n").arg(Utils::boolToString(m_sectionNumberEnabled))
-           + QStringLiteral("transparentBackgroundEnabled: %1,\n").arg(Utils::boolToString(m_transparentBackgroundEnabled))
-           + QStringLiteral("scrollable: %1,\n").arg(Utils::boolToString(m_scrollable))
-           + QStringLiteral("bodyWidth: %1,\n").arg(m_bodyWidth)
-           + QStringLiteral("bodyHeight: %1,\n").arg(m_bodyHeight)
-           + QStringLiteral("transformSvgToPngEnabled: %1,\n").arg(Utils::boolToString(m_transformSvgToPngEnabled))
-           + QStringLiteral("mathJaxScale: %1,\n").arg(m_mathJaxScale)
-           + QStringLiteral("removeCodeToolBarEnabled: %1,\n").arg(Utils::boolToString(m_removeCodeToolBarEnabled))
-           + QStringLiteral("sectionNumberBaseLevel: %1\n").arg(m_sectionNumberBaseLevel)
+           + QString("webPlantUml: %1,\n").arg(Utils::boolToString(m_webPlantUml))
+           + QString("webGraphviz: %1,\n").arg(Utils::boolToString(m_webGraphviz))
+           + QString("constrainImageWidthEnabled: %1,\n").arg(Utils::boolToString(m_constrainImageWidthEnabled))
+           + QString("protectFromXss: %1,\n").arg(Utils::boolToString(m_protectFromXss))
+           + QString("htmlTagEnabled: %1,\n").arg(Utils::boolToString(m_htmlTagEnabled))
+           + QString("autoBreakEnabled: %1,\n").arg(Utils::boolToString(m_autoBreakEnabled))
+           + QString("linkifyEnabled: %1,\n").arg(Utils::boolToString(m_linkifyEnabled))
+           + QString("indentFirstLineEnabled: %1,\n").arg(Utils::boolToString(m_indentFirstLineEnabled))
+           + QString("sectionNumberEnabled: %1,\n").arg(Utils::boolToString(m_sectionNumberEnabled))
+           + QString("transparentBackgroundEnabled: %1,\n").arg(Utils::boolToString(m_transparentBackgroundEnabled))
+           + QString("scrollable: %1,\n").arg(Utils::boolToString(m_scrollable))
+           + QString("bodyWidth: %1,\n").arg(m_bodyWidth)
+           + QString("bodyHeight: %1,\n").arg(m_bodyHeight)
+           + QString("transformSvgToPngEnabled: %1,\n").arg(Utils::boolToString(m_transformSvgToPngEnabled))
+           + QString("mathJaxScale: %1,\n").arg(m_mathJaxScale)
+           + QString("sectionNumberBaseLevel: %1\n").arg(m_sectionNumberBaseLevel)
            + QStringLiteral("}");
 }
 
@@ -59,11 +49,7 @@ static void fillGlobalStyles(QString &p_template, const WebResource &p_resource,
                 for (const auto &style : ele.m_styles) {
                     // Read the style file content.
                     auto styleFile = ConfigMgr::getInst().getUserOrAppFile(style);
-                    try {
                     styles += FileUtils::readTextFile(styleFile);
-                    } catch (Exception &p_e) {
-                        qWarning() << "failed to read global styles" << ele.m_name << styleFile << p_e.what();
-                    }
                 }
             }
             break;
@@ -73,7 +59,7 @@ static void fillGlobalStyles(QString &p_template, const WebResource &p_resource,
     styles += p_additionalStyles;
 
     if (!styles.isEmpty()) {
-        p_template.replace("/* VX_GLOBAL_STYLES_PLACEHOLDER */", styles);
+        p_template.replace(c_globalStylesPlaceholder, styles);
     }
 }
 
@@ -83,7 +69,7 @@ static QString fillStyleTag(const QString &p_styleFile)
         return "";
     }
     auto url = PathUtils::pathToUrl(p_styleFile);
-    return QStringLiteral("<link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">\n").arg(url.toString());
+    return QString("<link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">\n").arg(url.toString());
 }
 
 static QString fillScriptTag(const QString &p_scriptFile)
@@ -92,7 +78,7 @@ static QString fillScriptTag(const QString &p_scriptFile)
         return "";
     }
     auto url = PathUtils::pathToUrl(p_scriptFile);
-    return QStringLiteral("<script type=\"text/javascript\" src=\"%1\"></script>\n").arg(url.toString());
+    return QString("<script type=\"text/javascript\" src=\"%1\"></script>\n").arg(url.toString());
 }
 
 static void fillThemeStyles(QString &p_template, const QString &p_webStyleSheetFile, const QString &p_highlightStyleSheetFile)
@@ -107,7 +93,7 @@ static void fillThemeStyles(QString &p_template, const QString &p_webStyleSheetF
     }
 }
 
-static void fillGlobalOptions(QString &p_template, const MarkdownWebGlobalOptions &p_opts)
+static void fillGlobalOptions(QString &p_template, const WebGlobalOptions &p_opts)
 {
     p_template.replace(QStringLiteral("/* VX_GLOBAL_OPTIONS_PLACEHOLDER */"),
                        p_opts.toJavascriptObject());
@@ -153,7 +139,6 @@ static void fillResourcesByContent(QString &p_template, const WebResource &p_res
 
     for (const auto &ele : p_resource.m_resources) {
         if (ele.m_enabled && !ele.isGlobal()) {
-            try {
             // Styles.
             for (const auto &style : ele.m_styles) {
                 auto styleFile = ConfigMgr::getInst().getUserOrAppFile(style);
@@ -165,9 +150,6 @@ static void fillResourcesByContent(QString &p_template, const WebResource &p_res
                 auto scriptFile = ConfigMgr::getInst().getUserOrAppFile(script);
                 scripts += FileUtils::readTextFile(scriptFile);
             }
-            } catch (Exception &p_e) {
-                qWarning() << "failed to read resource" << ele.m_name << p_e.what();
-            }
         }
     }
 
@@ -185,62 +167,57 @@ const QString &HtmlTemplateHelper::getMarkdownViewerTemplate()
     return s_markdownViewerTemplate.m_template;
 }
 
-void HtmlTemplateHelper::updateMarkdownViewerTemplate(const MarkdownEditorConfig &p_config, bool p_force)
+void HtmlTemplateHelper::updateMarkdownViewerTemplate(const MarkdownEditorConfig &p_config)
 {
-    if (!p_force && p_config.revision() == s_markdownViewerTemplate.m_revision) {
+    if (p_config.revision() == s_markdownViewerTemplate.m_revision) {
         return;
     }
 
     s_markdownViewerTemplate.m_revision = p_config.revision();
 
-    MarkdownParas paras;
     const auto &themeMgr = VNoteX::getInst().getThemeMgr();
-    paras.m_webStyleSheetFile = themeMgr.getFile(Theme::File::WebStyleSheet);
-    paras.m_highlightStyleSheetFile = themeMgr.getFile(Theme::File::HighlightStyleSheet);
-
-    s_markdownViewerTemplate.m_template = generateMarkdownViewerTemplate(p_config, paras);
+    s_markdownViewerTemplate.m_template =
+        generateMarkdownViewerTemplate(p_config,
+                                       themeMgr.getFile(Theme::File::WebStyleSheet),
+                                       themeMgr.getFile(Theme::File::HighlightStyleSheet));
 }
 
 QString HtmlTemplateHelper::generateMarkdownViewerTemplate(const MarkdownEditorConfig &p_config,
-                                                           const MarkdownParas &p_paras)
+                                                           const QString &p_webStyleSheetFile,
+                                                           const QString &p_highlightStyleSheetFile,
+                                                           bool p_useTransparentBg,
+                                                           bool p_scrollable,
+                                                           int p_bodyWidth,
+                                                           int p_bodyHeight,
+                                                           bool p_transformSvgToPng,
+                                                           qreal p_mathJaxScale)
 {
     const auto &viewerResource = p_config.getViewerResource();
     const auto templateFile = ConfigMgr::getInst().getUserOrAppFile(viewerResource.m_template);
-    QString htmlTemplate;
-    try {
-        htmlTemplate = FileUtils::readTextFile(templateFile);
-    } catch (Exception &p_e) {
-        qWarning() << "failed to read HTML template" << templateFile << p_e.what();
-        return errorPage();
-    }
+    auto htmlTemplate = FileUtils::readTextFile(templateFile);
 
     fillGlobalStyles(htmlTemplate, viewerResource, "");
 
-    fillThemeStyles(htmlTemplate, p_paras.m_webStyleSheetFile, p_paras.m_highlightStyleSheetFile);
+    fillThemeStyles(htmlTemplate, p_webStyleSheetFile, p_highlightStyleSheetFile);
 
     {
-        MarkdownWebGlobalOptions opts;
+        WebGlobalOptions opts;
         opts.m_webPlantUml = p_config.getWebPlantUml();
-        opts.m_plantUmlWebService = p_config.getPlantUmlWebService();
         opts.m_webGraphviz = p_config.getWebGraphviz();
-        opts.m_mathJaxScript = p_config.getMathJaxScript();
         opts.m_sectionNumberEnabled = p_config.getSectionNumberMode() == MarkdownEditorConfig::SectionNumberMode::Read;
         opts.m_sectionNumberBaseLevel = p_config.getSectionNumberBaseLevel();
         opts.m_constrainImageWidthEnabled = p_config.getConstrainImageWidthEnabled();
-        opts.m_imageAlignCenterEnabled = p_config.getImageAlignCenterEnabled();
         opts.m_protectFromXss = p_config.getProtectFromXss();
         opts.m_htmlTagEnabled = p_config.getHtmlTagEnabled();
         opts.m_autoBreakEnabled = p_config.getAutoBreakEnabled();
         opts.m_linkifyEnabled = p_config.getLinkifyEnabled();
         opts.m_indentFirstLineEnabled = p_config.getIndentFirstLineEnabled();
-        opts.m_codeBlockLineNumberEnabled = p_config.getCodeBlockLineNumberEnabled();
-        opts.m_transparentBackgroundEnabled = p_paras.m_transparentBackgroundEnabled;
-        opts.m_scrollable = p_paras.m_scrollable;
-        opts.m_bodyWidth = p_paras.m_bodyWidth;
-        opts.m_bodyHeight = p_paras.m_bodyHeight;
-        opts.m_transformSvgToPngEnabled = p_paras.m_transformSvgToPngEnabled;
-        opts.m_mathJaxScale = p_paras.m_mathJaxScale;
-        opts.m_removeCodeToolBarEnabled = p_paras.m_removeCodeToolBarEnabled;
+        opts.m_transparentBackgroundEnabled = p_useTransparentBg;
+        opts.m_scrollable = p_scrollable;
+        opts.m_bodyWidth = p_bodyWidth;
+        opts.m_bodyHeight = p_bodyHeight;
+        opts.m_transformSvgToPngEnabled = p_transformSvgToPng;
+        opts.m_mathJaxScale = p_mathJaxScale;
         fillGlobalOptions(htmlTemplate, opts);
     }
 
@@ -249,58 +226,33 @@ QString HtmlTemplateHelper::generateMarkdownViewerTemplate(const MarkdownEditorC
     return htmlTemplate;
 }
 
-QString HtmlTemplateHelper::generateMarkdownExportTemplate(const MarkdownEditorConfig &p_config,
+QString HtmlTemplateHelper::generateExportTemplate(const MarkdownEditorConfig &p_config,
                                                    bool p_addOutlinePanel)
 {
     auto exportResource = p_config.getExportResource();
     const auto templateFile = ConfigMgr::getInst().getUserOrAppFile(exportResource.m_template);
-    QString htmlTemplate;
-    try {
-        htmlTemplate = FileUtils::readTextFile(templateFile);
-    } catch (Exception &p_e) {
-        qWarning() << "failed to read Markdown export HTML template" << templateFile << p_e.what();
-        return errorPage();
-    }
+    auto htmlTemplate = FileUtils::readTextFile(templateFile);
 
     fillGlobalStyles(htmlTemplate, exportResource, "");
 
-    fillOutlinePanel(htmlTemplate, exportResource, p_addOutlinePanel);
-
-    fillResourcesByContent(htmlTemplate, exportResource);
-
-    return htmlTemplate;
-}
-
-void HtmlTemplateHelper::fillOutlinePanel(QString &p_template, WebResource &p_exportResource, bool p_addOutlinePanel)
-{
-    for (auto &ele : p_exportResource.m_resources) {
+    // Outline panel.
+    for (auto &ele : exportResource.m_resources) {
         if (ele.m_name == QStringLiteral("outline")) {
             ele.m_enabled = p_addOutlinePanel;
             break;
         }
     }
 
-    // Remove static content to make the page clean.
-    if (!p_addOutlinePanel) {
-        int startIdx = p_template.indexOf("<!-- VX_OUTLINE_PANEL_START -->");
-        QString endMark("<!-- VX_OUTLINE_PANEL_END -->");
-        int endIdx = p_template.lastIndexOf(endMark);
-        Q_ASSERT(startIdx > -1 && endIdx > startIdx);
-        p_template.remove(startIdx, endIdx + endMark.size() - startIdx);
+    fillResourcesByContent(htmlTemplate, exportResource);
 
-        startIdx = p_template.indexOf("<!-- VX_OUTLINE_BUTTON_START -->");
-        endMark = "<!-- VX_OUTLINE_BUTTON_END -->";
-        endIdx = p_template.lastIndexOf(endMark);
-        Q_ASSERT(startIdx > -1 && endIdx > startIdx);
-        p_template.remove(startIdx, endIdx + endMark.size() - startIdx);
-    }
+    return htmlTemplate;
 }
 
 void HtmlTemplateHelper::fillTitle(QString &p_template, const QString &p_title)
 {
     if (!p_title.isEmpty()) {
         p_template.replace("<!-- VX_TITLE_PLACEHOLDER -->",
-                           QStringLiteral("<title>%1</title>").arg(HtmlUtils::escapeHtml(p_title)));
+                           QString("<title>%1</title>").arg(HtmlUtils::escapeHtml(p_title)));
     }
 }
 
@@ -323,81 +275,3 @@ void HtmlTemplateHelper::fillBodyClassList(QString &p_template, const QString &p
 {
     p_template.replace("<!-- VX_BODY_CLASS_LIST_PLACEHOLDER -->", p_classList);
 }
-
-QString HtmlTemplateHelper::errorPage()
-{
-    return VNoteX::tr("Failed to load HTML template. Check the logs for details. "
-                      "Try deleting the user configuration file and the default configuration file.");
-}
-
-const QString &HtmlTemplateHelper::getPdfViewerTemplate()
-{
-    return s_pdfViewerTemplate.m_template;
-}
-
-const QString &HtmlTemplateHelper::getPdfViewerTemplatePath()
-{
-    return s_pdfViewerTemplate.m_templatePath;
-}
-
-void HtmlTemplateHelper::updatePdfViewerTemplate(const PdfViewerConfig &p_config, bool p_force)
-{
-    if (!p_force && p_config.revision() == s_pdfViewerTemplate.m_revision) {
-        return;
-    }
-
-    s_pdfViewerTemplate.m_revision = p_config.revision();
-    generatePdfViewerTemplate(p_config, s_pdfViewerTemplate);
-}
-
-void HtmlTemplateHelper::generatePdfViewerTemplate(const PdfViewerConfig &p_config, Template& p_template)
-{
-    const auto &viewerResource = p_config.getViewerResource();
-    p_template.m_templatePath = ConfigMgr::getInst().getUserOrAppFile(viewerResource.m_template);
-    try {
-        p_template.m_template = FileUtils::readTextFile(p_template.m_templatePath);
-    } catch (Exception &p_e) {
-        qWarning() << "failed to read HTML template" << p_template.m_templatePath << p_e.what();
-        p_template.m_template = errorPage();
-        return;
-    }
-
-    fillResources(p_template.m_template, viewerResource);
-}
-
-const QString &HtmlTemplateHelper::getMindMapEditorTemplate()
-{
-    return s_mindMapEditorTemplate.m_template;
-}
-
-void HtmlTemplateHelper::updateMindMapEditorTemplate(const MindMapEditorConfig &p_config, bool p_force)
-{
-    if (!p_force && p_config.revision() == s_mindMapEditorTemplate.m_revision) {
-        return;
-    }
-
-    s_mindMapEditorTemplate.m_revision = p_config.revision();
-
-    generateMindMapEditorTemplate(p_config,
-                                  QString() /* Use empty theme style for now */,
-                                  s_mindMapEditorTemplate);
-}
-
-void HtmlTemplateHelper::generateMindMapEditorTemplate(const MindMapEditorConfig &p_config,
-                                                       const QString &p_webStyleSheetFile,
-                                                       Template& p_template)
-{
-    const auto &editorResource = p_config.getEditorResource();
-    p_template.m_templatePath = ConfigMgr::getInst().getUserOrAppFile(editorResource.m_template);
-    try {
-        p_template.m_template = FileUtils::readTextFile(p_template.m_templatePath);
-    } catch (Exception &p_e) {
-        qWarning() << "failed to read HTML template" << p_template.m_templatePath << p_e.what();
-        p_template.m_template = errorPage();
-        return;
-    }
-
-    fillThemeStyles(p_template.m_template, p_webStyleSheetFile, QString());
-
-    fillResources(p_template.m_template, editorResource);
-}

src/core/htmltemplatehelper.h

@@ -6,29 +6,20 @@
 namespace vnotex
 {
     class MarkdownEditorConfig;
-    class PdfViewerConfig;
-    class MindMapEditorConfig;
-    struct WebResource;
 
-    // Global options to be passed to Web side at the very beginning for Markdown.
-    struct MarkdownWebGlobalOptions
+    // Global options to be passed to Web side at the very beginning.
+    struct WebGlobalOptions
     {
         bool m_webPlantUml = true;
 
-        QString m_plantUmlWebService;
-
         bool m_webGraphviz = true;
 
-        QString m_mathJaxScript;
-
         bool m_sectionNumberEnabled = true;
 
         int m_sectionNumberBaseLevel = 2;
 
         bool m_constrainImageWidthEnabled = true;
 
-        bool m_imageAlignCenterEnabled = true;
-
         bool m_protectFromXss = false;
 
         bool m_htmlTagEnabled = true;
@@ -39,8 +30,6 @@ namespace vnotex
 
         bool m_indentFirstLineEnabled = false;
 
-        bool m_codeBlockLineNumberEnabled = true;
-
         // Force to use transparent background.
         bool m_transparentBackgroundEnabled = false;
 
@@ -59,9 +48,6 @@ namespace vnotex
         // wkhtmltopdf will make the MathJax formula too small.
         qreal m_mathJaxScale = -1;
 
-        // Whether remove the tool bar of code blocks added by Prism.js.
-        bool m_removeCodeToolBarEnabled = false;
-
         QString toJavascriptObject() const;
     };
 
@@ -69,39 +55,24 @@ namespace vnotex
     class HtmlTemplateHelper
     {
     public:
-        struct MarkdownParas
-        {
-            QString m_webStyleSheetFile;
-
-            QString m_highlightStyleSheetFile;
-
-            bool m_transparentBackgroundEnabled = false;
-
-            bool m_scrollable = true;
-
-            int m_bodyWidth = -1;
-
-            int m_bodyHeight = -1;
-
-            bool m_transformSvgToPngEnabled = false;
-
-            qreal m_mathJaxScale = -1;
-
-            bool m_removeCodeToolBarEnabled = false;
-        };
-
         HtmlTemplateHelper() = delete;
 
-        // For MarkdownViewer.
         static const QString &getMarkdownViewerTemplate();
-        static void updateMarkdownViewerTemplate(const MarkdownEditorConfig &p_config, bool p_force = false);
+        static void updateMarkdownViewerTemplate(const MarkdownEditorConfig &p_config);
 
-        static QString generateMarkdownViewerTemplate(const MarkdownEditorConfig &p_config, const MarkdownParas &p_paras);
+        static QString generateMarkdownViewerTemplate(const MarkdownEditorConfig &p_config,
+                                                      const QString &p_webStyleSheetFile,
+                                                      const QString &p_highlightStyleSheetFile,
+                                                      bool p_useTransparentBg = false,
+                                                      bool p_scrollable = true,
+                                                      int p_bodyWidth = -1,
+                                                      int p_bodyHeight = -1,
+                                                      bool p_transformSvgToPng = false,
+                                                      qreal p_mathJaxScale = -1);
 
-        static QString generateMarkdownExportTemplate(const MarkdownEditorConfig &p_config,
+        static QString generateExportTemplate(const MarkdownEditorConfig &p_config,
                                               bool p_addOutlinePanel);
 
-        // For common HTML content manipulation.
         static void fillTitle(QString &p_template, const QString &p_title);
 
         static void fillStyleContent(QString &p_template, const QString &p_styles);
@@ -112,39 +83,15 @@ namespace vnotex
 
         static void fillBodyClassList(QString &p_template, const QString &p_classList);
 
-        static void fillOutlinePanel(QString &p_template, WebResource &p_exportResource, bool p_addOutlinePanel);
-
-        // For PdfViewer.
-        static const QString &getPdfViewerTemplate();
-        static void updatePdfViewerTemplate(const PdfViewerConfig &p_config, bool p_force = false);
-
-        static const QString &getPdfViewerTemplatePath();
-
-        // For MindMapEditor.
-        static const QString &getMindMapEditorTemplate();
-        static void updateMindMapEditorTemplate(const MindMapEditorConfig &p_config, bool p_force = false);
-
     private:
         struct Template
         {
             int m_revision = -1;
             QString m_template;
-            QString m_templatePath;
         };
 
-        static QString errorPage();
-
-        static void generatePdfViewerTemplate(const PdfViewerConfig &p_config, Template& p_template);
-
-        static void generateMindMapEditorTemplate(const MindMapEditorConfig &p_config,
-                                                  const QString &p_webStyleSheetFile,
-                                                  Template& p_template);
-
+        // Template for MarkdownViewer.
         static Template s_markdownViewerTemplate;
-
-        static Template s_pdfViewerTemplate;
-
-        static Template s_mindMapEditorTemplate;
     };
 }
 

src/core/iconfig.h

@@ -6,7 +6,6 @@
 #include <QJsonArray>
 #include <QBitArray>
 #include <QDataStream>
-#include <QIODevice>
 
 namespace vnotex
 {

src/core/logger.cpp

@@ -8,27 +8,19 @@ using namespace vnotex;
 
 QFile Logger::s_file;
 
-bool Logger::s_verbose = false;
+bool Logger::s_debugLog = false;
 
-bool Logger::s_logToStderr = false;
-
-void Logger::init(bool p_verbose, bool p_logToStderr)
+void Logger::init(bool p_debugLog)
 {
-    s_verbose = p_verbose;
-    s_logToStderr = p_logToStderr;
+    s_debugLog = p_debugLog;
 
 #if defined(QT_NO_DEBUG)
-    if (!s_logToStderr) {
     s_file.setFileName(ConfigMgr::getInst().getLogFile());
     if (s_file.size() >= 5 * 1024 * 1024) {
         s_file.open(QIODevice::WriteOnly | QIODevice::Text);
     } else {
         s_file.open(QIODevice::Append | QIODevice::Text);
     }
-    }
-#else
-    // Always log to stderr in debug.
-    s_logToStderr = true;
 #endif
 
     qInstallMessageHandler(Logger::log);
@@ -52,7 +44,7 @@ static QString getFileName(const char *p_file)
 void Logger::log(QtMsgType p_type, const QMessageLogContext &p_context, const QString &p_msg)
 {
 #if defined(QT_NO_DEBUG)
-    if (!s_verbose && p_type == QtDebugMsg) {
+    if (!s_debugLog && p_type == QtDebugMsg) {
         return;
     }
 #endif
@@ -84,16 +76,16 @@ void Logger::log(QtMsgType p_type, const QMessageLogContext &p_context, const QS
 
     QString fileName = getFileName(p_context.file);
 
-    if (!s_logToStderr) {
+#if defined(QT_NO_DEBUG)
     QTextStream stream(&s_file);
-        stream << header << (QStringLiteral("(%1:%2) ").arg(fileName).arg(p_context.line))
+    stream << header << (QString("(%1:%2) ").arg(fileName).arg(p_context.line))
            << localMsg << "\n";
 
     if (p_type == QtFatalMsg) {
         s_file.close();
         abort();
     }
-    } else {
+#else
     std::string fileStr = fileName.toStdString();
     const char *file = fileStr.c_str();
 
@@ -122,5 +114,5 @@ void Logger::log(QtMsgType p_type, const QMessageLogContext &p_context, const QS
     }
 
     fflush(stderr);
-    }
+#endif
 }

src/core/logger.h

@@ -13,16 +13,14 @@ namespace vnotex
     public:
         Logger() = delete;
 
-        static void init(bool p_verbose, bool p_logToStderr);
+        static void init(bool p_debugLog);
 
     private:
         static void log(QtMsgType p_type, const QMessageLogContext &p_context, const QString &p_msg);
 
         static QFile s_file;
 
-        static bool s_verbose;
-
-        static bool s_logToStderr;
+        static bool s_debugLog;
     };
 }
 

src/core/mainconfig.cpp

@@ -7,7 +7,6 @@
 #include "coreconfig.h"
 #include "editorconfig.h"
 #include "widgetconfig.h"
-#include "texteditorconfig.h"
 #include "markdowneditorconfig.h"
 
 using namespace vnotex;
@@ -119,4 +118,5 @@ QString MainConfig::getVersion(const QJsonObject &p_jobj)
 void MainConfig::doVersionSpecificOverride()
 {
     // In a new version, we may want to change one value by force.
+    m_editorConfig->getMarkdownEditorConfig().m_spellCheckEnabled = false;
 }

src/core/markdowneditorconfig.cpp

@@ -35,14 +35,10 @@ void MarkdownEditorConfig::init(const QJsonObject &p_app, const QJsonObject &p_u
 
     m_plantUmlCommand = READSTR(QStringLiteral("plantuml_command"));
 
-    m_plantUmlWebService = READSTR(QStringLiteral("plantuml_web_service"));
-
     m_webGraphviz = READBOOL(QStringLiteral("web_graphviz"));
 
     m_graphvizExe = READSTR(QStringLiteral("graphviz_exe"));
 
-    m_mathJaxScript = READSTR(QStringLiteral("mathjax_script"));
-
     m_prependDotInRelativeLink = READBOOL(QStringLiteral("prepend_dot_in_relative_link"));
     m_confirmBeforeClearObsoleteImages = READBOOL(QStringLiteral("confirm_before_clear_obsolete_images"));
     m_insertFileNameAsTitle = READBOOL(QStringLiteral("insert_file_name_as_title"));
@@ -52,7 +48,6 @@ void MarkdownEditorConfig::init(const QJsonObject &p_app, const QJsonObject &p_u
     m_sectionNumberStyle = stringToSectionNumberStyle(READSTR(QStringLiteral("section_number_style")));
 
     m_constrainImageWidthEnabled = READBOOL(QStringLiteral("constrain_image_width"));
-    m_imageAlignCenterEnabled = READBOOL(QStringLiteral("image_align_center"));
     m_constrainInplacePreviewWidthEnabled = READBOOL(QStringLiteral("constrain_inplace_preview_width"));
     m_zoomFactorInReadMode = READREAL(QStringLiteral("zoom_factor_in_read_mode"));
     m_fetchImagesInParseAndPaste = READBOOL(QStringLiteral("fetch_images_in_parse_and_paste"));
@@ -62,7 +57,6 @@ void MarkdownEditorConfig::init(const QJsonObject &p_app, const QJsonObject &p_u
     m_autoBreakEnabled = READBOOL(QStringLiteral("auto_break"));
     m_linkifyEnabled = READBOOL(QStringLiteral("linkify"));
     m_indentFirstLineEnabled = READBOOL(QStringLiteral("indent_first_line"));
-    m_codeBlockLineNumberEnabled = READBOOL(QStringLiteral("code_block_line_number"));
 
     m_smartTableEnabled = READBOOL(QStringLiteral("smart_table"));
     m_smartTableInterval = READINT(QStringLiteral("smart_table_interval"));
@@ -78,10 +72,6 @@ void MarkdownEditorConfig::init(const QJsonObject &p_app, const QJsonObject &p_u
             m_inplacePreviewSources |= stringToInplacePreviewSource(src);
         }
     }
-
-    m_editViewMode = stringToEditViewMode(READSTR(QStringLiteral("edit_view_mode")));
-
-    m_richPasteByDefaultEnabled = READBOOL(QStringLiteral("rich_paste_by_default"));
 }
 
 QJsonObject MarkdownEditorConfig::toJson() const
@@ -92,10 +82,8 @@ QJsonObject MarkdownEditorConfig::toJson() const
     obj[QStringLiteral("web_plantuml")] = m_webPlantUml;
     obj[QStringLiteral("plantuml_jar")] = m_plantUmlJar;
     obj[QStringLiteral("plantuml_command")] = m_plantUmlCommand;
-    obj[QStringLiteral("plantuml_web_service")] = m_plantUmlWebService;
     obj[QStringLiteral("web_graphviz")] = m_webGraphviz;
     obj[QStringLiteral("graphviz_exe")] = m_graphvizExe;
-    obj[QStringLiteral("mathjax_script")] = m_mathJaxScript;
     obj[QStringLiteral("prepend_dot_in_relative_link")] = m_prependDotInRelativeLink;
     obj[QStringLiteral("confirm_before_clear_obsolete_images")] = m_confirmBeforeClearObsoleteImages;
     obj[QStringLiteral("insert_file_name_as_title")] = m_insertFileNameAsTitle;
@@ -105,7 +93,6 @@ QJsonObject MarkdownEditorConfig::toJson() const
     obj[QStringLiteral("section_number_style")] = sectionNumberStyleToString(m_sectionNumberStyle);
 
     obj[QStringLiteral("constrain_image_width")] = m_constrainImageWidthEnabled;
-    obj[QStringLiteral("image_align_center")] = m_imageAlignCenterEnabled;
     obj[QStringLiteral("constrain_inplace_preview_width")] = m_constrainInplacePreviewWidthEnabled;
     obj[QStringLiteral("zoom_factor_in_read_mode")] = m_zoomFactorInReadMode;
     obj[QStringLiteral("fetch_images_in_parse_and_paste")] = m_fetchImagesInParseAndPaste;
@@ -114,7 +101,6 @@ QJsonObject MarkdownEditorConfig::toJson() const
     obj[QStringLiteral("auto_break")] = m_autoBreakEnabled;
     obj[QStringLiteral("linkify")] = m_linkifyEnabled;
     obj[QStringLiteral("indent_first_line")] = m_indentFirstLineEnabled;
-    obj[QStringLiteral("code_block_line_number")] = m_codeBlockLineNumberEnabled;
     obj[QStringLiteral("smart_table")] = m_smartTableEnabled;
     obj[QStringLiteral("smart_table_interval")] = m_smartTableInterval;
     obj[QStringLiteral("spell_check")] = m_spellCheckEnabled;
@@ -134,10 +120,6 @@ QJsonObject MarkdownEditorConfig::toJson() const
         obj[QStringLiteral("inplace_preview_sources")] = srcs.join(QLatin1Char(';'));
     }
 
-    obj[QStringLiteral("edit_view_mode")] = editViewModeToString(m_editViewMode);
-
-    obj[QStringLiteral("rich_paste_by_default")] = m_richPasteByDefaultEnabled;
-
     return obj;
 }
 
@@ -241,16 +223,6 @@ const QString &MarkdownEditorConfig::getPlantUmlCommand() const
     return m_plantUmlCommand;
 }
 
-const QString &MarkdownEditorConfig::getPlantUmlWebService() const
-{
-    return m_plantUmlWebService;
-}
-
-void MarkdownEditorConfig::setPlantUmlWebService(const QString &p_service)
-{
-    updateConfig(m_plantUmlWebService, p_service, this);
-}
-
 bool MarkdownEditorConfig::getWebGraphviz() const
 {
     return m_webGraphviz;
@@ -271,16 +243,6 @@ void MarkdownEditorConfig::setGraphvizExe(const QString &p_exe)
     updateConfig(m_graphvizExe, p_exe, this);
 }
 
-const QString &MarkdownEditorConfig::getMathJaxScript() const
-{
-    return m_mathJaxScript;
-}
-
-void MarkdownEditorConfig::setMathJaxScript(const QString &p_script)
-{
-    updateConfig(m_mathJaxScript, p_script, this);
-}
-
 bool MarkdownEditorConfig::getPrependDotInRelativeLink() const
 {
     return m_prependDotInRelativeLink;
@@ -293,7 +255,9 @@ bool MarkdownEditorConfig::getConfirmBeforeClearObsoleteImages() const
 
 void MarkdownEditorConfig::setConfirmBeforeClearObsoleteImages(bool p_confirm)
 {
-    updateConfig(m_confirmBeforeClearObsoleteImages, p_confirm, this);
+    updateConfig(m_confirmBeforeClearObsoleteImages,
+                 p_confirm,
+                 this);
 }
 
 bool MarkdownEditorConfig::getInsertFileNameAsTitle() const
@@ -316,16 +280,6 @@ void MarkdownEditorConfig::setConstrainImageWidthEnabled(bool p_enabled)
     updateConfig(m_constrainImageWidthEnabled, p_enabled, this);
 }
 
-bool MarkdownEditorConfig::getImageAlignCenterEnabled() const
-{
-    return m_imageAlignCenterEnabled;
-}
-
-void MarkdownEditorConfig::setImageAlignCenterEnabled(bool p_enabled)
-{
-    updateConfig(m_imageAlignCenterEnabled, p_enabled, this);
-}
-
 bool MarkdownEditorConfig::getConstrainInplacePreviewWidthEnabled() const
 {
     return m_constrainInplacePreviewWidthEnabled;
@@ -401,16 +355,6 @@ void MarkdownEditorConfig::setIndentFirstLineEnabled(bool p_enabled)
     updateConfig(m_indentFirstLineEnabled, p_enabled, this);
 }
 
-bool MarkdownEditorConfig::getCodeBlockLineNumberEnabled() const
-{
-    return m_codeBlockLineNumberEnabled;
-}
-
-void MarkdownEditorConfig::setCodeBlockLineNumberEnabled(bool p_enabled)
-{
-    updateConfig(m_codeBlockLineNumberEnabled, p_enabled, this);
-}
-
 QString MarkdownEditorConfig::sectionNumberModeToString(SectionNumberMode p_mode) const
 {
     switch (p_mode) {
@@ -563,44 +507,3 @@ void MarkdownEditorConfig::setInplacePreviewSources(InplacePreviewSources p_src)
 {
     updateConfig(m_inplacePreviewSources, p_src, this);
 }
-
-QString MarkdownEditorConfig::editViewModeToString(EditViewMode p_mode) const
-{
-    switch (p_mode) {
-    case EditViewMode::EditPreview:
-        return QStringLiteral("editpreview");
-
-    default:
-        return QStringLiteral("editonly");
-    }
-}
-
-MarkdownEditorConfig::EditViewMode MarkdownEditorConfig::stringToEditViewMode(const QString &p_str) const
-{
-    auto mode = p_str.toLower();
-    if (mode == QStringLiteral("editpreview")) {
-        return EditViewMode::EditPreview;
-    } else {
-        return EditViewMode::EditOnly;
-    }
-}
-
-MarkdownEditorConfig::EditViewMode MarkdownEditorConfig::getEditViewMode() const
-{
-    return m_editViewMode;
-}
-
-void MarkdownEditorConfig::setEditViewMode(EditViewMode p_mode)
-{
-    updateConfig(m_editViewMode, p_mode, this);
-}
-
-bool MarkdownEditorConfig::getRichPasteByDefaultEnabled() const
-{
-    return m_richPasteByDefaultEnabled;
-}
-
-void MarkdownEditorConfig::setRichPasteByDefaultEnabled(bool p_enabled)
-{
-    updateConfig(m_richPasteByDefaultEnabled, p_enabled, this);
-}

src/core/markdowneditorconfig.h

@@ -39,12 +39,6 @@ namespace vnotex
         };
         Q_DECLARE_FLAGS(InplacePreviewSources, InplacePreviewSource);
 
-        enum EditViewMode
-        {
-            EditOnly,
-            EditPreview
-        };
-
         MarkdownEditorConfig(ConfigMgr *p_mgr,
                              IConfig *p_topConfig,
                              const QSharedPointer<TextEditorConfig> &p_textEditorConfig);
@@ -70,18 +64,12 @@ namespace vnotex
 
         const QString &getPlantUmlCommand() const;
 
-        const QString &getPlantUmlWebService() const;
-        void setPlantUmlWebService(const QString &p_service);
-
         bool getWebGraphviz() const;
         void setWebGraphviz(bool p_enabled);
 
         const QString &getGraphvizExe() const;
         void setGraphvizExe(const QString &p_exe);
 
-        const QString &getMathJaxScript() const;
-        void setMathJaxScript(const QString &p_script);
-
         bool getPrependDotInRelativeLink() const;
 
         bool getConfirmBeforeClearObsoleteImages() const;
@@ -102,9 +90,6 @@ namespace vnotex
         bool getConstrainImageWidthEnabled() const;
         void setConstrainImageWidthEnabled(bool p_enabled);
 
-        bool getImageAlignCenterEnabled() const;
-        void setImageAlignCenterEnabled(bool p_enabled);
-
         bool getConstrainInplacePreviewWidthEnabled() const;
         void setConstrainInplacePreviewWidthEnabled(bool p_enabled);
 
@@ -128,9 +113,6 @@ namespace vnotex
         bool getIndentFirstLineEnabled() const;
         void setIndentFirstLineEnabled(bool p_enabled);
 
-        bool getCodeBlockLineNumberEnabled() const;
-        void setCodeBlockLineNumberEnabled(bool p_enabled);
-
         bool getSmartTableEnabled() const;
         void setSmartTableEnabled(bool p_enabled);
 
@@ -145,12 +127,6 @@ namespace vnotex
         InplacePreviewSources getInplacePreviewSources() const;
         void setInplacePreviewSources(InplacePreviewSources p_src);
 
-        EditViewMode getEditViewMode() const;
-        void setEditViewMode(EditViewMode p_mode);
-
-        bool getRichPasteByDefaultEnabled() const;
-        void setRichPasteByDefaultEnabled(bool p_enabled);
-
     private:
         friend class MainConfig;
 
@@ -169,9 +145,6 @@ namespace vnotex
         QString inplacePreviewSourceToString(InplacePreviewSource p_src) const;
         InplacePreviewSource stringToInplacePreviewSource(const QString &p_str) const;
 
-        QString editViewModeToString(EditViewMode p_mode) const;
-        EditViewMode stringToEditViewMode(const QString &p_str) const;
-
         QSharedPointer<TextEditorConfig> m_textEditorConfig;
 
         WebResource m_viewerResource;
@@ -188,17 +161,11 @@ namespace vnotex
         // %1: the format to render in.
         QString m_plantUmlCommand;
 
-        // PlantUml Web service to override that in plantuml.js file.
-        QString m_plantUmlWebService;
-
         bool m_webGraphviz = true;
 
         // Graphviz executable file.
         QString m_graphvizExe;
 
-        // MathJax script to override that in mathjax.js file.
-        QString m_mathJaxScript;
-
         // Whether prepend a dot in front of the relative link, like images.
         bool m_prependDotInRelativeLink = false;
 
@@ -220,8 +187,6 @@ namespace vnotex
         // Whether enable image width constraint.
         bool m_constrainImageWidthEnabled = true;
 
-        bool m_imageAlignCenterEnabled = false;
-
         // Whether enable in-place preview width constraint.
         bool m_constrainInplacePreviewWidthEnabled = false;
 
@@ -231,7 +196,7 @@ namespace vnotex
         bool m_fetchImagesInParseAndPaste = true;
 
         // Whether protect from Cross-Site Scripting.
-        bool m_protectFromXss = true;
+        bool m_protectFromXss = false;
 
         // Whether allow HTML tag in Markdown source.
         bool m_htmlTagEnabled = true;
@@ -245,9 +210,6 @@ namespace vnotex
         // Whether indent the first line of a paragraph.
         bool m_indentFirstLineEnabled = false;
 
-        // Whether enable code block line number in read mode.
-        bool m_codeBlockLineNumberEnabled = true;
-
         bool m_smartTableEnabled = true;
 
         // Interval time to do smart table format.
@@ -260,11 +222,6 @@ namespace vnotex
         QString m_editorOverriddenFontFamily;
 
         InplacePreviewSources m_inplacePreviewSources = InplacePreviewSource::NoInplacePreview;
-
-        // View mode in edit mode.
-        EditViewMode m_editViewMode = EditViewMode::EditOnly;
-
-        bool m_richPasteByDefaultEnabled = true;
     };
 }
 

src/core/mindmapeditorconfig.cpp

@@ -1,61 +0,0 @@
-#include "mindmapeditorconfig.h"
-
-#include "mainconfig.h"
-
-#define READSTR(key) readString(appObj, userObj, (key))
-#define READBOOL(key) readBool(appObj, userObj, (key))
-#define READINT(key) readInt(appObj, userObj, (key))
-
-using namespace vnotex;
-
-MindMapEditorConfig::MindMapEditorConfig(ConfigMgr *p_mgr, IConfig *p_topConfig)
-    : IConfig(p_mgr, p_topConfig)
-{
-    m_sessionName = QStringLiteral("mindmap_editor");
-}
-
-void MindMapEditorConfig::init(const QJsonObject &p_app,
-                               const QJsonObject &p_user)
-{
-    const auto appObj = p_app.value(m_sessionName).toObject();
-    const auto userObj = p_user.value(m_sessionName).toObject();
-
-    loadEditorResource(appObj, userObj);
-}
-
-QJsonObject MindMapEditorConfig::toJson() const
-{
-    QJsonObject obj;
-    obj[QStringLiteral("editor_resource")] = saveEditorResource();
-    return obj;
-}
-
-void MindMapEditorConfig::loadEditorResource(const QJsonObject &p_app, const QJsonObject &p_user)
-{
-    const QString name(QStringLiteral("editor_resource"));
-
-    if (MainConfig::isVersionChanged()) {
-        bool needOverride = p_app[QStringLiteral("override_editor_resource")].toBool();
-        if (needOverride) {
-            qInfo() << "override \"editor_resource\" in user configuration due to version change";
-            m_editorResource.init(p_app[name].toObject());
-            return;
-        }
-    }
-
-    if (p_user.contains(name)) {
-        m_editorResource.init(p_user[name].toObject());
-    } else {
-        m_editorResource.init(p_app[name].toObject());
-    }
-}
-
-QJsonObject MindMapEditorConfig::saveEditorResource() const
-{
-    return m_editorResource.toJson();
-}
-
-const WebResource &MindMapEditorConfig::getEditorResource() const
-{
-    return m_editorResource;
-}

src/core/mindmapeditorconfig.h

@@ -1,31 +0,0 @@
-#ifndef MINDMAPEDITORCONFIG_H
-#define MINDMAPEDITORCONFIG_H
-
-#include "iconfig.h"
-
-#include "webresource.h"
-
-namespace vnotex
-{
-    class MindMapEditorConfig : public IConfig
-    {
-    public:
-        MindMapEditorConfig(ConfigMgr *p_mgr, IConfig *p_topConfig);
-
-        void init(const QJsonObject &p_app, const QJsonObject &p_user) Q_DECL_OVERRIDE;
-
-        QJsonObject toJson() const Q_DECL_OVERRIDE;
-
-        const WebResource &getEditorResource() const;
-
-    private:
-        friend class MainConfig;
-
-        void loadEditorResource(const QJsonObject &p_app, const QJsonObject &p_user);
-        QJsonObject saveEditorResource() const;
-
-        WebResource m_editorResource;
-    };
-}
-
-#endif // MINDMAPEDITORCONFIG_H

src/core/notebook/bundlenotebook.cpp

@@ -1,76 +1,40 @@
 #include "bundlenotebook.h"
 
 #include <QDebug>
-#include <QCoreApplication>
 
 #include <notebookconfigmgr/bundlenotebookconfigmgr.h>
 #include <notebookconfigmgr/notebookconfig.h>
 #include <utils/fileutils.h>
 #include <core/historymgr.h>
-#include <core/exception.h>
 #include <notebookbackend/inotebookbackend.h>
 
-#include "notebookdatabaseaccess.h"
-#include "notebooktagmgr.h"
-
 using namespace vnotex;
 
 BundleNotebook::BundleNotebook(const NotebookParameters &p_paras,
                                const QSharedPointer<NotebookConfig> &p_notebookConfig,
                                QObject *p_parent)
-    : Notebook(p_paras, p_parent),
-      m_configVersion(p_notebookConfig->m_version),
-      m_history(p_notebookConfig->m_history),
-      m_tagGraph(p_notebookConfig->m_tagGraph),
-      m_extraConfigs(p_notebookConfig->m_extraConfigs)
+    : Notebook(p_paras, p_parent)
 {
-    setupDatabase();
-}
-
-BundleNotebook::~BundleNotebook()
-{
-    m_dbAccess->close();
+    m_nextNodeId = p_notebookConfig->m_nextNodeId;
+    m_history = p_notebookConfig->m_history;
+    m_extraConfigs = p_notebookConfig->m_extraConfigs;
 }
 
 BundleNotebookConfigMgr *BundleNotebook::getBundleNotebookConfigMgr() const
 {
-    return static_cast<BundleNotebookConfigMgr *>(getConfigMgr().data());
+    return dynamic_cast<BundleNotebookConfigMgr *>(getConfigMgr().data());
 }
 
-void BundleNotebook::setupDatabase()
+ID BundleNotebook::getNextNodeId() const
 {
-    auto dbPath = getBackend()->getFullPath(BundleNotebookConfigMgr::getDatabasePath());
-    m_dbAccess = new NotebookDatabaseAccess(this, dbPath, this);
+    return m_nextNodeId;
 }
 
-void BundleNotebook::initializeInternal()
+ID BundleNotebook::getAndUpdateNextNodeId()
 {
-    initDatabase();
-
-    if (m_configVersion != getConfigMgr()->getCodeVersion()) {
-        updateNotebookConfig();
-    }
-}
-
-void BundleNotebook::initDatabase()
-{
-    m_dbAccess->initialize(m_configVersion);
-
-    if (m_dbAccess->isFresh()) {
-        // For previous version notebook without DB, just ignore the node Id from config.
-        int cnt = 0;
-        fillNodeTableFromConfig(getRootNode().data(), m_configVersion < 2, cnt);
-        qDebug() << "fillNodeTableFromConfig nodes count" << cnt;
-
-        fillTagTableFromTagGraph();
-
-        cnt = 0;
-        fillTagTableFromConfig(getRootNode().data(), cnt);
-    }
-
-    if (m_tagMgr) {
-        m_tagMgr->update();
-    }
+    auto id = m_nextNodeId++;
+    getBundleNotebookConfigMgr()->writeNotebookConfig();
+    return id;
 }
 
 void BundleNotebook::updateNotebookConfig()
@@ -93,28 +57,16 @@ void BundleNotebook::remove()
 
     // Remove notebook root folder if it is empty.
     if (!FileUtils::removeDirIfEmpty(getRootFolderAbsolutePath())) {
-        qInfo() << QStringLiteral("root folder of notebook (%1) is not empty and needs manual clean up")
+        qInfo() << QString("root folder of notebook (%1) is not empty and needs manual clean up")
                           .arg(getRootFolderAbsolutePath());
     }
 }
 
-HistoryI *BundleNotebook::history()
-{
-    return this;
-}
-
 const QVector<HistoryItem> &BundleNotebook::getHistory() const
 {
     return m_history;
 }
 
-void BundleNotebook::removeHistory(const QString &p_itemPath)
-{
-    HistoryMgr::removeHistoryItem(m_history, p_itemPath);
-
-    updateNotebookConfig();
-}
-
 void BundleNotebook::addHistory(const HistoryItem &p_item)
 {
     HistoryItem item(p_item);
@@ -142,127 +94,3 @@ void BundleNotebook::setExtraConfig(const QString &p_key, const QJsonObject &p_o
 
     updateNotebookConfig();
 }
-
-void BundleNotebook::fillNodeTableFromConfig(Node *p_node, bool p_ignoreId, int &p_totalCnt)
-{
-    bool ret = m_dbAccess->addNode(p_node, p_ignoreId);
-    if (!ret) {
-        qWarning() << "failed to add node to DB" << p_node->getName() << p_ignoreId;
-        return;
-    }
-
-    if (++p_totalCnt % 10) {
-        QCoreApplication::processEvents();
-    }
-
-    const auto &children = p_node->getChildrenRef();
-    for (const auto &child : children) {
-        fillNodeTableFromConfig(child.data(), p_ignoreId, p_totalCnt);
-    }
-}
-
-NotebookDatabaseAccess *BundleNotebook::getDatabaseAccess() const
-{
-    return m_dbAccess;
-}
-
-bool BundleNotebook::rebuildDatabase()
-{
-    Q_ASSERT(m_dbAccess);
-    m_dbAccess->close();
-
-    auto backend = getBackend();
-    const auto dbPath = BundleNotebookConfigMgr::getDatabasePath();
-    if (backend->exists(dbPath)) {
-        try {
-            backend->removeFile(dbPath);
-        } catch (Exception &p_e) {
-            qWarning() << "failed to delete database file" << dbPath << p_e.what();
-            if (!m_dbAccess->open()) {
-                qWarning() << "failed to open notebook database (restart is needed)";
-            }
-            return false;
-        }
-    }
-
-    m_dbAccess->deleteLater();
-
-    setupDatabase();
-    initDatabase();
-
-    emit tagsUpdated();
-
-    return true;
-}
-
-const QString &BundleNotebook::getTagGraph() const
-{
-    return m_tagGraph;
-}
-
-void BundleNotebook::updateTagGraph(const QString &p_tagGraph)
-{
-    if (m_tagGraph == p_tagGraph) {
-        return;
-    }
-
-    m_tagGraph = p_tagGraph;
-    updateNotebookConfig();
-}
-
-void BundleNotebook::fillTagTableFromTagGraph()
-{
-    auto tagGraph = NotebookTagMgr::stringToTagGraph(m_tagGraph);
-    for (const auto &tagPair : tagGraph) {
-        if (!m_dbAccess->addTag(tagPair.m_parent)) {
-            qWarning() << "failed to add tag to DB" << tagPair.m_parent;
-            continue;
-        }
-
-        if (!m_dbAccess->addTag(tagPair.m_child, tagPair.m_parent)) {
-            qWarning() << "failed to add tag to DB" << tagPair.m_child;
-            continue;
-        }
-    }
-
-    QCoreApplication::processEvents();
-}
-
-void BundleNotebook::fillTagTableFromConfig(Node *p_node, int &p_totalCnt)
-{
-    // @p_node must already exists in node table.
-    bool ret = m_dbAccess->updateNodeTags(p_node);
-    if (!ret) {
-        qWarning() << "failed to add tags of node to DB" << p_node->getName() << p_node->getTags();
-        return;
-    }
-
-    if (++p_totalCnt % 10) {
-        QCoreApplication::processEvents();
-    }
-
-    const auto &children = p_node->getChildrenRef();
-    for (const auto &child : children) {
-        fillTagTableFromConfig(child.data(), p_totalCnt);
-    }
-}
-
-NotebookTagMgr *BundleNotebook::getTagMgr() const
-{
-    if (!m_tagMgr) {
-        auto th = const_cast<BundleNotebook *>(this);
-        th->m_tagMgr = new NotebookTagMgr(th);
-    }
-
-    return m_tagMgr;
-}
-
-TagI *BundleNotebook::tag()
-{
-    return getTagMgr();
-}
-
-int BundleNotebook::getConfigVersion() const
-{
-    return m_configVersion;
-}

src/core/notebook/bundlenotebook.h

@@ -3,17 +3,13 @@
 
 #include "notebook.h"
 #include "global.h"
-#include "historyi.h"
 
 namespace vnotex
 {
     class BundleNotebookConfigMgr;
     class NotebookConfig;
-    class NotebookDatabaseAccess;
-    class NotebookTagMgr;
 
-    class BundleNotebook : public Notebook,
-                           public HistoryI
+    class BundleNotebook : public Notebook
     {
         Q_OBJECT
     public:
@@ -21,7 +17,9 @@ namespace vnotex
                        const QSharedPointer<NotebookConfig> &p_notebookConfig,
                        QObject *p_parent = nullptr);
 
-        ~BundleNotebook();
+        ID getNextNodeId() const Q_DECL_OVERRIDE;
+
+        ID getAndUpdateNextNodeId() Q_DECL_OVERRIDE;
 
         void updateNotebookConfig() Q_DECL_OVERRIDE;
 
@@ -29,63 +27,21 @@ namespace vnotex
 
         void remove() Q_DECL_OVERRIDE;
 
-        const QString &getTagGraph() const;
-        void updateTagGraph(const QString &p_tagGraph);
+        const QVector<HistoryItem> &getHistory() const Q_DECL_OVERRIDE;
+        void addHistory(const HistoryItem &p_item) Q_DECL_OVERRIDE;
+        void clearHistory() Q_DECL_OVERRIDE;
 
         const QJsonObject &getExtraConfigs() const Q_DECL_OVERRIDE;
         void setExtraConfig(const QString &p_key, const QJsonObject &p_obj) Q_DECL_OVERRIDE;
 
-        bool rebuildDatabase() Q_DECL_OVERRIDE;
-
-        NotebookDatabaseAccess *getDatabaseAccess() const;
-
-        TagI *tag() Q_DECL_OVERRIDE;
-
-        int getConfigVersion() const;
-
-        // HistoryI.
-    public:
-        HistoryI *history() Q_DECL_OVERRIDE;
-
-        const QVector<HistoryItem> &getHistory() const Q_DECL_OVERRIDE;
-
-        void removeHistory(const QString &p_itemPath) Q_DECL_OVERRIDE;
-
-        void addHistory(const HistoryItem &p_item) Q_DECL_OVERRIDE;
-
-        void clearHistory() Q_DECL_OVERRIDE;
-
-    protected:
-        void initializeInternal() Q_DECL_OVERRIDE;
-
     private:
         BundleNotebookConfigMgr *getBundleNotebookConfigMgr() const;
 
-        void setupDatabase();
-
-        void fillNodeTableFromConfig(Node *p_node, bool p_ignoreId, int &p_totalCnt);
-
-        void initDatabase();
-
-        void fillTagTableFromTagGraph();
-
-        void fillTagTableFromConfig(Node *p_node, int &p_totalCnt);
-
-        NotebookTagMgr *getTagMgr() const;
-
-        const int m_configVersion;
+        ID m_nextNodeId = 1;
 
         QVector<HistoryItem> m_history;
 
-        QString m_tagGraph;
-
         QJsonObject m_extraConfigs;
-
-        // Managed by QObject.
-        NotebookDatabaseAccess *m_dbAccess = nullptr;
-
-        // Managed by QObject.
-        NotebookTagMgr *m_tagMgr = nullptr;
     };
 } // ns vnotex
 

src/core/notebook/bundlenotebookfactory.cpp

@@ -40,7 +40,7 @@ static void checkRootFolderForNewNotebook(const NotebookParameters &p_paras)
         qCritical() << msg;
         throw Exception(Exception::Type::InvalidPath, msg);
     } else if (p_paras.m_ensureEmptyRootFolder && !PathUtils::isEmptyDir(p_paras.m_rootFolderPath)) {
-        QString msg = QStringLiteral("local root folder must be empty: %1 (%2)")
+        QString msg = QString("local root folder must be empty: %1 (%2)")
                              .arg(p_paras.m_rootFolderPath, PathUtils::absolutePath(p_paras.m_rootFolderPath));
         qCritical() << msg;
         throw Exception(Exception::Type::InvalidPath, msg);
@@ -88,7 +88,7 @@ void BundleNotebookFactory::checkParameters(const NotebookParameters &p_paras) c
     auto configMgr = dynamic_cast<BundleNotebookConfigMgr *>(p_paras.m_notebookConfigMgr.data());
     if (!configMgr) {
         Exception::throwOne(Exception::Type::InvalidArgument,
-                            QStringLiteral("Invalid notebook configuration manager"));
+                            QString("Invalid notebook configuration manager"));
     }
 }
 

src/core/notebook/historyi.h

@@ -1,25 +0,0 @@
-#ifndef HISTORYI_H
-#define HISTORYI_H
-
-#include <QVector>
-
-#include <core/historyitem.h>
-
-namespace vnotex
-{
-    // History interface for notebook.
-    class HistoryI
-    {
-    public:
-        virtual ~HistoryI() = default;
-
-        virtual const QVector<HistoryItem> &getHistory() const = 0;
-
-        virtual void addHistory(const HistoryItem &p_item) = 0;
-
-        virtual void removeHistory(const QString &p_itemPath) = 0;
-
-        virtual void clearHistory() = 0;
-    };
-}
-#endif // HISTORYI_H

src/core/notebook/node.cpp

@@ -7,31 +7,30 @@
 #include <utils/pathutils.h>
 #include <core/exception.h>
 #include "notebook.h"
-#include "nodeparameters.h"
-#include <QRandomGenerator>
 
 using namespace vnotex;
 
 Node::Node(Flags p_flags,
+           ID p_id,
            const QString &p_name,
-           const NodeParameters &p_paras,
+           const QDateTime &p_createdTimeUtc,
+           const QDateTime &p_modifiedTimeUtc,
+           const QStringList &p_tags,
+           const QString &p_attachmentFolder,
            Notebook *p_notebook,
            Node *p_parent)
     : m_notebook(p_notebook),
       m_loaded(true),
       m_flags(p_flags),
-      m_id(p_paras.m_id),
-      m_signature(p_paras.m_signature),
+      m_id(p_id),
       m_name(p_name),
-      m_createdTimeUtc(p_paras.m_createdTimeUtc),
-      m_modifiedTimeUtc(p_paras.m_modifiedTimeUtc),
-      m_tags(p_paras.m_tags),
-      m_attachmentFolder(p_paras.m_attachmentFolder),
+      m_createdTimeUtc(p_createdTimeUtc),
+      m_modifiedTimeUtc(p_modifiedTimeUtc),
+      m_tags(p_tags),
+      m_attachmentFolder(p_attachmentFolder),
       m_parent(p_parent)
 {
     Q_ASSERT(m_notebook);
-
-    checkSignature();
 }
 
 Node::Node(Flags p_flags,
@@ -55,22 +54,19 @@ bool Node::isLoaded() const
     return m_loaded;
 }
 
-void Node::loadCompleteInfo(const NodeParameters &p_paras,
+void Node::loadCompleteInfo(ID p_id,
+                            const QDateTime &p_createdTimeUtc,
+                            const QDateTime &p_modifiedTimeUtc,
+                            const QStringList &p_tags,
                             const QVector<QSharedPointer<Node>> &p_children)
 {
     Q_ASSERT(!m_loaded);
-
-    m_id = p_paras.m_id;
-    m_signature = p_paras.m_signature;
-    m_createdTimeUtc = p_paras.m_createdTimeUtc;
-    m_modifiedTimeUtc = p_paras.m_modifiedTimeUtc;
-    Q_ASSERT(p_paras.m_tags.isEmpty());
-    Q_ASSERT(p_paras.m_attachmentFolder.isEmpty());
-
+    m_id = p_id;
+    m_createdTimeUtc = p_createdTimeUtc;
+    m_modifiedTimeUtc = p_modifiedTimeUtc;
+    m_tags = p_tags;
     m_children = p_children;
     m_loaded = true;
-
-    checkSignature();
 }
 
 bool Node::isRoot() const
@@ -110,24 +106,6 @@ bool Node::containsChild(const QSharedPointer<Node> &p_node) const
     return m_children.indexOf(p_node) != -1;
 }
 
-bool Node::isLegalNameForNewChild(const QString &p_name) const
-{
-    if (p_name.isEmpty()) {
-        return false;
-    }
-
-    auto mgr = getConfigMgr();
-    if (mgr->isBuiltInFile(this, p_name) || mgr->isBuiltInFolder(this, p_name)) {
-        return false;
-    }
-
-    if (containsChild(p_name, false)) {
-        return false;
-    }
-
-    return true;
-}
-
 QSharedPointer<Node> Node::findChild(const QString &p_name, bool p_caseSensitive) const
 {
     auto targetName = p_caseSensitive ? p_name : p_name.toLower();
@@ -171,22 +149,6 @@ ID Node::getId() const
     return m_id;
 }
 
-void Node::updateId(ID p_id)
-{
-    if (m_id == p_id) {
-        return;
-    }
-
-    m_id = p_id;
-    save();
-    emit m_notebook->nodeUpdated(this);
-}
-
-ID Node::getSignature() const
-{
-    return m_signature;
-}
-
 const QDateTime &Node::getCreatedTimeUtc() const
 {
     return m_createdTimeUtc;
@@ -264,17 +226,6 @@ const QStringList &Node::getTags() const
     return m_tags;
 }
 
-void Node::updateTags(const QStringList &p_tags)
-{
-    if (p_tags == m_tags) {
-        return;
-    }
-
-    m_tags = p_tags;
-    save();
-    emit m_notebook->nodeUpdated(this);
-}
-
 bool Node::isReadOnly() const
 {
     return m_flags & Flag::ReadOnly;
@@ -375,7 +326,7 @@ bool Node::canRename(const QString &p_newName) const
         }
     }
 
-    if (!m_parent->isLegalNameForNewChild(p_newName)) {
+    if (m_parent->containsChild(p_newName, false)) {
         return false;
     }
 
@@ -462,34 +413,3 @@ bool Node::checkExists()
     }
     return after;
 }
-
-QList<QSharedPointer<File>> Node::collectFiles()
-{
-    QList<QSharedPointer<File>> files;
-
-    load();
-
-    if (hasContent()) {
-        files.append(getContentFile());
-    }
-
-    if (isContainer()) {
-        for (const auto &child : m_children) {
-            files.append(child->collectFiles());
-        }
-    }
-
-    return files;
-}
-
-ID Node::generateSignature()
-{
-    return static_cast<ID>(QDateTime::currentDateTime().toSecsSinceEpoch() + (static_cast<qulonglong>(QRandomGenerator::global()->generate()) << 32));
-}
-
-void Node::checkSignature()
-{
-    if (m_signature == InvalidId) {
-        m_signature = generateSignature();
-    }
-}

src/core/notebook/node.h

@@ -16,7 +16,15 @@ namespace vnotex
     class INotebookBackend;
     class File;
     class ExternalNode;
-    class NodeParameters;
+
+    // Used when add/new a node.
+    struct NodeParameters
+    {
+        QDateTime m_createdTimeUtc = QDateTime::currentDateTimeUtc();
+        QDateTime m_modifiedTimeUtc = QDateTime::currentDateTimeUtc();
+        QString m_attachmentFolder;
+        QStringList m_tags;
+    };
 
     // Node of notebook.
     class Node : public QEnableSharedFromThis<Node>
@@ -36,6 +44,7 @@ namespace vnotex
 
         enum Use {
             Normal,
+            RecycleBin,
             Root
         };
 
@@ -43,8 +52,12 @@ namespace vnotex
 
         // Constructor with all information loaded.
         Node(Flags p_flags,
+             ID p_id,
              const QString &p_name,
-             const NodeParameters &p_paras,
+             const QDateTime &p_createdTimeUtc,
+             const QDateTime &p_modifiedTimeUtc,
+             const QStringList &p_tags,
+             const QString &p_attachmentFolder,
              Notebook *p_notebook,
              Node *p_parent);
 
@@ -89,9 +102,6 @@ namespace vnotex
         void setUse(Node::Use p_use);
 
         ID getId() const;
-        void updateId(ID p_id);
-
-        ID getSignature() const;
 
         const QDateTime &getCreatedTimeUtc() const;
 
@@ -114,8 +124,6 @@ namespace vnotex
         // Case sensitive.
         bool containsContentChild(const QString &p_name) const;
 
-        bool isLegalNameForNewChild(const QString &p_name) const;
-
         void addChild(const QSharedPointer<Node> &p_node);
 
         void insertChild(int p_idx, const QSharedPointer<Node> &p_node);
@@ -129,11 +137,10 @@ namespace vnotex
 
         Notebook *getNotebook() const;
 
-        virtual void load();
-        virtual void save();
+        void load();
+        void save();
 
         const QStringList &getTags() const;
-        void updateTags(const QStringList &p_tags);
 
         const QString &getAttachmentFolder() const;
         void setAttachmentFolder(const QString &p_attachmentFolder);
@@ -158,7 +165,10 @@ namespace vnotex
         // Get File if this node has content.
         virtual QSharedPointer<File> getContentFile() = 0;
 
-        void loadCompleteInfo(const NodeParameters &p_paras,
+        void loadCompleteInfo(ID p_id,
+                              const QDateTime &p_createdTimeUtc,
+                              const QDateTime &p_modifiedTimeUtc,
+                              const QStringList &p_tags,
                               const QVector<QSharedPointer<Node>> &p_children);
 
         INotebookConfigMgr *getConfigMgr() const;
@@ -169,20 +179,13 @@ namespace vnotex
 
         void sortChildren(const QVector<int> &p_beforeIdx, const QVector<int> &p_afterIdx);
 
-        // Get content files recursively.
-        QList<QSharedPointer<File>> collectFiles();
-
         static bool isAncestor(const Node *p_ancestor, const Node *p_child);
 
-        static ID generateSignature();
-
     protected:
         Notebook *m_notebook = nullptr;
 
-        bool m_loaded = false;
-
     private:
-        void checkSignature();
+        bool m_loaded = false;
 
         Flags m_flags = Flag::None;
 
@@ -190,10 +193,6 @@ namespace vnotex
 
         ID m_id = InvalidId;
 
-        // A long random number created when the node is created.
-        // Use to avoid conflicts of m_id.
-        ID m_signature = InvalidId;
-
         QString m_name;
 
         QDateTime m_createdTimeUtc;

src/core/notebook/nodeparameters.cpp

@@ -1,8 +0,0 @@
-#include "nodeparameters.h"
-
-using namespace vnotex;
-
-NodeParameters::NodeParameters(ID p_id)
-    : m_id(p_id)
-{
-}

src/core/notebook/nodeparameters.h

@@ -1,34 +0,0 @@
-#ifndef NODEPARAMETERS_H
-#define NODEPARAMETERS_H
-
-#include <QDateTime>
-#include <QStringList>
-
-#include <core/global.h>
-
-#include "node.h"
-
-namespace vnotex
-{
-    class NodeParameters
-    {
-    public:
-        NodeParameters() = default;
-
-        NodeParameters(ID p_id);
-
-        ID m_id = Node::InvalidId;
-
-        ID m_signature = Node::InvalidId;
-
-        QDateTime m_createdTimeUtc = QDateTime::currentDateTimeUtc();
-
-        QDateTime m_modifiedTimeUtc = QDateTime::currentDateTimeUtc();
-
-        QStringList m_tags;
-
-        QString m_attachmentFolder;
-    };
-}
-
-#endif // NODEPARAMETERS_H

src/core/notebook/notebook.cpp

@@ -7,8 +7,7 @@
 #include <notebookconfigmgr/inotebookconfigmgr.h>
 #include <utils/pathutils.h>
 #include <utils/fileutils.h>
-#include <core/exception.h>
-#include "nodeparameters.h"
+#include "exception.h"
 
 using namespace vnotex;
 
@@ -16,8 +15,6 @@ const QString Notebook::c_defaultAttachmentFolder = QStringLiteral("vx_attachmen
 
 const QString Notebook::c_defaultImageFolder = QStringLiteral("vx_images");
 
-const QString Notebook::c_defaultRecycleBinFolder = QStringLiteral("vx_recycle_bin");
-
 static vnotex::ID generateNotebookID()
 {
     static vnotex::ID id = Notebook::InvalidId;
@@ -46,33 +43,13 @@ Notebook::Notebook(const NotebookParameters &p_paras,
     if (m_attachmentFolder.isEmpty()) {
         m_attachmentFolder = c_defaultAttachmentFolder;
     }
-    if (m_recycleBinFolder.isEmpty()) {
-        m_recycleBinFolder = c_defaultRecycleBinFolder;
-    }
-
     m_configMgr->setNotebook(this);
 }
 
-Notebook::Notebook(const QString &p_name, QObject *p_parent)
-    : QObject(p_parent),
-      m_name(p_name)
-{
-}
-
 Notebook::~Notebook()
 {
 }
 
-void Notebook::initialize()
-{
-    if (m_initialized) {
-        return;
-    }
-
-    m_initialized = true;
-    initializeInternal();
-}
-
 vnotex::ID Notebook::getId() const
 {
     return m_id;
@@ -136,16 +113,6 @@ QString Notebook::getRootFolderAbsolutePath() const
     return PathUtils::absolutePath(m_rootFolderPath);
 }
 
-QString Notebook::getConfigFolderAbsolutePath() const
-{
-    const auto &folderPath = m_configMgr->getConfigFolderPath();
-    if (folderPath.isEmpty()) {
-        return QString();
-    }
-
-    return getBackend()->getFullPath(folderPath);
-}
-
 const QIcon &Notebook::getIcon() const
 {
     return m_icon;
@@ -166,28 +133,6 @@ const QString &Notebook::getAttachmentFolder() const
     return m_attachmentFolder;
 }
 
-const QString &Notebook::getRecycleBinFolder() const
-{
-    return m_recycleBinFolder;
-}
-
-QString Notebook::getRecycleBinFolderAbsolutePath() const
-{
-    if (QDir::isAbsolutePath(m_recycleBinFolder)) {
-        if (!QFileInfo::exists(m_recycleBinFolder)) {
-            QDir dir(m_recycleBinFolder);
-            dir.mkpath(m_recycleBinFolder);
-        }
-        return m_recycleBinFolder;
-    } else {
-        auto folderPath = getBackend()->getFullPath(m_recycleBinFolder);
-        if (!getBackend()->exists(m_recycleBinFolder)) {
-            getBackend()->makePath(m_recycleBinFolder);
-        }
-        return folderPath;
-    }
-}
-
 const QSharedPointer<INotebookBackend> &Notebook::getBackend() const
 {
     return m_backend;
@@ -213,6 +158,23 @@ const QSharedPointer<Node> &Notebook::getRootNode() const
     return m_root;
 }
 
+QSharedPointer<Node> Notebook::getRecycleBinNode() const
+{
+    auto root = getRootNode();
+    const auto &children = root->getChildrenRef();
+    auto it = std::find_if(children.begin(),
+                           children.end(),
+                           [this](const QSharedPointer<Node> &p_node) {
+                               return isRecycleBinNode(p_node.data());
+                           });
+
+    if (it != children.end()) {
+        return *it;
+    }
+
+    return nullptr;
+}
+
 QSharedPointer<Node> Notebook::newNode(Node *p_parent,
                                        Node::Flags p_flags,
                                        const QString &p_name,
@@ -254,7 +216,7 @@ QSharedPointer<Node> Notebook::copyNodeAsChildOf(const QSharedPointer<Node> &p_s
 
     if (Node::isAncestor(p_src.data(), p_dest)) {
         Exception::throwOne(Exception::Type::InvalidArgument,
-                            QStringLiteral("source (%1) is the ancestor of destination (%2)")
+                            QString("source (%1) is the ancestor of destination (%2)")
                                    .arg(p_src->fetchPath(), p_dest->fetchPath()));
         return nullptr;
     }
@@ -279,6 +241,27 @@ void Notebook::removeNode(Node *p_node, bool p_force, bool p_configOnly)
     removeNode(p_node->sharedFromThis(), p_force, p_configOnly);
 }
 
+bool Notebook::isRecycleBinNode(const Node *p_node) const
+{
+    return p_node && p_node->getUse() == Node::Use::RecycleBin;
+}
+
+bool Notebook::isNodeInRecycleBin(const Node *p_node) const
+{
+    if (p_node) {
+        p_node = p_node->getParent();
+        while (p_node) {
+            if (isRecycleBinNode(p_node)) {
+                return true;
+            }
+
+            p_node = p_node->getParent();
+        }
+    }
+
+    return false;
+}
+
 void Notebook::moveNodeToRecycleBin(Node *p_node)
 {
     moveNodeToRecycleBin(p_node->sharedFromThis());
@@ -287,41 +270,59 @@ void Notebook::moveNodeToRecycleBin(Node *p_node)
 void Notebook::moveNodeToRecycleBin(const QSharedPointer<Node> &p_node)
 {
     Q_ASSERT(p_node && !p_node->isRoot());
-    m_configMgr->removeNodeToFolder(p_node, getOrCreateRecycleBinDateFolder());
+    auto destNode = getOrCreateRecycleBinDateNode();
+    copyNodeAsChildOf(p_node, destNode.data(), true);
 }
 
-QString Notebook::getOrCreateRecycleBinDateFolder()
+QSharedPointer<Node> Notebook::getOrCreateRecycleBinDateNode()
 {
     // Name after date.
-    auto dateFolderName = QDate::currentDate().toString(QStringLiteral("yyyyMMdd"));
-    auto folderPath = PathUtils::concatenateFilePath(getRecycleBinFolder(), dateFolderName);
-    if (QDir::isAbsolutePath(folderPath)) {
-        qDebug() << "using absolute recycle bin folder" << folderPath;
-        QDir dir(folderPath);
-        if (dir.exists()) {
-            dir.mkpath(folderPath);
-        }
-    } else {
-        if (!getBackend()->exists(folderPath)) {
-            getBackend()->makePath(folderPath);
-        }
+    auto dateNodeName = QDate::currentDate().toString(QStringLiteral("yyyyMMdd"));
+
+    auto recycleBinNode = getRecycleBinNode();
+    auto dateNode = recycleBinNode->findChild(dateNodeName,
+                                              FileUtils::isPlatformNameCaseSensitive());
+    if (!dateNode) {
+        // Create a date node.
+        dateNode = newNode(recycleBinNode.data(), Node::Flag::Container, dateNodeName);
     }
 
-    return folderPath;
+    return dateNode;
+}
+
+void Notebook::emptyNode(const Node *p_node, bool p_force)
+{
+    // Copy the children.
+    auto children = p_node->getChildren();
+    for (const auto &child : children) {
+        removeNode(child, p_force);
+    }
 }
 
 void Notebook::moveFileToRecycleBin(const QString &p_filePath)
 {
-    auto destFilePath = PathUtils::concatenateFilePath(getOrCreateRecycleBinDateFolder(), PathUtils::fileName(p_filePath));
+    auto node = getOrCreateRecycleBinDateNode();
+    auto destFilePath = PathUtils::concatenateFilePath(node->fetchPath(),
+                                                       PathUtils::fileName(p_filePath));
     destFilePath = getBackend()->renameIfExistsCaseInsensitive(destFilePath);
-    m_backend->copyFile(p_filePath, destFilePath, true);
+    m_backend->copyFile(p_filePath, destFilePath);
+
+    getBackend()->removeFile(p_filePath);
+
+    emit nodeUpdated(node.data());
 }
 
 void Notebook::moveDirToRecycleBin(const QString &p_dirPath)
 {
-    auto destDirPath = PathUtils::concatenateFilePath(getOrCreateRecycleBinDateFolder(), PathUtils::fileName(p_dirPath));
+    auto node = getOrCreateRecycleBinDateNode();
+    auto destDirPath = PathUtils::concatenateFilePath(node->fetchPath(),
+                                                      PathUtils::fileName(p_dirPath));
     destDirPath = getBackend()->renameIfExistsCaseInsensitive(destDirPath);
-    m_backend->copyDir(p_dirPath, destDirPath, true);
+    m_backend->copyDir(p_dirPath, destDirPath);
+
+    getBackend()->removeDir(p_dirPath);
+
+    emit nodeUpdated(node.data());
 }
 
 QSharedPointer<Node> Notebook::addAsNode(Node *p_parent,
@@ -360,49 +361,3 @@ QJsonObject Notebook::getExtraConfig(const QString &p_key) const
     const auto &configs = getExtraConfigs();
     return configs.value(p_key).toObject();
 }
-
-QList<QSharedPointer<File>> Notebook::collectFiles()
-{
-    QList<QSharedPointer<File>> files;
-
-    auto rootNode = getRootNode();
-
-    const auto &children = rootNode->getChildrenRef();
-    for (const auto &child : children) {
-        if (child->getUse() != Node::Use::Normal) {
-            continue;
-        }
-        files.append(child->collectFiles());
-    }
-
-    return files;
-}
-
-QStringList Notebook::scanAndImportExternalFiles()
-{
-    return m_configMgr->scanAndImportExternalFiles(getRootNode().data());
-}
-
-bool Notebook::rebuildDatabase()
-{
-    return false;
-}
-
-HistoryI *Notebook::history()
-{
-    return nullptr;
-}
-
-TagI *Notebook::tag()
-{
-    return nullptr;
-}
-
-void Notebook::emptyRecycleBin()
-{
-    QDir dir(getRecycleBinFolderAbsolutePath());
-    auto children = dir.entryList(QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot);
-    for (const auto &child : children) {
-        FileUtils::removeDir(dir.filePath(child));
-    }
-}

src/core/notebook/notebook.h

@@ -8,16 +8,14 @@
 #include "notebookparameters.h"
 #include <core/global.h>
 #include "node.h"
+#include <core/historyitem.h>
 
 namespace vnotex
 {
     class INotebookBackend;
     class IVersionController;
     class INotebookConfigMgr;
-    class NodeParameters;
-    class File;
-    class HistoryI;
-    class TagI;
+    struct NodeParameters;
 
     // Base class of notebook.
     class Notebook : public QObject
@@ -27,13 +25,8 @@ namespace vnotex
         Notebook(const NotebookParameters &p_paras,
                  QObject *p_parent = nullptr);
 
-        // Used for UT only.
-        Notebook(const QString &p_name, QObject *p_parent = nullptr);
-
         virtual ~Notebook();
 
-        void initialize();
-
         enum { InvalidId = 0 };
 
         ID getId() const;
@@ -54,9 +47,6 @@ namespace vnotex
 
         QString getRootFolderAbsolutePath() const;
 
-        // Get the absolute path of the config folder if applicable.
-        QString getConfigFolderAbsolutePath() const;
-
         const QIcon &getIcon() const;
         void setIcon(const QIcon &p_icon);
 
@@ -64,10 +54,6 @@ namespace vnotex
 
         const QString &getAttachmentFolder() const;
 
-        const QString &getRecycleBinFolder() const;
-
-        QString getRecycleBinFolderAbsolutePath() const;
-
         const QDateTime &getCreatedTimeUtc() const;
 
         const QSharedPointer<INotebookBackend> &getBackend() const;
@@ -78,6 +64,8 @@ namespace vnotex
 
         const QSharedPointer<Node> &getRootNode() const;
 
+        QSharedPointer<Node> getRecycleBinNode() const;
+
         QSharedPointer<Node> newNode(Node *p_parent,
                                      Node::Flags p_flags,
                                      const QString &p_name,
@@ -94,6 +82,10 @@ namespace vnotex
                                         Node::Flags p_flags,
                                         const QString &p_path);
 
+        virtual ID getNextNodeId() const = 0;
+
+        virtual ID getAndUpdateNextNodeId() = 0;
+
         virtual void updateNotebookConfig() = 0;
 
         virtual void removeNotebookConfig() = 0;
@@ -121,11 +113,17 @@ namespace vnotex
         // Move @p_dirPath to the recycle bin, without adding it as a child node.
         void moveDirToRecycleBin(const QString &p_dirPath);
 
-        virtual void emptyRecycleBin();
-
         // Remove all files of this notebook from disk.
         virtual void remove() = 0;
 
+        bool isRecycleBinNode(const Node *p_node) const;
+
+        bool isNodeInRecycleBin(const Node *p_node) const;
+
+        // Remove all children node of @p_node.
+        // @p_force: if true, just delete all folders and files under @p_node.
+        void emptyNode(const Node *p_node, bool p_force = false);
+
         // Whether @p_name is a built-in file under @p_node.
         bool isBuiltInFile(const Node *p_node, const QString &p_name) const;
 
@@ -133,45 +131,26 @@ namespace vnotex
 
         void reloadNodes();
 
+        virtual const QVector<HistoryItem> &getHistory() const = 0;
+        virtual void addHistory(const HistoryItem &p_item) = 0;
+        virtual void clearHistory() = 0;
+
         // Hold extra 3rd party configs.
         virtual const QJsonObject &getExtraConfigs() const = 0;
         QJsonObject getExtraConfig(const QString &p_key) const;
         virtual void setExtraConfig(const QString &p_key, const QJsonObject &p_obj) = 0;
 
-        // Get content files recursively.
-        QList<QSharedPointer<File>> collectFiles();
-
-        QStringList scanAndImportExternalFiles();
-
-        virtual bool rebuildDatabase();
-
         static const QString c_defaultAttachmentFolder;
 
         static const QString c_defaultImageFolder;
 
-        static const QString c_defaultRecycleBinFolder;
-
-    public:
-        // Return null if history is not suported.
-        virtual HistoryI *history();
-
-        // Return null if tag is not suported.
-        virtual TagI *tag();
-
     signals:
         void updated();
 
         void nodeUpdated(const Node *p_node);
 
-        void tagsUpdated();
-
-    protected:
-        virtual void initializeInternal() = 0;
-
     private:
-        QString getOrCreateRecycleBinDateFolder();
-
-        bool m_initialized = false;
+        QSharedPointer<Node> getOrCreateRecycleBinDateNode();
 
         // ID of this notebook.
         // Will be assigned uniquely once loaded.
@@ -197,9 +176,6 @@ namespace vnotex
         // Name of the folder to hold attachments.
         QString m_attachmentFolder;
 
-        // Name or path of the folder to hold deleted files.
-        QString m_recycleBinFolder;
-
         QDateTime m_createdTimeUtc;
 
         // Backend for file access and synchronization.

src/core/notebook/notebook.pri

@@ -0,0 +1,20 @@
+SOURCES += \
+    $$PWD/externalnode.cpp \
+    $$PWD/notebook.cpp \
+    $$PWD/bundlenotebookfactory.cpp \
+    $$PWD/notebookparameters.cpp \
+    $$PWD/bundlenotebook.cpp \
+    $$PWD/node.cpp \
+    $$PWD/vxnode.cpp \
+    $$PWD/vxnodefile.cpp
+
+HEADERS += \
+    $$PWD/externalnode.h \
+    $$PWD/notebook.h \
+    $$PWD/inotebookfactory.h \
+    $$PWD/bundlenotebookfactory.h \
+    $$PWD/notebookparameters.h \
+    $$PWD/bundlenotebook.h \
+    $$PWD/node.h \
+    $$PWD/vxnode.h \
+    $$PWD/vxnodefile.h

src/core/notebook/notebookdatabaseaccess.cpp

@@ -1,783 +0,0 @@
-#include "notebookdatabaseaccess.h"
-
-#include <QtSql>
-#include <QDebug>
-#include <QSet>
-
-#include <core/exception.h>
-
-#include "notebook.h"
-#include "node.h"
-
-using namespace vnotex;
-
-static QString c_nodeTableName = "node";
-
-static QString c_tagTableName = "tag";
-
-static QString c_nodeTagTableName = "tag_node";
-
-NotebookDatabaseAccess::NotebookDatabaseAccess(Notebook *p_notebook, const QString &p_databaseFile, QObject *p_parent)
-    : QObject(p_parent),
-      m_notebook(p_notebook),
-      m_databaseFile(p_databaseFile),
-      m_connectionName(p_databaseFile)
-{
-}
-
-bool NotebookDatabaseAccess::open()
-{
-    auto db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), m_connectionName);
-    db.setDatabaseName(m_databaseFile);
-    if (!db.open()) {
-        qWarning() << QStringLiteral("failed to open notebook database (%1) (%2)").arg(m_databaseFile, db.lastError().text());
-        return false;
-    }
-
-    {
-        // Enable foreign key support.
-        QSqlQuery query(db);
-        if (!query.exec("PRAGMA foreign_keys = ON")) {
-            qWarning() << "failed to turn on foreign key support" << query.lastError().text();
-            return false;
-        }
-    }
-
-    m_valid = true;
-    m_fresh = db.tables().isEmpty();
-    return true;
-}
-
-bool NotebookDatabaseAccess::isFresh() const
-{
-    return m_fresh;
-}
-
-bool NotebookDatabaseAccess::isValid() const
-{
-    return m_valid;
-}
-
-// Maybe insert new table according to @p_configVersion.
-void NotebookDatabaseAccess::setupTables(QSqlDatabase &p_db, int p_configVersion)
-{
-    Q_UNUSED(p_configVersion);
-
-    if (!m_valid) {
-        return;
-    }
-
-    QSqlQuery query(p_db);
-
-    if (m_fresh) {
-        // Node.
-        bool ret = query.exec(QStringLiteral("CREATE TABLE %1 (\n"
-                                      "    id INTEGER PRIMARY KEY,\n"
-                                      "    name TEXT NOT NULL,\n"
-                                      "    signature INTEGER NOT NULL,\n"
-                                      "    parent_id INTEGER NULL REFERENCES %1(id) ON DELETE CASCADE ON UPDATE CASCADE)\n").arg(c_nodeTableName));
-        if (!ret) {
-            qWarning() << QStringLiteral("failed to create database table (%1) (%2)").arg(c_nodeTableName, query.lastError().text());
-            m_valid = false;
-            return;
-        }
-
-        // Tag.
-        ret = query.exec(QStringLiteral("CREATE TABLE %1 (\n"
-                                 "    name TEXT PRIMARY KEY,\n"
-                                 "    parent_name TEXT NULL REFERENCES %1(name) ON DELETE CASCADE ON UPDATE CASCADE) WITHOUT ROWID\n").arg(c_tagTableName));
-        if (!ret) {
-            qWarning() << QStringLiteral("failed to create database table (%1) (%2)").arg(c_tagTableName, query.lastError().text());
-            m_valid = false;
-            return;
-        }
-
-        // Node_Tag.
-        ret = query.exec(QStringLiteral("CREATE TABLE %1 (\n"
-                                 "    node_id INTEGER REFERENCES %2(id) ON DELETE CASCADE ON UPDATE CASCADE,\n"
-                                 "    tag_name TEXT REFERENCES %3(name) ON DELETE CASCADE ON UPDATE CASCADE)\n").arg(c_nodeTagTableName,
-                                                                                                                     c_nodeTableName,
-                                                                                                                     c_tagTableName));
-        if (!ret) {
-            qWarning() << QStringLiteral("failed to create database table (%1) (%2)").arg(c_nodeTagTableName, query.lastError().text());
-            m_valid = false;
-            return;
-        }
-    }
-}
-
-void NotebookDatabaseAccess::initialize(int p_configVersion)
-{
-    open();
-
-    auto db = getDatabase();
-    setupTables(db, p_configVersion);
-}
-
-void NotebookDatabaseAccess::close()
-{
-    getDatabase().close();
-    QSqlDatabase::removeDatabase(m_connectionName);
-    m_valid = false;
-}
-
-bool NotebookDatabaseAccess::addNode(Node *p_node, bool p_ignoreId)
-{
-    p_node->load();
-
-    Q_ASSERT(p_node->getSignature() != Node::InvalidId);
-
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    if (p_ignoreId) {
-        query.prepare(QStringLiteral("INSERT INTO %1 (name, signature, parent_id)\n"
-                              "    VALUES (:name, :signature, :parent_id)").arg(c_nodeTableName));
-        query.bindValue(":name", p_node->getName());
-        query.bindValue(":signature", p_node->getSignature());
-        query.bindValue(":parent_id", p_node->getParent() ? p_node->getParent()->getId() : QVariant());
-    } else {
-        bool useNewId = false;
-        if (p_node->getId() != InvalidId) {
-            auto nodeRec = queryNode(p_node->getId());
-            if (nodeRec) {
-                auto nodePath = queryNodeParentPath(p_node->getId());
-                if (existsNode(p_node, nodeRec.data(), nodePath)) {
-                    return true;
-                }
-
-                if (nodePath.isEmpty()) {
-                    useNewId = true;
-                    m_obsoleteNodes.insert(nodeRec->m_id);
-                } else {
-                    auto relativePath = nodePath.join(QLatin1Char('/'));
-                    auto oldNode = m_notebook->loadNodeByPath(relativePath);
-                    Q_ASSERT(oldNode != p_node);
-                    if (oldNode) {
-                        // The node with the same id still exists.
-                        useNewId = true;
-                    } else if (nodeRec->m_signature == p_node->getSignature() && nodeRec->m_name == p_node->getName()) {
-                        // @p_node should be the same node as @nodeRec.
-                        return updateNode(p_node);
-                    } else {
-                        // @nodeRec is now an obsolete node.
-                        useNewId = true;
-                        m_obsoleteNodes.insert(nodeRec->m_id);
-                    }
-                }
-            }
-        } else {
-            useNewId = true;
-        }
-
-        if (useNewId) {
-            query.prepare(QStringLiteral("INSERT INTO %1 (name, signature, parent_id)\n"
-                                  "    VALUES (:name, :signature, :parent_id)").arg(c_nodeTableName));
-        } else {
-            query.prepare(QStringLiteral("INSERT INTO %1 (id, name, signature, parent_id)\n"
-                                  "    VALUES (:id, :name, :signature, :parent_id)").arg(c_nodeTableName));
-            query.bindValue(":id", p_node->getId());
-        }
-        query.bindValue(":name", p_node->getName());
-        query.bindValue(":signature", p_node->getSignature());
-        query.bindValue(":parent_id", p_node->getParent() ? p_node->getParent()->getId() : QVariant());
-    }
-
-    if (!query.exec()) {
-        qWarning() << "failed to add node" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-
-    const ID id = query.lastInsertId().toULongLong();
-    p_node->updateId(id);
-
-    qDebug() << "added node id" << id << p_node->getName();
-    return true;
-}
-
-bool NotebookDatabaseAccess::addNodeRecursively(Node *p_node, bool p_ignoreId)
-{
-    if (!p_node) {
-        return false;
-    }
-
-    auto paNode = p_node->getParent();
-    if (paNode && !addNodeRecursively(paNode, p_ignoreId)) {
-        return false;
-    }
-
-    return addNode(p_node, p_ignoreId);
-}
-
-QSharedPointer<NotebookDatabaseAccess::NodeRecord> NotebookDatabaseAccess::queryNode(ID p_id)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("SELECT id, name, signature, parent_id FROM %1 WHERE id = :id").arg(c_nodeTableName));
-    query.bindValue(":id", p_id);
-    if (!query.exec()) {
-        qWarning() << "failed to query node" << query.executedQuery() << query.lastError().text();
-        return nullptr;
-    }
-
-    if (query.next()) {
-        auto nodeRec = QSharedPointer<NodeRecord>::create();
-        nodeRec->m_id = query.value(0).toULongLong();
-        nodeRec->m_name = query.value(1).toString();
-        nodeRec->m_signature = query.value(2).toULongLong();
-        nodeRec->m_parentId = query.value(3).toULongLong();
-        return nodeRec;
-    }
-
-    return nullptr;
-}
-
-QSqlDatabase NotebookDatabaseAccess::getDatabase() const
-{
-    return QSqlDatabase::database(m_connectionName);
-}
-
-bool NotebookDatabaseAccess::existsNode(const Node *p_node)
-{
-    if (!p_node) {
-        return false;
-    }
-
-    return existsNode(p_node,
-                      queryNode(p_node->getId()).data(),
-                      queryNodeParentPath(p_node->getId()));
-}
-
-bool NotebookDatabaseAccess::existsNode(const Node *p_node, const NodeRecord *p_rec, const QStringList &p_nodePath)
-{
-    if (p_nodePath.isEmpty()) {
-        return false;
-    }
-
-    if (!nodeEqual(p_rec, p_node)) {
-        return false;
-    }
-
-    return checkNodePath(p_node, p_nodePath);
-}
-
-QStringList NotebookDatabaseAccess::queryNodeParentPath(ID p_id)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("WITH RECURSIVE cte_parents(id, name, parent_id) AS (\n"
-                          "    SELECT node.id, node.name, node.parent_id\n"
-                          "    FROM %1 node\n"
-                          "    WHERE node.id = :id\n"
-                          "    UNION ALL\n"
-                          "    SELECT node.id, node.name, node.parent_id\n"
-                          "    FROM %1 node\n"
-                          "    JOIN cte_parents cte ON node.id = cte.parent_id\n"
-                          "    LIMIT 5000)\n"
-                          "SELECT id, name, parent_id FROM cte_parents").arg(c_nodeTableName));
-    query.bindValue(":id", p_id);
-    if (!query.exec()) {
-        qWarning() << "failed to query node's path" << query.executedQuery() << query.lastError().text();
-        return QStringList();
-    }
-
-    QStringList ret;
-    ID lastParentId = p_id;
-    bool hasResult = false;
-    while (query.next()) {
-        hasResult = true;
-        Q_ASSERT(lastParentId == query.value(0).toULongLong());
-        ret.prepend(query.value(1).toString());
-        lastParentId = query.value(2).toULongLong();
-    }
-    Q_ASSERT(!hasResult || lastParentId == InvalidId);
-    return ret;
-}
-
-QString NotebookDatabaseAccess::queryNodePath(ID p_id)
-{
-    auto parentPath = queryNodeParentPath(p_id);
-    if (parentPath.isEmpty()) {
-        return QString();
-    }
-
-    if (parentPath.size() == 1) {
-        return parentPath.first();
-    }
-
-    QString relativePath = parentPath.join(QLatin1Char('/'));
-    Q_ASSERT(relativePath[0] == QLatin1Char('/'));
-    return relativePath.mid(1);
-}
-
-bool NotebookDatabaseAccess::updateNode(const Node *p_node)
-{
-    Q_ASSERT(p_node->getParent());
-
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("UPDATE %1\n"
-                          "SET name = :name,\n"
-                          "    signature = :signature,\n"
-                          "    parent_id = :parent_id\n"
-                          "WHERE id = :id").arg(c_nodeTableName));
-    query.bindValue(":name", p_node->getName());
-    query.bindValue(":signature", p_node->getSignature());
-    query.bindValue(":parent_id", p_node->getParent()->getId());
-    query.bindValue(":id", p_node->getId());
-    if (!query.exec()) {
-        qWarning() << "failed to update node" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-
-    qDebug() << "updated node"
-             << p_node->getId()
-             << p_node->getSignature()
-             << p_node->getName()
-             << p_node->getParent()->getId();
-
-    return true;
-}
-
-void NotebookDatabaseAccess::clearObsoleteNodes()
-{
-    if (m_obsoleteNodes.isEmpty()) {
-        return;
-    }
-
-    for (auto it : m_obsoleteNodes) {
-        if (!removeNode(it)) {
-            qWarning() << "failed to clear obsolete node" << it;
-            continue;
-        }
-    }
-
-    m_obsoleteNodes.clear();
-}
-
-bool NotebookDatabaseAccess::removeNode(const Node *p_node)
-{
-    if (existsNode(p_node)) {
-        return removeNode(p_node->getId());
-    }
-
-    return true;
-}
-
-bool NotebookDatabaseAccess::removeNode(ID p_id)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("DELETE FROM %1\n"
-                          "WHERE id = :id").arg(c_nodeTableName));
-    query.bindValue(":id", p_id);
-    if (!query.exec()) {
-        qWarning() << "failed to remove node" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-    qDebug() << "removed node" << p_id;
-    return true;
-}
-
-bool NotebookDatabaseAccess::nodeEqual(const NodeRecord *p_rec, const Node *p_node) const
-{
-    if (!p_rec) {
-        if (p_node) {
-            return false;
-        } else {
-            return true;
-        }
-    } else if (!p_node) {
-        return false;
-    }
-
-    if (p_rec->m_id != p_node->getId()) {
-        return false;
-    }
-    if (p_rec->m_name != p_node->getName()) {
-        return false;
-    }
-    if (p_rec->m_signature != p_node->getSignature()) {
-        return false;
-    }
-    if (p_node->getParent()) {
-        if (p_rec->m_parentId != p_node->getParent()->getId()) {
-            return false;
-        }
-    } else if (p_rec->m_parentId != Node::InvalidId) {
-        return false;
-    }
-
-    return true;
-}
-
-bool NotebookDatabaseAccess::checkNodePath(const Node *p_node, const QStringList &p_nodePath) const
-{
-    for (int i = p_nodePath.size() - 1; i >= 0; --i) {
-        if (!p_node) {
-            return false;
-        }
-
-        if (p_nodePath[i] != p_node->getName()) {
-            return false;
-        }
-        p_node = p_node->getParent();
-    }
-
-    if (p_node) {
-        return false;
-    }
-
-    return true;
-}
-
-bool NotebookDatabaseAccess::addTag(const QString &p_name, const QString &p_parentName)
-{
-    return addTag(p_name, p_parentName, true);
-}
-
-bool NotebookDatabaseAccess::addTag(const QString &p_name)
-{
-    return addTag(p_name, QString(), false);
-}
-
-bool NotebookDatabaseAccess::addTag(const QString &p_name, const QString &p_parentName, bool p_updateOnExists)
-{
-    {
-        auto tagRec = queryTag(p_name);
-        if (tagRec) {
-            if (!p_updateOnExists || tagRec->m_parentName == p_parentName) {
-                return true;
-            }
-
-            return updateTagParent(p_name, p_parentName);
-        }
-    }
-
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("INSERT INTO %1 (name, parent_name)\n"
-                          "    VALUES (:name, :parent_name)").arg(c_tagTableName));
-    query.bindValue(":name", p_name);
-    query.bindValue(":parent_name", p_parentName.isEmpty() ? QVariant() : p_parentName);
-
-    if (!query.exec()) {
-        qWarning() << "failed to add tag" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-
-    qDebug() << "added tag" << p_name << "parentName" << p_parentName;
-    return true;
-}
-
-QSharedPointer<NotebookDatabaseAccess::TagRecord> NotebookDatabaseAccess::queryTag(const QString &p_name)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("SELECT name, parent_name FROM %1 WHERE name = :name").arg(c_tagTableName));
-    query.bindValue(":name", p_name);
-    if (!query.exec()) {
-        qWarning() << "failed to query tag" << query.executedQuery() << query.lastError().text();
-        return nullptr;
-    }
-
-    if (query.next()) {
-        auto tagRec = QSharedPointer<TagRecord>::create();
-        tagRec->m_name = query.value(0).toString();
-        tagRec->m_parentName = query.value(1).toString();
-        return tagRec;
-    }
-
-    return nullptr;
-}
-
-bool NotebookDatabaseAccess::updateTagParent(const QString &p_name, const QString &p_parentName)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("UPDATE %1\n"
-                          "SET parent_name = :parent_name\n"
-                          "WHERE name = :name").arg(c_tagTableName));
-    query.bindValue(":name", p_name);
-    query.bindValue(":parent_name", p_parentName.isEmpty() ? QVariant() : p_parentName);
-    if (!query.exec()) {
-        qWarning() << "failed to update tag" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-
-    qDebug() << "updated tag parent" << p_name << p_parentName;
-
-    return true;
-}
-
-bool NotebookDatabaseAccess::renameTag(const QString &p_name, const QString &p_newName)
-{
-    Q_ASSERT(!p_newName.isEmpty());
-    if (p_name == p_newName) {
-        return true;
-    }
-
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("UPDATE %1\n"
-                          "SET name = :new_name\n"
-                          "WHERE name = :name").arg(c_tagTableName));
-    query.bindValue(":name", p_name);
-    query.bindValue(":new_name", p_newName);
-    if (!query.exec()) {
-        qWarning() << "failed to update tag" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-
-    qDebug() << "updated tag name" << p_name << p_newName;
-
-    return true;
-}
-
-bool NotebookDatabaseAccess::removeTag(const QString &p_name)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("DELETE FROM %1\n"
-                          "WHERE name = :name").arg(c_tagTableName));
-    query.bindValue(":name", p_name);
-    if (!query.exec()) {
-        qWarning() << "failed to remove tag" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-    qDebug() << "removed tag" << p_name;
-    return true;
-}
-
-bool NotebookDatabaseAccess::updateNodeTags(Node *p_node)
-{
-    p_node->load();
-
-    if (p_node->getId() == Node::InvalidId) {
-        qWarning() << "failed to update tags of node with invalid id" << p_node->fetchPath();
-        return false;
-    }
-
-    const auto &nodeTags = p_node->getTags();
-
-    {
-        QStringList tagsList = queryNodeTags(p_node->getId());
-        QSet<QString> tags;
-        for (const auto &s : tagsList)
-        {
-            tags.insert(s);
-        }
-        if (tags.isEmpty() && nodeTags.isEmpty()) {
-            return true;
-        }
-
-        bool needUpdate = false;
-        if (tags.size() != nodeTags.size()) {
-            needUpdate = true;
-        }
-
-        for (const auto &tag : nodeTags) {
-            if (tags.find(tag) == tags.end()) {
-                needUpdate = true;
-
-                if (!addTag(tag)) {
-                    qWarning() << "failed to add tag before addNodeTags" << p_node->getId() << tag;
-                    return false;
-                }
-            }
-        }
-
-        if (!needUpdate) {
-            return true;
-        }
-    }
-
-    bool ret = removeNodeTags(p_node->getId());
-    if (!ret) {
-        return false;
-    }
-
-    return addNodeTags(p_node->getId(), nodeTags);
-}
-
-QStringList NotebookDatabaseAccess::queryNodeTags(ID p_id)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("SELECT tag_name FROM %1 WHERE node_id = :node_id").arg(c_nodeTagTableName));
-    query.bindValue(":node_id", p_id);
-    if (!query.exec()) {
-        qWarning() << "failed to query node's tags" << query.executedQuery() << query.lastError().text();
-        return QStringList();
-    }
-
-    QStringList tags;
-    while (query.next()) {
-        tags.append(query.value(0).toString());
-    }
-    return tags;
-}
-
-bool NotebookDatabaseAccess::removeNodeTags(ID p_id)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("DELETE FROM %1\n"
-                          "WHERE node_id = :node_id").arg(c_nodeTagTableName));
-    query.bindValue(":node_id", p_id);
-    if (!query.exec()) {
-        qWarning() << "failed to remove tags of node" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-    qDebug() << "removed tags of node" << p_id;
-    return true;
-}
-
-bool NotebookDatabaseAccess::addNodeTags(ID p_id, const QStringList &p_tags)
-{
-    Q_ASSERT(p_id != Node::InvalidId);
-    if (p_tags.isEmpty()) {
-        return true;
-    }
-
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("INSERT INTO %1 (node_id, tag_name)\n"
-                          "    VALUES (?, ?)").arg(c_nodeTagTableName));
-
-    QVariantList ids;
-    QVariantList tagNames;
-    for (const auto &tag : p_tags) {
-        ids << p_id;
-        tagNames << tag;
-    }
-
-    query.addBindValue(ids);
-    query.addBindValue(tagNames);
-
-    if (!query.execBatch()) {
-        qWarning() << "failed to add tags of node" << query.executedQuery() << query.lastError().text();
-        return false;
-    }
-
-    qDebug() << "added tags of node" << p_id << p_tags;
-    return true;
-}
-
-QList<ID> NotebookDatabaseAccess::queryTagNodes(const QString &p_tag)
-{
-    QList<ID> nodes;
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("SELECT node_id FROM %1 WHERE tag_name = :tag_name").arg(c_nodeTagTableName));
-    query.bindValue(":tag_name", p_tag);
-    if (!query.exec()) {
-        qWarning() << "failed to query nodes of tag" << query.executedQuery() << query.lastError().text();
-        return nodes;
-    }
-
-    while (query.next()) {
-        nodes.append(query.value(0).toULongLong());
-    }
-    return nodes;
-}
-
-QList<ID> NotebookDatabaseAccess::queryTagNodesRecursive(const QString &p_tag)
-{
-    auto tags = queryTagAndChildren(p_tag);
-    if (tags.size() <= 1) {
-        return queryTagNodes(p_tag);
-    }
-
-    QSet<ID> allIds;
-    for (const auto &tag : tags) {
-        auto ids = queryTagNodes(tag);
-        for (const auto &id : ids) {
-            allIds.insert(id);
-        }
-    }
-
-    return allIds.values();
-}
-
-QStringList NotebookDatabaseAccess::queryTagAndChildren(const QString &p_tag)
-{
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("WITH RECURSIVE cte_children(name, parent_name) AS (\n"
-                          "    SELECT tag.name, tag.parent_name\n"
-                          "    FROM %1 tag\n"
-                          "    WHERE tag.name = :name\n"
-                          "    UNION ALL\n"
-                          "    SELECT tag.name, tag.parent_name\n"
-                          "    FROM %1 tag\n"
-                          "    JOIN cte_children cte ON tag.parent_name = cte.name\n"
-                          "    LIMIT 5000)\n"
-                          "SELECT name FROM cte_children").arg(c_tagTableName));
-    query.bindValue(":name", p_tag);
-    if (!query.exec()) {
-        qWarning() << "failed to query tag and its children" << query.executedQuery() << query.lastError().text();
-        return QStringList();
-    }
-
-    QStringList ret;
-    while (query.next()) {
-        ret.append(query.value(0).toString());
-    }
-
-    qDebug() << "tag and its children" << p_tag << ret;
-    return ret;
-}
-
-QStringList NotebookDatabaseAccess::getNodesOfTags(const QStringList &p_tags)
-{
-    QStringList ret;
-    if (p_tags.isEmpty()) {
-        return ret;
-    }
-
-    QList<ID> nodeIds;
-
-    if (p_tags.size() == 1) {
-        nodeIds = queryTagNodesRecursive(p_tags.first());
-    } else {
-        QSet<ID> allIds;
-        for (const auto &tag : p_tags) {
-            auto ids = queryTagNodesRecursive(tag);
-            for (const auto &id : ids) {
-                allIds.insert(id);
-            }
-        }
-        nodeIds = allIds.values();
-    }
-
-    for (const auto &id : nodeIds) {
-        auto nodePath = queryNodePath(id);
-        if (nodePath.isNull()) {
-            continue;
-        }
-
-        ret.append(nodePath);
-    }
-
-    return ret;
-}
-
-QList<NotebookDatabaseAccess::TagRecord> NotebookDatabaseAccess::getAllTags()
-{
-    QList<TagRecord> ret;
-
-    auto db = getDatabase();
-    QSqlQuery query(db);
-    query.prepare(QStringLiteral("SELECT name, parent_name FROM %1 ORDER BY parent_name, name").arg(c_tagTableName));
-    if (!query.exec()) {
-        qWarning() << "failed to query tags" << query.executedQuery() << query.lastError().text();
-        return ret;
-    }
-
-    while (query.next()) {
-        ret.append(TagRecord());
-        ret.last().m_name = query.value(0).toString();
-        ret.last().m_parentName = query.value(1).toString();
-    }
-    return ret;
-}