diff --git a/.gitignore b/.gitignore index 4ec47412..8d636f4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -vnotex.pro.user -vnotex.pro.user.* +*.pro.user +*.pro.user.* .ccls compile_commands.json compile_flags.txt diff --git a/README.md b/README.md index 72268ee4..c462e222 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ A pleasant note-taking platform. > At early 2019, I decided to refactor VNote as VNoteX. Now a fresh VNote is ready! -> VNoteX is closed source and is intended to keep several premium features compared to VNote. Most of VNoteX's code will be open source as VNote 3.0, so VNote will share most of the code with VNoteX and continue to be open source from 3.0. +> VNoteX is closed source and is intended to keep several premium features compared to VNote. Most of VNoteX's code base will be open source as VNote 3.0, so VNote will share most of the code base with VNoteX and continue to be open source from 3.0. > **Welcome to VNoteX and VNote 3.0!** **ATTENTION**: The notebook format of VNote 3.0 is not compatible with that of earlier versions of VNote. Feel free to decide the right time to jump to VNote 3.0. -The obsolete code of VNote 2.0 is available at the [vnote2.0](https://github.com/vnotex/vnote/tree/vnote2.0) branch. +The obsolete code base of VNote 2.0 is available at the [vnote2.0](https://github.com/vnotex/vnote/tree/vnote2.0) branch. ## License -VNote is licensed under [GNU LGPLv3](https://opensource.org/licenses/LGPL-3.0). Code of VNote could be used freely by VNoteX. +VNote is licensed under [GNU LGPLv3](https://opensource.org/licenses/LGPL-3.0). Code base of VNote could be used freely by VNoteX. diff --git a/src/core/configmgr.cpp b/src/core/configmgr.cpp index 7af24b3b..48cfcbe3 100644 --- a/src/core/configmgr.cpp +++ b/src/core/configmgr.cpp @@ -29,7 +29,7 @@ using namespace vnotex; const QString ConfigMgr::c_orgName = "VNote"; -const QString ConfigMgr::c_appName = "VNoteX"; +const QString ConfigMgr::c_appName = "VNote"; const QString ConfigMgr::c_configFileName = "vnotex.json"; diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index ad9f8d4a..f52acdba 100644 --- a/src/data/core/vnotex.json +++ b/src/data/core/vnotex.json @@ -3,7 +3,7 @@ "metadata" : { "//comment": "When releasing new version, please go through the following configs to check if override is needed.", "//Comment": "markdown_editor#override_viewer_resource", - "version" : "0.1.5" + "version" : "3.0.0" }, "core" : { "theme" : "native", diff --git a/src/src.pro b/src/src.pro index e6eeedda..cab41ccc 100644 --- a/src/src.pro +++ b/src/src.pro @@ -9,7 +9,7 @@ CONFIG -= qtquickcompiler # Enable message log in release build DEFINES += QT_MESSAGELOGCONTEXT -TARGET = vnotex +TARGET = vnote TEMPLATE = app win32:CONFIG(release, debug|release) { diff --git a/vnotex.pro b/vnote.pro similarity index 100% rename from vnotex.pro rename to vnote.pro