move source stuff into src subdir

Make it convenient to add third-party libraries. Signed-off-by: Le Tan <tamlokveer@gmail.com>
2025-07-05 05:49:53 +08:00 · 2016-10-22 14:11:33 +08:00 · 2016-10-22 14:11:33 +08:00 · 5fa07864a1
commit 5fa07864a1
parent c7e631fa02
99 changed files with 66 additions and 55 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
-[submodule "utils/marked"]
-	path = utils/marked
+[submodule "src/utils/marked"]
+	path = src/utils/marked
 	url = https://github.com/chjj/marked.git
--- a/VNote.pro
+++ b/VNote.pro
@ -4,58 +4,8 @@
 #
 #-------------------------------------------------

-QT       += core gui webenginewidgets webchannel
+TEMPLATE = subdirs

-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+CONFIG += c++11

-TARGET = VNote
-TEMPLATE = app
-
-
-SOURCES += main.cpp\
-        vmainwindow.cpp \
-    vdirectorytree.cpp \
-    vnote.cpp \
-    vnotebook.cpp \
-    dialog/vnewdirdialog.cpp \
-    vconfigmanager.cpp \
-    vfilelist.cpp \
-    dialog/vnewfiledialog.cpp \
-    vtabwidget.cpp \
-    vedit.cpp \
-    veditor.cpp \
-    vnotefile.cpp \
-    vdocument.cpp \
-    utils/vutils.cpp \
-    vpreviewpage.cpp \
-    utils/peg-highlight/pmh_parser.c \
-    hgmarkdownhighlighter.cpp \
-    vstyleparser.cpp \
-    utils/peg-highlight/pmh_styleparser.c \
-    dialog/vnewnotebookdialog.cpp
-
-HEADERS  += vmainwindow.h \
-    vdirectorytree.h \
-    vnote.h \
-    vnotebook.h \
-    dialog/vnewdirdialog.h \
-    vconfigmanager.h \
-    vfilelist.h \
-    dialog/vnewfiledialog.h \
-    vtabwidget.h \
-    vedit.h \
-    veditor.h \
-    vconstants.h \
-    vnotefile.h \
-    vdocument.h \
-    utils/vutils.h \
-    vpreviewpage.h \
-    utils/peg-highlight/pmh_parser.h \
-    hgmarkdownhighlighter.h \
-    utils/peg-highlight/pmh_definitions.h \
-    vstyleparser.h \
-    utils/peg-highlight/pmh_styleparser.h \
-    dialog/vnewnotebookdialog.h
-
-RESOURCES += \
-    vnote.qrc
+SUBDIRS = src
--- a/src/dialog/vnewdirdialog.cpp
+++ b/src/dialog/vnewdirdialog.cpp
--- a/src/dialog/vnewdirdialog.h
+++ b/src/dialog/vnewdirdialog.h
--- a/src/dialog/vnewfiledialog.cpp
+++ b/src/dialog/vnewfiledialog.cpp
--- a/src/dialog/vnewfiledialog.h
+++ b/src/dialog/vnewfiledialog.h
--- a/src/dialog/vnewnotebookdialog.cpp
+++ b/src/dialog/vnewnotebookdialog.cpp
--- a/src/dialog/vnewnotebookdialog.h
+++ b/src/dialog/vnewnotebookdialog.h
--- a/src/hgmarkdownhighlighter.cpp
+++ b/src/hgmarkdownhighlighter.cpp
--- a/src/hgmarkdownhighlighter.h
+++ b/src/hgmarkdownhighlighter.h
--- a/src/main.cpp
+++ b/src/main.cpp
--- a/src/resources/icons/create_notebook.png
+++ b/src/resources/icons/create_notebook.png
--- a/src/resources/icons/delete_notebook.png
+++ b/src/resources/icons/delete_notebook.png
--- a/src/resources/icons/notebook_info.png
+++ b/src/resources/icons/notebook_info.png
--- a/src/resources/markdown.css
+++ b/src/resources/markdown.css
--- a/src/resources/post_template.html
+++ b/src/resources/post_template.html
--- a/src/resources/pre_template.html
+++ b/src/resources/pre_template.html
--- a/src/resources/qwebchannel.js
+++ b/src/resources/qwebchannel.js
--- a/src/resources/styles/default.mdhl
+++ b/src/resources/styles/default.mdhl
--- a/src/resources/styles/solarized-dark.mdhl
+++ b/src/resources/styles/solarized-dark.mdhl
--- a/src/resources/styles/solarized-light.mdhl
+++ b/src/resources/styles/solarized-light.mdhl
--- a/src/resources/template.html
+++ b/src/resources/template.html
--- a/src/resources/vnote.ini
+++ b/src/resources/vnote.ini
--- a/src/resources/welcome.html
+++ b/src/resources/welcome.html
--- a/src/src.pro
+++ b/src/src.pro
@ -0,0 +1,61 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-10-01T11:03:59
+#
+#-------------------------------------------------
+
+QT       += core gui webenginewidgets webchannel
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = VNote
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+        vmainwindow.cpp \
+    vdirectorytree.cpp \
+    vnote.cpp \
+    vnotebook.cpp \
+    dialog/vnewdirdialog.cpp \
+    vconfigmanager.cpp \
+    vfilelist.cpp \
+    dialog/vnewfiledialog.cpp \
+    vtabwidget.cpp \
+    vedit.cpp \
+    veditor.cpp \
+    vnotefile.cpp \
+    vdocument.cpp \
+    utils/vutils.cpp \
+    vpreviewpage.cpp \
+    utils/peg-highlight/pmh_parser.c \
+    hgmarkdownhighlighter.cpp \
+    vstyleparser.cpp \
+    utils/peg-highlight/pmh_styleparser.c \
+    dialog/vnewnotebookdialog.cpp
+
+HEADERS  += vmainwindow.h \
+    vdirectorytree.h \
+    vnote.h \
+    vnotebook.h \
+    dialog/vnewdirdialog.h \
+    vconfigmanager.h \
+    vfilelist.h \
+    dialog/vnewfiledialog.h \
+    vtabwidget.h \
+    vedit.h \
+    veditor.h \
+    vconstants.h \
+    vnotefile.h \
+    vdocument.h \
+    utils/vutils.h \
+    vpreviewpage.h \
+    utils/peg-highlight/pmh_parser.h \
+    hgmarkdownhighlighter.h \
+    utils/peg-highlight/pmh_definitions.h \
+    vstyleparser.h \
+    utils/peg-highlight/pmh_styleparser.h \
+    dialog/vnewnotebookdialog.h
+
+RESOURCES += \
+    vnote.qrc
--- a/src/utils/highlightjs/CHANGES.md
+++ b/src/utils/highlightjs/CHANGES.md
--- a/src/utils/highlightjs/LICENSE
+++ b/src/utils/highlightjs/LICENSE
--- a/src/utils/highlightjs/README.md
+++ b/src/utils/highlightjs/README.md
--- a/src/utils/highlightjs/README.ru.md
+++ b/src/utils/highlightjs/README.ru.md
--- a/src/utils/highlightjs/highlight.pack.js
+++ b/src/utils/highlightjs/highlight.pack.js
--- a/src/utils/highlightjs/styles/androidstudio.css
+++ b/src/utils/highlightjs/styles/androidstudio.css
--- a/src/utils/highlightjs/styles/atom-one-dark.css
+++ b/src/utils/highlightjs/styles/atom-one-dark.css
--- a/src/utils/highlightjs/styles/atom-one-light.css
+++ b/src/utils/highlightjs/styles/atom-one-light.css
--- a/src/utils/highlightjs/styles/darcula.css
+++ b/src/utils/highlightjs/styles/darcula.css
--- a/src/utils/highlightjs/styles/dark.css
+++ b/src/utils/highlightjs/styles/dark.css
--- a/src/utils/highlightjs/styles/darkula.css
+++ b/src/utils/highlightjs/styles/darkula.css
--- a/src/utils/highlightjs/styles/default.css
+++ b/src/utils/highlightjs/styles/default.css
--- a/src/utils/highlightjs/styles/github-gist.css
+++ b/src/utils/highlightjs/styles/github-gist.css
--- a/src/utils/highlightjs/styles/github.css
+++ b/src/utils/highlightjs/styles/github.css
--- a/src/utils/highlightjs/styles/googlecode.css
+++ b/src/utils/highlightjs/styles/googlecode.css
--- a/src/utils/highlightjs/styles/gruvbox-dark.css
+++ b/src/utils/highlightjs/styles/gruvbox-dark.css
--- a/src/utils/highlightjs/styles/gruvbox-light.css
+++ b/src/utils/highlightjs/styles/gruvbox-light.css
--- a/src/utils/highlightjs/styles/monokai-sublime.css
+++ b/src/utils/highlightjs/styles/monokai-sublime.css
--- a/src/utils/highlightjs/styles/monokai.css
+++ b/src/utils/highlightjs/styles/monokai.css
--- a/src/utils/highlightjs/styles/qtcreator_dark.css
+++ b/src/utils/highlightjs/styles/qtcreator_dark.css
--- a/src/utils/highlightjs/styles/qtcreator_light.css
+++ b/src/utils/highlightjs/styles/qtcreator_light.css
--- a/src/utils/highlightjs/styles/rainbow.css
+++ b/src/utils/highlightjs/styles/rainbow.css
--- a/src/utils/highlightjs/styles/solarized-dark.css
+++ b/src/utils/highlightjs/styles/solarized-dark.css
--- a/src/utils/highlightjs/styles/solarized-light.css
+++ b/src/utils/highlightjs/styles/solarized-light.css
--- a/src/utils/highlightjs/styles/tomorrow-night-blue.css
+++ b/src/utils/highlightjs/styles/tomorrow-night-blue.css
--- a/src/utils/highlightjs/styles/tomorrow-night-bright.css
+++ b/src/utils/highlightjs/styles/tomorrow-night-bright.css
--- a/src/utils/highlightjs/styles/tomorrow-night-eighties.css
+++ b/src/utils/highlightjs/styles/tomorrow-night-eighties.css
--- a/src/utils/highlightjs/styles/tomorrow-night.css
+++ b/src/utils/highlightjs/styles/tomorrow-night.css
--- a/src/utils/highlightjs/styles/tomorrow.css
+++ b/src/utils/highlightjs/styles/tomorrow.css
--- a/src/utils/marked
+++ b/src/utils/marked
--- a/src/utils/peg-highlight/pmh_definitions.h
+++ b/src/utils/peg-highlight/pmh_definitions.h
--- a/src/utils/peg-highlight/pmh_parser.c
+++ b/src/utils/peg-highlight/pmh_parser.c
--- a/src/utils/peg-highlight/pmh_parser.h
+++ b/src/utils/peg-highlight/pmh_parser.h
--- a/src/utils/peg-highlight/pmh_styleparser.c
+++ b/src/utils/peg-highlight/pmh_styleparser.c
--- a/src/utils/peg-highlight/pmh_styleparser.h
+++ b/src/utils/peg-highlight/pmh_styleparser.h
--- a/src/utils/peg-highlight/styles/error.style
+++ b/src/utils/peg-highlight/styles/error.style
--- a/src/utils/peg-highlight/styles/fontsizes.style
+++ b/src/utils/peg-highlight/styles/fontsizes.style
--- a/src/utils/peg-highlight/styles/macoslineseparator.style
+++ b/src/utils/peg-highlight/styles/macoslineseparator.style
--- a/src/utils/peg-highlight/styles/playground.style
+++ b/src/utils/peg-highlight/styles/playground.style
--- a/src/utils/peg-highlight/styles/solarized-dark.style
+++ b/src/utils/peg-highlight/styles/solarized-dark.style
--- a/src/utils/peg-highlight/styles/solarized-light.style
+++ b/src/utils/peg-highlight/styles/solarized-light.style
--- a/src/utils/peg-highlight/styles/teststyle.style
+++ b/src/utils/peg-highlight/styles/teststyle.style
--- a/src/utils/peg-highlight/styles/winlineseparator.style
+++ b/src/utils/peg-highlight/styles/winlineseparator.style
--- a/src/utils/peg-highlight/stylesheet_syntax.md
+++ b/src/utils/peg-highlight/stylesheet_syntax.md
--- a/src/utils/vutils.cpp
+++ b/src/utils/vutils.cpp
--- a/src/utils/vutils.h
+++ b/src/utils/vutils.h
--- a/src/vconfigmanager.cpp
+++ b/src/vconfigmanager.cpp
--- a/src/vconfigmanager.h
+++ b/src/vconfigmanager.h
--- a/src/vconstants.h
+++ b/src/vconstants.h
--- a/src/vdirectorytree.cpp
+++ b/src/vdirectorytree.cpp
--- a/src/vdirectorytree.h
+++ b/src/vdirectorytree.h
--- a/src/vdocument.cpp
+++ b/src/vdocument.cpp
--- a/src/vdocument.h
+++ b/src/vdocument.h
--- a/src/vedit.cpp
+++ b/src/vedit.cpp
--- a/src/vedit.h
+++ b/src/vedit.h
--- a/src/veditor.cpp
+++ b/src/veditor.cpp
--- a/src/veditor.h
+++ b/src/veditor.h
--- a/src/vfilelist.cpp
+++ b/src/vfilelist.cpp
--- a/src/vfilelist.h
+++ b/src/vfilelist.h
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
--- a/src/vmainwindow.h
+++ b/src/vmainwindow.h
--- a/src/vnote.cpp
+++ b/src/vnote.cpp
--- a/src/vnote.h
+++ b/src/vnote.h
--- a/src/vnote.qrc
+++ b/src/vnote.qrc
--- a/src/vnotebook.cpp
+++ b/src/vnotebook.cpp
--- a/src/vnotebook.h
+++ b/src/vnotebook.h
--- a/src/vnotefile.cpp
+++ b/src/vnotefile.cpp
--- a/src/vnotefile.h
+++ b/src/vnotefile.h
--- a/src/vpreviewpage.cpp
+++ b/src/vpreviewpage.cpp
--- a/src/vpreviewpage.h
+++ b/src/vpreviewpage.h
--- a/src/vstyleparser.cpp
+++ b/src/vstyleparser.cpp
--- a/src/vstyleparser.h
+++ b/src/vstyleparser.h
--- a/src/vtabwidget.cpp
+++ b/src/vtabwidget.cpp
--- a/src/vtabwidget.h
+++ b/src/vtabwidget.h