diff --git a/.gitmodules b/.gitmodules index 9a1b7e13..94cad134 100644 --- 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 diff --git a/VNote.pro b/VNote.pro index 8c1fe8af..4d67b457 100644 --- 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 diff --git a/dialog/vnewdirdialog.cpp b/src/dialog/vnewdirdialog.cpp similarity index 100% rename from dialog/vnewdirdialog.cpp rename to src/dialog/vnewdirdialog.cpp diff --git a/dialog/vnewdirdialog.h b/src/dialog/vnewdirdialog.h similarity index 100% rename from dialog/vnewdirdialog.h rename to src/dialog/vnewdirdialog.h diff --git a/dialog/vnewfiledialog.cpp b/src/dialog/vnewfiledialog.cpp similarity index 100% rename from dialog/vnewfiledialog.cpp rename to src/dialog/vnewfiledialog.cpp diff --git a/dialog/vnewfiledialog.h b/src/dialog/vnewfiledialog.h similarity index 100% rename from dialog/vnewfiledialog.h rename to src/dialog/vnewfiledialog.h diff --git a/dialog/vnewnotebookdialog.cpp b/src/dialog/vnewnotebookdialog.cpp similarity index 100% rename from dialog/vnewnotebookdialog.cpp rename to src/dialog/vnewnotebookdialog.cpp diff --git a/dialog/vnewnotebookdialog.h b/src/dialog/vnewnotebookdialog.h similarity index 100% rename from dialog/vnewnotebookdialog.h rename to src/dialog/vnewnotebookdialog.h diff --git a/hgmarkdownhighlighter.cpp b/src/hgmarkdownhighlighter.cpp similarity index 100% rename from hgmarkdownhighlighter.cpp rename to src/hgmarkdownhighlighter.cpp diff --git a/hgmarkdownhighlighter.h b/src/hgmarkdownhighlighter.h similarity index 100% rename from hgmarkdownhighlighter.h rename to src/hgmarkdownhighlighter.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/resources/icons/create_notebook.png b/src/resources/icons/create_notebook.png similarity index 100% rename from resources/icons/create_notebook.png rename to src/resources/icons/create_notebook.png diff --git a/resources/icons/delete_notebook.png b/src/resources/icons/delete_notebook.png similarity index 100% rename from resources/icons/delete_notebook.png rename to src/resources/icons/delete_notebook.png diff --git a/resources/icons/notebook_info.png b/src/resources/icons/notebook_info.png similarity index 100% rename from resources/icons/notebook_info.png rename to src/resources/icons/notebook_info.png diff --git a/resources/markdown.css b/src/resources/markdown.css similarity index 100% rename from resources/markdown.css rename to src/resources/markdown.css diff --git a/resources/post_template.html b/src/resources/post_template.html similarity index 100% rename from resources/post_template.html rename to src/resources/post_template.html diff --git a/resources/pre_template.html b/src/resources/pre_template.html similarity index 100% rename from resources/pre_template.html rename to src/resources/pre_template.html diff --git a/resources/qwebchannel.js b/src/resources/qwebchannel.js similarity index 100% rename from resources/qwebchannel.js rename to src/resources/qwebchannel.js diff --git a/resources/styles/default.mdhl b/src/resources/styles/default.mdhl similarity index 100% rename from resources/styles/default.mdhl rename to src/resources/styles/default.mdhl diff --git a/resources/styles/solarized-dark.mdhl b/src/resources/styles/solarized-dark.mdhl similarity index 100% rename from resources/styles/solarized-dark.mdhl rename to src/resources/styles/solarized-dark.mdhl diff --git a/resources/styles/solarized-light.mdhl b/src/resources/styles/solarized-light.mdhl similarity index 100% rename from resources/styles/solarized-light.mdhl rename to src/resources/styles/solarized-light.mdhl diff --git a/resources/template.html b/src/resources/template.html similarity index 100% rename from resources/template.html rename to src/resources/template.html diff --git a/resources/vnote.ini b/src/resources/vnote.ini similarity index 100% rename from resources/vnote.ini rename to src/resources/vnote.ini diff --git a/resources/welcome.html b/src/resources/welcome.html similarity index 100% rename from resources/welcome.html rename to src/resources/welcome.html diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 00000000..8c1fe8af --- /dev/null +++ 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 diff --git a/utils/highlightjs/CHANGES.md b/src/utils/highlightjs/CHANGES.md similarity index 100% rename from utils/highlightjs/CHANGES.md rename to src/utils/highlightjs/CHANGES.md diff --git a/utils/highlightjs/LICENSE b/src/utils/highlightjs/LICENSE similarity index 100% rename from utils/highlightjs/LICENSE rename to src/utils/highlightjs/LICENSE diff --git a/utils/highlightjs/README.md b/src/utils/highlightjs/README.md similarity index 100% rename from utils/highlightjs/README.md rename to src/utils/highlightjs/README.md diff --git a/utils/highlightjs/README.ru.md b/src/utils/highlightjs/README.ru.md similarity index 100% rename from utils/highlightjs/README.ru.md rename to src/utils/highlightjs/README.ru.md diff --git a/utils/highlightjs/highlight.pack.js b/src/utils/highlightjs/highlight.pack.js similarity index 100% rename from utils/highlightjs/highlight.pack.js rename to src/utils/highlightjs/highlight.pack.js diff --git a/utils/highlightjs/styles/androidstudio.css b/src/utils/highlightjs/styles/androidstudio.css similarity index 100% rename from utils/highlightjs/styles/androidstudio.css rename to src/utils/highlightjs/styles/androidstudio.css diff --git a/utils/highlightjs/styles/atom-one-dark.css b/src/utils/highlightjs/styles/atom-one-dark.css similarity index 100% rename from utils/highlightjs/styles/atom-one-dark.css rename to src/utils/highlightjs/styles/atom-one-dark.css diff --git a/utils/highlightjs/styles/atom-one-light.css b/src/utils/highlightjs/styles/atom-one-light.css similarity index 100% rename from utils/highlightjs/styles/atom-one-light.css rename to src/utils/highlightjs/styles/atom-one-light.css diff --git a/utils/highlightjs/styles/darcula.css b/src/utils/highlightjs/styles/darcula.css similarity index 100% rename from utils/highlightjs/styles/darcula.css rename to src/utils/highlightjs/styles/darcula.css diff --git a/utils/highlightjs/styles/dark.css b/src/utils/highlightjs/styles/dark.css similarity index 100% rename from utils/highlightjs/styles/dark.css rename to src/utils/highlightjs/styles/dark.css diff --git a/utils/highlightjs/styles/darkula.css b/src/utils/highlightjs/styles/darkula.css similarity index 100% rename from utils/highlightjs/styles/darkula.css rename to src/utils/highlightjs/styles/darkula.css diff --git a/utils/highlightjs/styles/default.css b/src/utils/highlightjs/styles/default.css similarity index 100% rename from utils/highlightjs/styles/default.css rename to src/utils/highlightjs/styles/default.css diff --git a/utils/highlightjs/styles/github-gist.css b/src/utils/highlightjs/styles/github-gist.css similarity index 100% rename from utils/highlightjs/styles/github-gist.css rename to src/utils/highlightjs/styles/github-gist.css diff --git a/utils/highlightjs/styles/github.css b/src/utils/highlightjs/styles/github.css similarity index 100% rename from utils/highlightjs/styles/github.css rename to src/utils/highlightjs/styles/github.css diff --git a/utils/highlightjs/styles/googlecode.css b/src/utils/highlightjs/styles/googlecode.css similarity index 100% rename from utils/highlightjs/styles/googlecode.css rename to src/utils/highlightjs/styles/googlecode.css diff --git a/utils/highlightjs/styles/gruvbox-dark.css b/src/utils/highlightjs/styles/gruvbox-dark.css similarity index 100% rename from utils/highlightjs/styles/gruvbox-dark.css rename to src/utils/highlightjs/styles/gruvbox-dark.css diff --git a/utils/highlightjs/styles/gruvbox-light.css b/src/utils/highlightjs/styles/gruvbox-light.css similarity index 100% rename from utils/highlightjs/styles/gruvbox-light.css rename to src/utils/highlightjs/styles/gruvbox-light.css diff --git a/utils/highlightjs/styles/monokai-sublime.css b/src/utils/highlightjs/styles/monokai-sublime.css similarity index 100% rename from utils/highlightjs/styles/monokai-sublime.css rename to src/utils/highlightjs/styles/monokai-sublime.css diff --git a/utils/highlightjs/styles/monokai.css b/src/utils/highlightjs/styles/monokai.css similarity index 100% rename from utils/highlightjs/styles/monokai.css rename to src/utils/highlightjs/styles/monokai.css diff --git a/utils/highlightjs/styles/qtcreator_dark.css b/src/utils/highlightjs/styles/qtcreator_dark.css similarity index 100% rename from utils/highlightjs/styles/qtcreator_dark.css rename to src/utils/highlightjs/styles/qtcreator_dark.css diff --git a/utils/highlightjs/styles/qtcreator_light.css b/src/utils/highlightjs/styles/qtcreator_light.css similarity index 100% rename from utils/highlightjs/styles/qtcreator_light.css rename to src/utils/highlightjs/styles/qtcreator_light.css diff --git a/utils/highlightjs/styles/rainbow.css b/src/utils/highlightjs/styles/rainbow.css similarity index 100% rename from utils/highlightjs/styles/rainbow.css rename to src/utils/highlightjs/styles/rainbow.css diff --git a/utils/highlightjs/styles/solarized-dark.css b/src/utils/highlightjs/styles/solarized-dark.css similarity index 100% rename from utils/highlightjs/styles/solarized-dark.css rename to src/utils/highlightjs/styles/solarized-dark.css diff --git a/utils/highlightjs/styles/solarized-light.css b/src/utils/highlightjs/styles/solarized-light.css similarity index 100% rename from utils/highlightjs/styles/solarized-light.css rename to src/utils/highlightjs/styles/solarized-light.css diff --git a/utils/highlightjs/styles/tomorrow-night-blue.css b/src/utils/highlightjs/styles/tomorrow-night-blue.css similarity index 100% rename from utils/highlightjs/styles/tomorrow-night-blue.css rename to src/utils/highlightjs/styles/tomorrow-night-blue.css diff --git a/utils/highlightjs/styles/tomorrow-night-bright.css b/src/utils/highlightjs/styles/tomorrow-night-bright.css similarity index 100% rename from utils/highlightjs/styles/tomorrow-night-bright.css rename to src/utils/highlightjs/styles/tomorrow-night-bright.css diff --git a/utils/highlightjs/styles/tomorrow-night-eighties.css b/src/utils/highlightjs/styles/tomorrow-night-eighties.css similarity index 100% rename from utils/highlightjs/styles/tomorrow-night-eighties.css rename to src/utils/highlightjs/styles/tomorrow-night-eighties.css diff --git a/utils/highlightjs/styles/tomorrow-night.css b/src/utils/highlightjs/styles/tomorrow-night.css similarity index 100% rename from utils/highlightjs/styles/tomorrow-night.css rename to src/utils/highlightjs/styles/tomorrow-night.css diff --git a/utils/highlightjs/styles/tomorrow.css b/src/utils/highlightjs/styles/tomorrow.css similarity index 100% rename from utils/highlightjs/styles/tomorrow.css rename to src/utils/highlightjs/styles/tomorrow.css diff --git a/utils/marked b/src/utils/marked similarity index 100% rename from utils/marked rename to src/utils/marked diff --git a/utils/peg-highlight/pmh_definitions.h b/src/utils/peg-highlight/pmh_definitions.h similarity index 100% rename from utils/peg-highlight/pmh_definitions.h rename to src/utils/peg-highlight/pmh_definitions.h diff --git a/utils/peg-highlight/pmh_parser.c b/src/utils/peg-highlight/pmh_parser.c similarity index 100% rename from utils/peg-highlight/pmh_parser.c rename to src/utils/peg-highlight/pmh_parser.c diff --git a/utils/peg-highlight/pmh_parser.h b/src/utils/peg-highlight/pmh_parser.h similarity index 100% rename from utils/peg-highlight/pmh_parser.h rename to src/utils/peg-highlight/pmh_parser.h diff --git a/utils/peg-highlight/pmh_styleparser.c b/src/utils/peg-highlight/pmh_styleparser.c similarity index 100% rename from utils/peg-highlight/pmh_styleparser.c rename to src/utils/peg-highlight/pmh_styleparser.c diff --git a/utils/peg-highlight/pmh_styleparser.h b/src/utils/peg-highlight/pmh_styleparser.h similarity index 100% rename from utils/peg-highlight/pmh_styleparser.h rename to src/utils/peg-highlight/pmh_styleparser.h diff --git a/utils/peg-highlight/styles/error.style b/src/utils/peg-highlight/styles/error.style similarity index 100% rename from utils/peg-highlight/styles/error.style rename to src/utils/peg-highlight/styles/error.style diff --git a/utils/peg-highlight/styles/fontsizes.style b/src/utils/peg-highlight/styles/fontsizes.style similarity index 100% rename from utils/peg-highlight/styles/fontsizes.style rename to src/utils/peg-highlight/styles/fontsizes.style diff --git a/utils/peg-highlight/styles/macoslineseparator.style b/src/utils/peg-highlight/styles/macoslineseparator.style similarity index 100% rename from utils/peg-highlight/styles/macoslineseparator.style rename to src/utils/peg-highlight/styles/macoslineseparator.style diff --git a/utils/peg-highlight/styles/playground.style b/src/utils/peg-highlight/styles/playground.style similarity index 100% rename from utils/peg-highlight/styles/playground.style rename to src/utils/peg-highlight/styles/playground.style diff --git a/utils/peg-highlight/styles/solarized-dark.style b/src/utils/peg-highlight/styles/solarized-dark.style similarity index 100% rename from utils/peg-highlight/styles/solarized-dark.style rename to src/utils/peg-highlight/styles/solarized-dark.style diff --git a/utils/peg-highlight/styles/solarized-light.style b/src/utils/peg-highlight/styles/solarized-light.style similarity index 100% rename from utils/peg-highlight/styles/solarized-light.style rename to src/utils/peg-highlight/styles/solarized-light.style diff --git a/utils/peg-highlight/styles/teststyle.style b/src/utils/peg-highlight/styles/teststyle.style similarity index 100% rename from utils/peg-highlight/styles/teststyle.style rename to src/utils/peg-highlight/styles/teststyle.style diff --git a/utils/peg-highlight/styles/winlineseparator.style b/src/utils/peg-highlight/styles/winlineseparator.style similarity index 100% rename from utils/peg-highlight/styles/winlineseparator.style rename to src/utils/peg-highlight/styles/winlineseparator.style diff --git a/utils/peg-highlight/stylesheet_syntax.md b/src/utils/peg-highlight/stylesheet_syntax.md similarity index 100% rename from utils/peg-highlight/stylesheet_syntax.md rename to src/utils/peg-highlight/stylesheet_syntax.md diff --git a/utils/vutils.cpp b/src/utils/vutils.cpp similarity index 100% rename from utils/vutils.cpp rename to src/utils/vutils.cpp diff --git a/utils/vutils.h b/src/utils/vutils.h similarity index 100% rename from utils/vutils.h rename to src/utils/vutils.h diff --git a/vconfigmanager.cpp b/src/vconfigmanager.cpp similarity index 100% rename from vconfigmanager.cpp rename to src/vconfigmanager.cpp diff --git a/vconfigmanager.h b/src/vconfigmanager.h similarity index 100% rename from vconfigmanager.h rename to src/vconfigmanager.h diff --git a/vconstants.h b/src/vconstants.h similarity index 100% rename from vconstants.h rename to src/vconstants.h diff --git a/vdirectorytree.cpp b/src/vdirectorytree.cpp similarity index 100% rename from vdirectorytree.cpp rename to src/vdirectorytree.cpp diff --git a/vdirectorytree.h b/src/vdirectorytree.h similarity index 100% rename from vdirectorytree.h rename to src/vdirectorytree.h diff --git a/vdocument.cpp b/src/vdocument.cpp similarity index 100% rename from vdocument.cpp rename to src/vdocument.cpp diff --git a/vdocument.h b/src/vdocument.h similarity index 100% rename from vdocument.h rename to src/vdocument.h diff --git a/vedit.cpp b/src/vedit.cpp similarity index 100% rename from vedit.cpp rename to src/vedit.cpp diff --git a/vedit.h b/src/vedit.h similarity index 100% rename from vedit.h rename to src/vedit.h diff --git a/veditor.cpp b/src/veditor.cpp similarity index 100% rename from veditor.cpp rename to src/veditor.cpp diff --git a/veditor.h b/src/veditor.h similarity index 100% rename from veditor.h rename to src/veditor.h diff --git a/vfilelist.cpp b/src/vfilelist.cpp similarity index 100% rename from vfilelist.cpp rename to src/vfilelist.cpp diff --git a/vfilelist.h b/src/vfilelist.h similarity index 100% rename from vfilelist.h rename to src/vfilelist.h diff --git a/vmainwindow.cpp b/src/vmainwindow.cpp similarity index 100% rename from vmainwindow.cpp rename to src/vmainwindow.cpp diff --git a/vmainwindow.h b/src/vmainwindow.h similarity index 100% rename from vmainwindow.h rename to src/vmainwindow.h diff --git a/vnote.cpp b/src/vnote.cpp similarity index 100% rename from vnote.cpp rename to src/vnote.cpp diff --git a/vnote.h b/src/vnote.h similarity index 100% rename from vnote.h rename to src/vnote.h diff --git a/vnote.qrc b/src/vnote.qrc similarity index 100% rename from vnote.qrc rename to src/vnote.qrc diff --git a/vnotebook.cpp b/src/vnotebook.cpp similarity index 100% rename from vnotebook.cpp rename to src/vnotebook.cpp diff --git a/vnotebook.h b/src/vnotebook.h similarity index 100% rename from vnotebook.h rename to src/vnotebook.h diff --git a/vnotefile.cpp b/src/vnotefile.cpp similarity index 100% rename from vnotefile.cpp rename to src/vnotefile.cpp diff --git a/vnotefile.h b/src/vnotefile.h similarity index 100% rename from vnotefile.h rename to src/vnotefile.h diff --git a/vpreviewpage.cpp b/src/vpreviewpage.cpp similarity index 100% rename from vpreviewpage.cpp rename to src/vpreviewpage.cpp diff --git a/vpreviewpage.h b/src/vpreviewpage.h similarity index 100% rename from vpreviewpage.h rename to src/vpreviewpage.h diff --git a/vstyleparser.cpp b/src/vstyleparser.cpp similarity index 100% rename from vstyleparser.cpp rename to src/vstyleparser.cpp diff --git a/vstyleparser.h b/src/vstyleparser.h similarity index 100% rename from vstyleparser.h rename to src/vstyleparser.h diff --git a/vtabwidget.cpp b/src/vtabwidget.cpp similarity index 100% rename from vtabwidget.cpp rename to src/vtabwidget.cpp diff --git a/vtabwidget.h b/src/vtabwidget.h similarity index 100% rename from vtabwidget.h rename to src/vtabwidget.h