Le Tan 6 лет назад
Родитель
Сommit
311ed253f5
7 измененных файлов с 20 добавлено и 12 удалено
  1. 3 3
      .linux_bintray.json
  2. 3 3
      .macos_bintray.json
  3. 1 1
      .travis.yml
  4. 3 3
      appveyor.yml
  5. 8 0
      changes.md
  6. 1 1
      src/vconfigmanager.cpp
  7. 1 1
      src/vmainwindow.cpp

+ 3 - 3
.linux_bintray.json

@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "2.3",
+        "name": "2.4",
         "desc": "VNote Releases",
-        "released": "2019-03-04",
-        "vcs_tag": "2.3",
+        "released": "2019-04-05",
+        "vcs_tag": "2.4",
         "gpgSign": false
     },
 

+ 3 - 3
.macos_bintray.json

@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "2.3",
+        "name": "2.4",
         "desc": "VNote Releases",
-        "released": "2019-03-04",
-        "vcs_tag": "2.3",
+        "released": "2019-04-05",
+        "vcs_tag": "2.4",
         "gpgSign": false
     },
 

+ 1 - 1
.travis.yml

@@ -19,7 +19,7 @@ branches:
 before_install:
 - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
 - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo apt-get -qq update ; fi
-- export version="2.3"
+- export version="2.4"
 
 install:
 - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install p7zip-full ; fi

+ 3 - 3
appveyor.yml

@@ -1,6 +1,6 @@
 image: Visual Studio 2015
 
-version: 2.3.{build}
+version: 2.4.{build}
 
 branches:
     only:
@@ -39,7 +39,7 @@ build_script:
 
 # scripts that run after build
 after_build:
-    - set vnote_version=2.3
+    - set vnote_version=2.4
     # Clone OpenSSL DLLs
     - git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git
     - mkdir distrib\VNote
@@ -72,7 +72,7 @@ deploy:
       subject: tamlok
       repo: vnote
       package: vnote
-      version: 2.3
+      version: 2.4
       publish: true
       override: true
       artifact: portable

+ 8 - 0
changes.md

@@ -1,4 +1,12 @@
 # Changes History
+## v2.4
+- Bundle qt5ct in Linux for native look support;
+- Use `Return` or `Enter` to confirm selection in macOS (besides `Cmd+O`);
+- Support sync note list to current note automatically via config `global/sync_note_list_to_current_tab`;
+- Add `Ctrl+E N` to view and edit current note's information;
+- Fix Markdown highlighter to handle fenced code block without a leading empty line;
+- Prompt for restart after changing theme;
+
 ## v2.3
 - Add Japanese translations (thanks to @miurahr);
 - Editor

+ 1 - 1
src/vconfigmanager.cpp

@@ -19,7 +19,7 @@ const QString VConfigManager::orgName = QString("vnote");
 
 const QString VConfigManager::appName = QString("vnote");
 
-const QString VConfigManager::c_version = QString("2.3");
+const QString VConfigManager::c_version = QString("2.4");
 
 const QString VConfigManager::c_dirConfigFile = QString("_vnote.json");
 

+ 1 - 1
src/vmainwindow.cpp

@@ -3456,7 +3456,7 @@ void VMainWindow::kickOffStartUpTimer(const QStringList &p_files)
             m_editArea->openFile(file, OpenFileMode::Read);
         }
 
-        if (g_config->versionChanged()) {
+        if (g_config->versionChanged() && !g_config->getAllowUserTrack()) {
             // Ask user whether allow tracking.
             int ret = VUtils::showMessage(QMessageBox::Information,
                                           tr("Collect User Statistics"),