浏览代码

move source stuff into src subdir

Make it convenient to add third-party libraries.

Signed-off-by: Le Tan <[email protected]>
Le Tan 9 年之前
父节点
当前提交
5fa07864a1
共有 99 个文件被更改,包括 66 次插入55 次删除
  1. 2 2
      .gitmodules
  2. 3 53
      VNote.pro
  3. 0 0
      src/dialog/vnewdirdialog.cpp
  4. 0 0
      src/dialog/vnewdirdialog.h
  5. 0 0
      src/dialog/vnewfiledialog.cpp
  6. 0 0
      src/dialog/vnewfiledialog.h
  7. 0 0
      src/dialog/vnewnotebookdialog.cpp
  8. 0 0
      src/dialog/vnewnotebookdialog.h
  9. 0 0
      src/hgmarkdownhighlighter.cpp
  10. 0 0
      src/hgmarkdownhighlighter.h
  11. 0 0
      src/main.cpp
  12. 0 0
      src/resources/icons/create_notebook.png
  13. 0 0
      src/resources/icons/delete_notebook.png
  14. 0 0
      src/resources/icons/notebook_info.png
  15. 0 0
      src/resources/markdown.css
  16. 0 0
      src/resources/post_template.html
  17. 0 0
      src/resources/pre_template.html
  18. 0 0
      src/resources/qwebchannel.js
  19. 0 0
      src/resources/styles/default.mdhl
  20. 0 0
      src/resources/styles/solarized-dark.mdhl
  21. 0 0
      src/resources/styles/solarized-light.mdhl
  22. 0 0
      src/resources/template.html
  23. 0 0
      src/resources/vnote.ini
  24. 0 0
      src/resources/welcome.html
  25. 61 0
      src/src.pro
  26. 0 0
      src/utils/highlightjs/CHANGES.md
  27. 0 0
      src/utils/highlightjs/LICENSE
  28. 0 0
      src/utils/highlightjs/README.md
  29. 0 0
      src/utils/highlightjs/README.ru.md
  30. 0 0
      src/utils/highlightjs/highlight.pack.js
  31. 0 0
      src/utils/highlightjs/styles/androidstudio.css
  32. 0 0
      src/utils/highlightjs/styles/atom-one-dark.css
  33. 0 0
      src/utils/highlightjs/styles/atom-one-light.css
  34. 0 0
      src/utils/highlightjs/styles/darcula.css
  35. 0 0
      src/utils/highlightjs/styles/dark.css
  36. 0 0
      src/utils/highlightjs/styles/darkula.css
  37. 0 0
      src/utils/highlightjs/styles/default.css
  38. 0 0
      src/utils/highlightjs/styles/github-gist.css
  39. 0 0
      src/utils/highlightjs/styles/github.css
  40. 0 0
      src/utils/highlightjs/styles/googlecode.css
  41. 0 0
      src/utils/highlightjs/styles/gruvbox-dark.css
  42. 0 0
      src/utils/highlightjs/styles/gruvbox-light.css
  43. 0 0
      src/utils/highlightjs/styles/monokai-sublime.css
  44. 0 0
      src/utils/highlightjs/styles/monokai.css
  45. 0 0
      src/utils/highlightjs/styles/qtcreator_dark.css
  46. 0 0
      src/utils/highlightjs/styles/qtcreator_light.css
  47. 0 0
      src/utils/highlightjs/styles/rainbow.css
  48. 0 0
      src/utils/highlightjs/styles/solarized-dark.css
  49. 0 0
      src/utils/highlightjs/styles/solarized-light.css
  50. 0 0
      src/utils/highlightjs/styles/tomorrow-night-blue.css
  51. 0 0
      src/utils/highlightjs/styles/tomorrow-night-bright.css
  52. 0 0
      src/utils/highlightjs/styles/tomorrow-night-eighties.css
  53. 0 0
      src/utils/highlightjs/styles/tomorrow-night.css
  54. 0 0
      src/utils/highlightjs/styles/tomorrow.css
  55. 0 0
      src/utils/marked
  56. 0 0
      src/utils/peg-highlight/pmh_definitions.h
  57. 0 0
      src/utils/peg-highlight/pmh_parser.c
  58. 0 0
      src/utils/peg-highlight/pmh_parser.h
  59. 0 0
      src/utils/peg-highlight/pmh_styleparser.c
  60. 0 0
      src/utils/peg-highlight/pmh_styleparser.h
  61. 0 0
      src/utils/peg-highlight/styles/error.style
  62. 0 0
      src/utils/peg-highlight/styles/fontsizes.style
  63. 0 0
      src/utils/peg-highlight/styles/macoslineseparator.style
  64. 0 0
      src/utils/peg-highlight/styles/playground.style
  65. 0 0
      src/utils/peg-highlight/styles/solarized-dark.style
  66. 0 0
      src/utils/peg-highlight/styles/solarized-light.style
  67. 0 0
      src/utils/peg-highlight/styles/teststyle.style
  68. 0 0
      src/utils/peg-highlight/styles/winlineseparator.style
  69. 0 0
      src/utils/peg-highlight/stylesheet_syntax.md
  70. 0 0
      src/utils/vutils.cpp
  71. 0 0
      src/utils/vutils.h
  72. 0 0
      src/vconfigmanager.cpp
  73. 0 0
      src/vconfigmanager.h
  74. 0 0
      src/vconstants.h
  75. 0 0
      src/vdirectorytree.cpp
  76. 0 0
      src/vdirectorytree.h
  77. 0 0
      src/vdocument.cpp
  78. 0 0
      src/vdocument.h
  79. 0 0
      src/vedit.cpp
  80. 0 0
      src/vedit.h
  81. 0 0
      src/veditor.cpp
  82. 0 0
      src/veditor.h
  83. 0 0
      src/vfilelist.cpp
  84. 0 0
      src/vfilelist.h
  85. 0 0
      src/vmainwindow.cpp
  86. 0 0
      src/vmainwindow.h
  87. 0 0
      src/vnote.cpp
  88. 0 0
      src/vnote.h
  89. 0 0
      src/vnote.qrc
  90. 0 0
      src/vnotebook.cpp
  91. 0 0
      src/vnotebook.h
  92. 0 0
      src/vnotefile.cpp
  93. 0 0
      src/vnotefile.h
  94. 0 0
      src/vpreviewpage.cpp
  95. 0 0
      src/vpreviewpage.h
  96. 0 0
      src/vstyleparser.cpp
  97. 0 0
      src/vstyleparser.h
  98. 0 0
      src/vtabwidget.cpp
  99. 0 0
      src/vtabwidget.h

+ 2 - 2
.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

+ 3 - 53
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

+ 0 - 0
dialog/vnewdirdialog.cpp → src/dialog/vnewdirdialog.cpp


+ 0 - 0
dialog/vnewdirdialog.h → src/dialog/vnewdirdialog.h


+ 0 - 0
dialog/vnewfiledialog.cpp → src/dialog/vnewfiledialog.cpp


+ 0 - 0
dialog/vnewfiledialog.h → src/dialog/vnewfiledialog.h


+ 0 - 0
dialog/vnewnotebookdialog.cpp → src/dialog/vnewnotebookdialog.cpp


+ 0 - 0
dialog/vnewnotebookdialog.h → src/dialog/vnewnotebookdialog.h


+ 0 - 0
hgmarkdownhighlighter.cpp → src/hgmarkdownhighlighter.cpp


+ 0 - 0
hgmarkdownhighlighter.h → src/hgmarkdownhighlighter.h


+ 0 - 0
main.cpp → src/main.cpp


+ 0 - 0
resources/icons/create_notebook.png → src/resources/icons/create_notebook.png


+ 0 - 0
resources/icons/delete_notebook.png → src/resources/icons/delete_notebook.png


+ 0 - 0
resources/icons/notebook_info.png → src/resources/icons/notebook_info.png


+ 0 - 0
resources/markdown.css → src/resources/markdown.css


+ 0 - 0
resources/post_template.html → src/resources/post_template.html


+ 0 - 0
resources/pre_template.html → src/resources/pre_template.html


+ 0 - 0
resources/qwebchannel.js → src/resources/qwebchannel.js


+ 0 - 0
resources/styles/default.mdhl → src/resources/styles/default.mdhl


+ 0 - 0
resources/styles/solarized-dark.mdhl → src/resources/styles/solarized-dark.mdhl


+ 0 - 0
resources/styles/solarized-light.mdhl → src/resources/styles/solarized-light.mdhl


+ 0 - 0
resources/template.html → src/resources/template.html


+ 0 - 0
resources/vnote.ini → src/resources/vnote.ini


+ 0 - 0
resources/welcome.html → src/resources/welcome.html


+ 61 - 0
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

+ 0 - 0
utils/highlightjs/CHANGES.md → src/utils/highlightjs/CHANGES.md


+ 0 - 0
utils/highlightjs/LICENSE → src/utils/highlightjs/LICENSE


+ 0 - 0
utils/highlightjs/README.md → src/utils/highlightjs/README.md


+ 0 - 0
utils/highlightjs/README.ru.md → src/utils/highlightjs/README.ru.md


+ 0 - 0
utils/highlightjs/highlight.pack.js → src/utils/highlightjs/highlight.pack.js


+ 0 - 0
utils/highlightjs/styles/androidstudio.css → src/utils/highlightjs/styles/androidstudio.css


+ 0 - 0
utils/highlightjs/styles/atom-one-dark.css → src/utils/highlightjs/styles/atom-one-dark.css


+ 0 - 0
utils/highlightjs/styles/atom-one-light.css → src/utils/highlightjs/styles/atom-one-light.css


+ 0 - 0
utils/highlightjs/styles/darcula.css → src/utils/highlightjs/styles/darcula.css


+ 0 - 0
utils/highlightjs/styles/dark.css → src/utils/highlightjs/styles/dark.css


+ 0 - 0
utils/highlightjs/styles/darkula.css → src/utils/highlightjs/styles/darkula.css


+ 0 - 0
utils/highlightjs/styles/default.css → src/utils/highlightjs/styles/default.css


+ 0 - 0
utils/highlightjs/styles/github-gist.css → src/utils/highlightjs/styles/github-gist.css


+ 0 - 0
utils/highlightjs/styles/github.css → src/utils/highlightjs/styles/github.css


+ 0 - 0
utils/highlightjs/styles/googlecode.css → src/utils/highlightjs/styles/googlecode.css


+ 0 - 0
utils/highlightjs/styles/gruvbox-dark.css → src/utils/highlightjs/styles/gruvbox-dark.css


+ 0 - 0
utils/highlightjs/styles/gruvbox-light.css → src/utils/highlightjs/styles/gruvbox-light.css


+ 0 - 0
utils/highlightjs/styles/monokai-sublime.css → src/utils/highlightjs/styles/monokai-sublime.css


+ 0 - 0
utils/highlightjs/styles/monokai.css → src/utils/highlightjs/styles/monokai.css


+ 0 - 0
utils/highlightjs/styles/qtcreator_dark.css → src/utils/highlightjs/styles/qtcreator_dark.css


+ 0 - 0
utils/highlightjs/styles/qtcreator_light.css → src/utils/highlightjs/styles/qtcreator_light.css


+ 0 - 0
utils/highlightjs/styles/rainbow.css → src/utils/highlightjs/styles/rainbow.css


+ 0 - 0
utils/highlightjs/styles/solarized-dark.css → src/utils/highlightjs/styles/solarized-dark.css


+ 0 - 0
utils/highlightjs/styles/solarized-light.css → src/utils/highlightjs/styles/solarized-light.css


+ 0 - 0
utils/highlightjs/styles/tomorrow-night-blue.css → src/utils/highlightjs/styles/tomorrow-night-blue.css


+ 0 - 0
utils/highlightjs/styles/tomorrow-night-bright.css → src/utils/highlightjs/styles/tomorrow-night-bright.css


+ 0 - 0
utils/highlightjs/styles/tomorrow-night-eighties.css → src/utils/highlightjs/styles/tomorrow-night-eighties.css


+ 0 - 0
utils/highlightjs/styles/tomorrow-night.css → src/utils/highlightjs/styles/tomorrow-night.css


+ 0 - 0
utils/highlightjs/styles/tomorrow.css → src/utils/highlightjs/styles/tomorrow.css


+ 0 - 0
utils/marked → src/utils/marked


+ 0 - 0
utils/peg-highlight/pmh_definitions.h → src/utils/peg-highlight/pmh_definitions.h


+ 0 - 0
utils/peg-highlight/pmh_parser.c → src/utils/peg-highlight/pmh_parser.c


+ 0 - 0
utils/peg-highlight/pmh_parser.h → src/utils/peg-highlight/pmh_parser.h


+ 0 - 0
utils/peg-highlight/pmh_styleparser.c → src/utils/peg-highlight/pmh_styleparser.c


+ 0 - 0
utils/peg-highlight/pmh_styleparser.h → src/utils/peg-highlight/pmh_styleparser.h


+ 0 - 0
utils/peg-highlight/styles/error.style → src/utils/peg-highlight/styles/error.style


+ 0 - 0
utils/peg-highlight/styles/fontsizes.style → src/utils/peg-highlight/styles/fontsizes.style


+ 0 - 0
utils/peg-highlight/styles/macoslineseparator.style → src/utils/peg-highlight/styles/macoslineseparator.style


+ 0 - 0
utils/peg-highlight/styles/playground.style → src/utils/peg-highlight/styles/playground.style


+ 0 - 0
utils/peg-highlight/styles/solarized-dark.style → src/utils/peg-highlight/styles/solarized-dark.style


+ 0 - 0
utils/peg-highlight/styles/solarized-light.style → src/utils/peg-highlight/styles/solarized-light.style


+ 0 - 0
utils/peg-highlight/styles/teststyle.style → src/utils/peg-highlight/styles/teststyle.style


+ 0 - 0
utils/peg-highlight/styles/winlineseparator.style → src/utils/peg-highlight/styles/winlineseparator.style


+ 0 - 0
utils/peg-highlight/stylesheet_syntax.md → src/utils/peg-highlight/stylesheet_syntax.md


+ 0 - 0
utils/vutils.cpp → src/utils/vutils.cpp


+ 0 - 0
utils/vutils.h → src/utils/vutils.h


+ 0 - 0
vconfigmanager.cpp → src/vconfigmanager.cpp


+ 0 - 0
vconfigmanager.h → src/vconfigmanager.h


+ 0 - 0
vconstants.h → src/vconstants.h


+ 0 - 0
vdirectorytree.cpp → src/vdirectorytree.cpp


+ 0 - 0
vdirectorytree.h → src/vdirectorytree.h


+ 0 - 0
vdocument.cpp → src/vdocument.cpp


+ 0 - 0
vdocument.h → src/vdocument.h


+ 0 - 0
vedit.cpp → src/vedit.cpp


+ 0 - 0
vedit.h → src/vedit.h


+ 0 - 0
veditor.cpp → src/veditor.cpp


+ 0 - 0
veditor.h → src/veditor.h


+ 0 - 0
vfilelist.cpp → src/vfilelist.cpp


+ 0 - 0
vfilelist.h → src/vfilelist.h


+ 0 - 0
vmainwindow.cpp → src/vmainwindow.cpp


+ 0 - 0
vmainwindow.h → src/vmainwindow.h


+ 0 - 0
vnote.cpp → src/vnote.cpp


+ 0 - 0
vnote.h → src/vnote.h


+ 0 - 0
vnote.qrc → src/vnote.qrc


+ 0 - 0
vnotebook.cpp → src/vnotebook.cpp


+ 0 - 0
vnotebook.h → src/vnotebook.h


+ 0 - 0
vnotefile.cpp → src/vnotefile.cpp


+ 0 - 0
vnotefile.h → src/vnotefile.h


+ 0 - 0
vpreviewpage.cpp → src/vpreviewpage.cpp


+ 0 - 0
vpreviewpage.h → src/vpreviewpage.h


+ 0 - 0
vstyleparser.cpp → src/vstyleparser.cpp


+ 0 - 0
vstyleparser.h → src/vstyleparser.h


+ 0 - 0
vtabwidget.cpp → src/vtabwidget.cpp


+ 0 - 0
vtabwidget.h → src/vtabwidget.h