From 311ed253f59b4b2f9940dce9f40501db338d66dc Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Fri, 5 Apr 2019 10:42:34 +0800
Subject: [PATCH] release v2.4

---
 .linux_bintray.json    | 6 +++---
 .macos_bintray.json    | 6 +++---
 .travis.yml            | 2 +-
 appveyor.yml           | 6 +++---
 changes.md             | 8 ++++++++
 src/vconfigmanager.cpp | 2 +-
 src/vmainwindow.cpp    | 2 +-
 7 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.linux_bintray.json b/.linux_bintray.json
index 846b190558..1d1c218fdf 100644
--- a/.linux_bintray.json
+++ b/.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
     },
 
diff --git a/.macos_bintray.json b/.macos_bintray.json
index 829cd9c63e..4b1fcce884 100644
--- a/.macos_bintray.json
+++ b/.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
     },
 
diff --git a/.travis.yml b/.travis.yml
index b5a0818f35..c86f437c51 100644
--- a/.travis.yml
+++ b/.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
diff --git a/appveyor.yml b/appveyor.yml
index b2922a94b8..fbdd817fe0 100644
--- a/appveyor.yml
+++ b/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
diff --git a/changes.md b/changes.md
index f259c67efb..ee70c2bdeb 100644
--- a/changes.md
+++ b/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
diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp
index 9ef8e9e5fe..7f07e89c9f 100644
--- a/src/vconfigmanager.cpp
+++ b/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");
 
diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index 36333e5fa1..0057e89e5a 100644
--- a/src/vmainwindow.cpp
+++ b/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"),