From d1395b9ac2e3253afa1b19e90b93b900fa9e3e02 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Sat, 6 May 2017 21:26:12 +0800
Subject: [PATCH] release v1.4

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

diff --git a/.linux_bintray.json b/.linux_bintray.json
index c9c422fe..d199c1cd 100644
--- a/.linux_bintray.json
+++ b/.linux_bintray.json
@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "1.3",
+        "name": "1.4",
         "desc": "VNote Releases",
-        "released": "2017-04-23",
-        "vcs_tag": "1.3",
+        "released": "2017-05-06",
+        "vcs_tag": "1.4",
         "gpgSign": false
     },
 
diff --git a/.macos_bintray.json b/.macos_bintray.json
index ce744d8f..f95af509 100644
--- a/.macos_bintray.json
+++ b/.macos_bintray.json
@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "1.3",
+        "name": "1.4",
         "desc": "VNote Releases",
-        "released": "2017-04-23",
-        "vcs_tag": "1.3",
+        "released": "2017-05-06",
+        "vcs_tag": "1.4",
         "gpgSign": false
     },
 
diff --git a/.travis.yml b/.travis.yml
index 1bed956f..796421c7 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="1.3"
+- export version="1.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 c6a769d3..be09f169 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 image: Visual Studio 2015
 
-version: 1.3.{build}
+version: 1.4.{build}
 
 branches:
     only:
@@ -38,7 +38,7 @@ build_script:
 
 # scripts that run after build
 after_build:
-    - set vnote_version=1.3
+    - set vnote_version=1.4
     - mkdir distrib\VNote
     - windeployqt.exe --dir .\distrib\VNote %APPVEYOR_BUILD_FOLDER%\build\src\release\VNote.exe
     - copy "%APPVEYOR_BUILD_FOLDER%\build\src\release\VNote.exe" "distrib\VNote\VNote.exe"
@@ -61,6 +61,6 @@ deploy:
       subject: tamlok
       repo: vnote
       package: vnote
-      version: 1.3
+      version: 1.4
       publish: true
       override: true
diff --git a/changes.md b/changes.md
index 1afe2599..8d71b3d0 100644
--- a/changes.md
+++ b/changes.md
@@ -1,4 +1,12 @@
 # Changes History
+## v1.4
+- Use `_vnote.json` as the config file;
+- More user friendly messages;
+- Delete notebook by deleting root directories one by one;
+- Refactor image preview logics to support previewing all images in edit mode;
+- Support constraining the width of previewed images to the edit window;
+- bugfix;
+
 ## v1.3
 - Support code block syntax highlight in edit mode;
 - A more pleasant AutoIndent and AutoList;
diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp
index be0387d5..f3d54988 100644
--- a/src/vconfigmanager.cpp
+++ b/src/vconfigmanager.cpp
@@ -12,7 +12,7 @@
 
 const QString VConfigManager::orgName = QString("vnote");
 const QString VConfigManager::appName = QString("vnote");
-const QString VConfigManager::c_version = QString("1.3");
+const QString VConfigManager::c_version = QString("1.4");
 const QString VConfigManager::c_obsoleteDirConfigFile = QString(".vnote.json");
 const QString VConfigManager::c_dirConfigFile = QString("_vnote.json");
 const QString VConfigManager::defaultConfigFilePath = QString(":/resources/vnote.ini");