You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-07-03 23:50:33 +02:00
Merge branch 'master' of github.com:laurent22/joplin
This commit is contained in:
Laurent Cozic
@ -1,7 +1,29 @@
|
|||||||
|
# To enable CLI or GUI, add either of these:
|
||||||
|
# "JOP_FRONT_END_CLI=1"
|
||||||
|
# "JOP_FRONT_END_GUI=1"
|
||||||
|
# to the qmake command. So that it looks like this:
|
||||||
|
# qmake JoplinQtClient.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug "JOP_FRONT_END_CLI=1" && /usr/bin/make qmake_all
|
||||||
|
|
||||||
QT += qml quick sql quickcontrols2 network
|
QT += qml quick sql quickcontrols2 network
|
||||||
|
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
|
||||||
|
defined(JOP_FRONT_END_CLI, var) {
|
||||||
|
message(Building CLI client)
|
||||||
|
DEFINES += "JOP_FRONT_END_CLI=$$JOP_FRONT_END_CLI"
|
||||||
|
}
|
||||||
|
|
||||||
|
defined(JOP_FRONT_END_GUI, var) {
|
||||||
|
message(Building GUI client)
|
||||||
|
DEFINES += "JOP_FRONT_END_GUI=$$JOP_FRONT_END_GUI"
|
||||||
|
}
|
||||||
|
|
||||||
|
defined(JOP_FRONT_END_CLI, var) {
|
||||||
|
QT -= gui
|
||||||
|
CONFIG += console
|
||||||
|
CONFIG -= app_bundle
|
||||||
|
}
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
main.cpp \
|
main.cpp \
|
||||||
models/item.cpp \
|
models/item.cpp \
|
||||||
@ -10,7 +32,6 @@ SOURCES += \
|
|||||||
models/foldermodel.cpp \
|
models/foldermodel.cpp \
|
||||||
models/notemodel.cpp \
|
models/notemodel.cpp \
|
||||||
models/note.cpp \
|
models/note.cpp \
|
||||||
application.cpp \
|
|
||||||
models/qmlnote.cpp \
|
models/qmlnote.cpp \
|
||||||
webapi.cpp \
|
webapi.cpp \
|
||||||
synchronizer.cpp \
|
synchronizer.cpp \
|
||||||
@ -23,7 +44,9 @@ SOURCES += \
|
|||||||
paths.cpp \
|
paths.cpp \
|
||||||
window.cpp \
|
window.cpp \
|
||||||
filters.cpp \
|
filters.cpp \
|
||||||
models/abstractlistmodel.cpp
|
models/abstractlistmodel.cpp \
|
||||||
|
cliapplication.cpp \
|
||||||
|
command.cpp
|
||||||
|
|
||||||
RESOURCES += qml.qrc \
|
RESOURCES += qml.qrc \
|
||||||
database.qrc
|
database.qrc
|
||||||
@ -44,7 +67,6 @@ HEADERS += \
|
|||||||
models/foldermodel.h \
|
models/foldermodel.h \
|
||||||
models/notemodel.h \
|
models/notemodel.h \
|
||||||
models/note.h \
|
models/note.h \
|
||||||
application.h \
|
|
||||||
sparsevector.hpp \
|
sparsevector.hpp \
|
||||||
models/qmlnote.h \
|
models/qmlnote.h \
|
||||||
webapi.h \
|
webapi.h \
|
||||||
@ -61,7 +83,14 @@ HEADERS += \
|
|||||||
constants.h \
|
constants.h \
|
||||||
window.h \
|
window.h \
|
||||||
filters.h \
|
filters.h \
|
||||||
models/abstractlistmodel.h
|
models/abstractlistmodel.h \
|
||||||
|
cliapplication.h \
|
||||||
|
command.h
|
||||||
|
|
||||||
|
defined(JOP_FRONT_END_GUI, var) {
|
||||||
|
SOURCES += application.cpp
|
||||||
|
HEADERS += application.h
|
||||||
|
}
|
||||||
|
|
||||||
DISTFILES += \
|
DISTFILES += \
|
||||||
AndroidManifest.xml
|
AndroidManifest.xml
|
||||||
|
|||||||
336
QtClient/JoplinQtClient/JoplinQtClient.pro.user.13661a9
Normal file
336
QtClient/JoplinQtClient/JoplinQtClient.pro.user.13661a9
Normal file
@ -0,0 +1,336 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE QtCreatorProject>
|
||||||
|
<!-- Written by QtCreator 4.2.0, 2017-01-27T17:22:29. -->
|
||||||
|
<qtcreator>
|
||||||
|
<data>
|
||||||
|
<variable>EnvironmentId</variable>
|
||||||
|
<value type="QByteArray">{13661a96-7123-4040-a8b0-364538c1219d}</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
||||||
|
<value type="int">0</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>ProjectExplorer.Project.EditorSettings</variable>
|
||||||
|
<valuemap type="QVariantMap">
|
||||||
|
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
|
||||||
|
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
|
||||||
|
<value type="QString" key="language">Cpp</value>
|
||||||
|
<valuemap type="QVariantMap" key="value">
|
||||||
|
<value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
|
||||||
|
</valuemap>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
|
||||||
|
<value type="QString" key="language">QmlJS</value>
|
||||||
|
<valuemap type="QVariantMap" key="value">
|
||||||
|
<value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
|
||||||
|
</valuemap>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
|
||||||
|
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
|
||||||
|
<value type="int" key="EditorConfiguration.IndentSize">4</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
|
||||||
|
<value type="int" key="EditorConfiguration.MarginColumn">80</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.MouseHiding">true</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
|
||||||
|
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
|
||||||
|
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
|
||||||
|
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
|
||||||
|
<value type="int" key="EditorConfiguration.TabSize">8</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
|
||||||
|
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
|
||||||
|
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
|
||||||
|
</valuemap>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>ProjectExplorer.Project.PluginSettings</variable>
|
||||||
|
<valuemap type="QVariantMap"/>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>ProjectExplorer.Project.Target.0</variable>
|
||||||
|
<valuemap type="QVariantMap">
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.1 GCC 64bit</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.1 GCC 64bit</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.gcc_64_kit</value>
|
||||||
|
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
|
||||||
|
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
||||||
|
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
||||||
|
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/laurent/src/notes/QtClient/build-JoplinQtClient-Desktop_Qt_5_7_1_GCC_64bit-Debug</value>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
|
||||||
|
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">"JOP_FRONT_END_CLI=1"</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||||
|
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
<value type="QString">-r</value>
|
||||||
|
</valuelist>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||||
|
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
<value type="QString">-r</value>
|
||||||
|
</valuelist>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||||
|
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||||
|
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
||||||
|
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/laurent/src/notes/QtClient/build-JoplinQtClient-Desktop_Qt_5_7_1_GCC_64bit-Release</value>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
|
||||||
|
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||||
|
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
<value type="QString">-r</value>
|
||||||
|
</valuelist>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||||
|
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
<value type="QString">-r</value>
|
||||||
|
</valuelist>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||||
|
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||||
|
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
||||||
|
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/laurent/src/notes/QtClient/build-JoplinQtClient-Desktop_Qt_5_7_1_GCC_64bit-Profile</value>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
|
||||||
|
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
|
||||||
|
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||||
|
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
<value type="QString">-r</value>
|
||||||
|
</valuelist>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
||||||
|
</valuemap>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||||
|
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||||
|
<value type="QString">-w</value>
|
||||||
|
<value type="QString">-r</value>
|
||||||
|
</valuelist>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
||||||
|
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
||||||
|
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
||||||
|
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||||
|
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
|
||||||
|
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
|
||||||
|
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
|
||||||
|
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
|
||||||
|
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
|
||||||
|
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
|
||||||
|
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
|
||||||
|
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
|
||||||
|
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
|
||||||
|
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
|
||||||
|
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
|
||||||
|
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
|
||||||
|
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
|
||||||
|
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
|
||||||
|
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
|
||||||
|
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
|
||||||
|
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
|
||||||
|
<value type="int">0</value>
|
||||||
|
<value type="int">1</value>
|
||||||
|
<value type="int">2</value>
|
||||||
|
<value type="int">3</value>
|
||||||
|
<value type="int">4</value>
|
||||||
|
<value type="int">5</value>
|
||||||
|
<value type="int">6</value>
|
||||||
|
<value type="int">7</value>
|
||||||
|
<value type="int">8</value>
|
||||||
|
<value type="int">9</value>
|
||||||
|
<value type="int">10</value>
|
||||||
|
<value type="int">11</value>
|
||||||
|
<value type="int">12</value>
|
||||||
|
<value type="int">13</value>
|
||||||
|
<value type="int">14</value>
|
||||||
|
</valuelist>
|
||||||
|
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
|
||||||
|
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">JoplinQtClient</value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||||
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/laurent/src/notes/QtClient/JoplinQtClient/JoplinQtClient.pro</value>
|
||||||
|
<value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">JoplinQtClient.pro</value>
|
||||||
|
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
|
||||||
|
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
|
||||||
|
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
||||||
|
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
||||||
|
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||||
|
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
|
||||||
|
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||||
|
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||||
|
</valuemap>
|
||||||
|
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
||||||
|
</valuemap>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>ProjectExplorer.Project.TargetCount</variable>
|
||||||
|
<value type="int">1</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
|
||||||
|
<value type="int">18</value>
|
||||||
|
</data>
|
||||||
|
<data>
|
||||||
|
<variable>Version</variable>
|
||||||
|
<value type="int">18</value>
|
||||||
|
</data>
|
||||||
|
</qtcreator>
|
||||||
8
QtClient/JoplinQtClient/build.sh
Executable file
8
QtClient/JoplinQtClient/build.sh
Executable file
@ -0,0 +1,8 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
BUILD_DIR=/home/laurent/src/notes/QtClient/build-JoplinQtClient-Desktop_Qt_5_7_1_GCC_64bit-Debug
|
||||||
|
mkdir -p "$BUILD_DIR"
|
||||||
|
cd "$BUILD_DIR"
|
||||||
|
/opt/Qt/5.7/gcc_64/bin/qmake /home/laurent/src/notes/QtClient/JoplinQtClient/JoplinQtClient.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug JOP_FRONT_END_CLI=1
|
||||||
|
/usr/bin/make qmake_all
|
||||||
|
/usr/bin/make
|
||||||
151
QtClient/JoplinQtClient/cliapplication.cpp
Normal file
151
QtClient/JoplinQtClient/cliapplication.cpp
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
#include <stab.h>
|
||||||
|
|
||||||
|
#include "cliapplication.h"
|
||||||
|
#include "constants.h"
|
||||||
|
#include "database.h"
|
||||||
|
#include "paths.h"
|
||||||
|
#include "uuid.h"
|
||||||
|
#include "settings.h"
|
||||||
|
#include "models/folder.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
namespace jop {
|
||||||
|
|
||||||
|
StdoutHandler::StdoutHandler() : QTextStream(stdout) {}
|
||||||
|
|
||||||
|
CliApplication::CliApplication(int &argc, char **argv) : QCoreApplication(argc, argv) {
|
||||||
|
// This is linked to where the QSettings will be saved. In other words,
|
||||||
|
// if these values are changed, the settings will be reset and saved
|
||||||
|
// somewhere else.
|
||||||
|
QCoreApplication::setOrganizationName(jop::ORG_NAME);
|
||||||
|
QCoreApplication::setOrganizationDomain(jop::ORG_DOMAIN);
|
||||||
|
QCoreApplication::setApplicationName(jop::APP_NAME);
|
||||||
|
|
||||||
|
qInfo() << "Config dir:" << paths::configDir();
|
||||||
|
qInfo() << "Database file:" << paths::databaseFile();
|
||||||
|
qInfo() << "SSL:" << QSslSocket::sslLibraryBuildVersionString() << QSslSocket::sslLibraryVersionNumber();
|
||||||
|
|
||||||
|
jop::db().initialize(paths::databaseFile());
|
||||||
|
|
||||||
|
Settings::initialize();
|
||||||
|
|
||||||
|
Settings settings;
|
||||||
|
|
||||||
|
if (!settings.contains("clientId")) {
|
||||||
|
// Client ID should be unique per instance of a program
|
||||||
|
settings.setValue("clientId", uuid::createUuid());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// void CliApplication::processCommand(const Command& command) {
|
||||||
|
// qDebug() << "Command" << command.name();
|
||||||
|
// qDebug() << "Flags" << command.flags();
|
||||||
|
// qDebug() << "Args" << command.args();
|
||||||
|
|
||||||
|
// // if (command == "mkdir") {
|
||||||
|
|
||||||
|
// // //Folder folder;
|
||||||
|
// // //folder.setValue("title", args[
|
||||||
|
|
||||||
|
// // }
|
||||||
|
// }
|
||||||
|
|
||||||
|
int CliApplication::exec() {
|
||||||
|
qDebug() << "===========================================";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// QProcess* process = new QProcess();
|
||||||
|
// qint64* processId = new qint64();
|
||||||
|
// process->startDetached("/usr/bin/vim", QStringList(), QString(), processId);
|
||||||
|
// while (kill(*processId, 0) == 0) {}
|
||||||
|
// delete processId;
|
||||||
|
|
||||||
|
|
||||||
|
QString command = "help";
|
||||||
|
QStringList args = arguments();
|
||||||
|
|
||||||
|
if (args.size() >= 2) {
|
||||||
|
command = args[1];
|
||||||
|
args.erase(args.begin() + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
QCommandLineParser parser;
|
||||||
|
parser.addHelpOption();
|
||||||
|
parser.addVersionOption();
|
||||||
|
|
||||||
|
// mkdir "new_folder"
|
||||||
|
// ls
|
||||||
|
// ls new_folder
|
||||||
|
// touch new_folder/new_note
|
||||||
|
|
||||||
|
if (command == "mkdir") {
|
||||||
|
parser.addPositionalArgument("path", "Folder path.");
|
||||||
|
} else if (command == "ls") {
|
||||||
|
parser.addPositionalArgument("path", "Folder path.");
|
||||||
|
} else if (command == "touch") {
|
||||||
|
parser.addPositionalArgument("path", "Note path.");
|
||||||
|
} else {
|
||||||
|
qDebug().noquote() << parser.helpText();
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
parser.process(args);
|
||||||
|
|
||||||
|
args = parser.positionalArguments();
|
||||||
|
|
||||||
|
if (command == "mkdir") {
|
||||||
|
QString title = args.size() ? args[0] : QString();
|
||||||
|
Folder folder;
|
||||||
|
folder.setValue("title", title);
|
||||||
|
folder.save();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command == "ls") {
|
||||||
|
QString path = args.size() ? args[0] : QString();
|
||||||
|
if (path == "") {
|
||||||
|
std::vector<std::unique_ptr<Folder>> folders = Folder::all();
|
||||||
|
for (size_t i = 0; i < folders.size(); i++) {
|
||||||
|
qDebug().noquote() << folders[i].get()->value("title").toString();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Folder folder;
|
||||||
|
bool found = folder.loadByField("", "title", path);
|
||||||
|
if (found) {
|
||||||
|
qStdout() << "Found" << path << endl;
|
||||||
|
} else {
|
||||||
|
qWarning() << "Not found:" << path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command == "touch") {
|
||||||
|
// QString path = args.size() ? args[0] : QString();
|
||||||
|
// if (path == "") {
|
||||||
|
// std::vector<std::unique_ptr<Folder>> folders = Folder::all();
|
||||||
|
// for (size_t i = 0; i < folders.size(); i++) {
|
||||||
|
// qDebug().noquote() << folders[i].get()->value("title").toString();
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// // TODO: Get folder by name
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
qDebug() << "===========================================";
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
35
QtClient/JoplinQtClient/cliapplication.h
Normal file
35
QtClient/JoplinQtClient/cliapplication.h
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
#ifndef CLIAPPLICATION_H
|
||||||
|
#define CLIAPPLICATION_H
|
||||||
|
|
||||||
|
#include <stable.h>
|
||||||
|
|
||||||
|
#include "command.h"
|
||||||
|
|
||||||
|
namespace jop {
|
||||||
|
|
||||||
|
class StdoutHandler : public QTextStream {
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
StdoutHandler();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
inline StdoutHandler& qStdout() {
|
||||||
|
static StdoutHandler r;
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
class CliApplication : public QCoreApplication {
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
CliApplication(int &argc, char **argv);
|
||||||
|
void processCommand(const Command &command);
|
||||||
|
int exec();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // CLIAPPLICATION_H
|
||||||
24
QtClient/JoplinQtClient/command.cpp
Normal file
24
QtClient/JoplinQtClient/command.cpp
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
#include "command.h"
|
||||||
|
|
||||||
|
namespace jop {
|
||||||
|
|
||||||
|
Command::Command(const QStringList &arguments) : name_("help"), args_(arguments) {
|
||||||
|
args_.removeFirst();
|
||||||
|
if (args_.size() >= 1) {
|
||||||
|
name_ = args_.takeFirst();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Command::name() const {
|
||||||
|
return name_;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::map<QString, QString> Command::flags() const {
|
||||||
|
return flags_;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList Command::args() const {
|
||||||
|
return args_;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
27
QtClient/JoplinQtClient/command.h
Normal file
27
QtClient/JoplinQtClient/command.h
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#ifndef COMMAND_H
|
||||||
|
#define COMMAND_H
|
||||||
|
|
||||||
|
#include <stable.h>
|
||||||
|
|
||||||
|
namespace jop {
|
||||||
|
|
||||||
|
class Command {
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
Command(const QStringList& arguments);
|
||||||
|
QString name() const;
|
||||||
|
std::map<QString, QString> flags() const;
|
||||||
|
QStringList args() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
QString name_;
|
||||||
|
std::map<QString, QString> flags_;
|
||||||
|
QStringList args_;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // COMMAND_H
|
||||||
@ -9,6 +9,12 @@ const QString ORG_NAME = "Cozic";
|
|||||||
const QString ORG_DOMAIN = "cozic.net";
|
const QString ORG_DOMAIN = "cozic.net";
|
||||||
const QString APP_NAME = "Joplin";
|
const QString APP_NAME = "Joplin";
|
||||||
|
|
||||||
|
#if defined(JOP_FRONT_END_CLI)
|
||||||
|
const QString FRONT_END = "cli";
|
||||||
|
#elif defined(JOP_FRONT_END_GUI)
|
||||||
|
const QString FRONT_END = "gui";
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // CONSTANTS_H
|
#endif // CONSTANTS_H
|
||||||
|
|||||||
@ -4,6 +4,12 @@ using namespace jop;
|
|||||||
|
|
||||||
Database::Database() {}
|
Database::Database() {}
|
||||||
|
|
||||||
|
Database::~Database() {
|
||||||
|
if (db_.open()) {
|
||||||
|
db_.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Database::initialize(const QString &path) {
|
void Database::initialize(const QString &path) {
|
||||||
version_ = -1;
|
version_ = -1;
|
||||||
transactionCount_ = 0;
|
transactionCount_ = 0;
|
||||||
|
|||||||
@ -14,6 +14,7 @@ public:
|
|||||||
enum QueryType { Select, Insert, Update, Delete };
|
enum QueryType { Select, Insert, Update, Delete };
|
||||||
|
|
||||||
Database();
|
Database();
|
||||||
|
~Database();
|
||||||
void initialize(const QString& path);
|
void initialize(const QString& path);
|
||||||
QSqlDatabase& database();
|
QSqlDatabase& database();
|
||||||
QSqlQuery buildSqlQuery(Database::QueryType type, const QString& tableName, const QStringList& fields, const VariantVector& values, const QString& whereCondition = "");
|
QSqlQuery buildSqlQuery(Database::QueryType type, const QString& tableName, const QStringList& fields, const VariantVector& values, const QString& whereCondition = "");
|
||||||
|
|||||||
@ -1,15 +1,38 @@
|
|||||||
#include <stable.h>
|
#include <stable.h>
|
||||||
|
|
||||||
|
#if defined(JOP_FRONT_END_CLI)
|
||||||
|
#include "cliapplication.h"
|
||||||
|
#elif defined(JOP_FRONT_END_GUI)
|
||||||
#include "application.h"
|
#include "application.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "models/folder.h"
|
#include "models/folder.h"
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
#include "models/foldermodel.h"
|
#include "models/foldermodel.h"
|
||||||
#include "services/folderservice.h"
|
#include "services/folderservice.h"
|
||||||
|
|
||||||
using namespace jop;
|
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
|
#if (!defined(JOP_FRONT_END_GUI) && !defined(JOP_FRONT_END_CLI))
|
||||||
|
qFatal("Either JOP_FRONT_END_GUI or JOP_FRONT_END_CLI must be defined!");
|
||||||
|
return 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if (defined(JOP_FRONT_END_GUI) && defined(JOP_FRONT_END_CLI))
|
||||||
|
qFatal("JOP_FRONT_END_GUI and JOP_FRONT_END_CLI cannot both be defined!");
|
||||||
|
return 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef JOP_FRONT_END_GUI
|
||||||
|
qDebug() << "Front end: GUI";
|
||||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
Application app(argc, argv);
|
jop::Application app(argc, argv);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef JOP_FRONT_END_CLI
|
||||||
|
qDebug() << "Front end: CLI";
|
||||||
|
jop::CliApplication app(argc, argv);
|
||||||
|
#endif
|
||||||
|
|
||||||
return app.exec();
|
return app.exec();
|
||||||
}
|
}
|
||||||
@ -47,6 +47,24 @@ bool BaseModel::load(const QString &id) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool BaseModel::loadByField(const QString& parentId, const QString& field, const QString& fieldValue) {
|
||||||
|
QSqlQuery q(jop::db().database());
|
||||||
|
QString sql = QString("SELECT %1 FROM %2 WHERE %3 = :field_value AND parent_id = :parent_id LIMIT 1")
|
||||||
|
.arg(BaseModel::tableFieldNames(table()).join(","))
|
||||||
|
.arg(BaseModel::tableName(table()))
|
||||||
|
.arg(field);
|
||||||
|
q.prepare(sql);
|
||||||
|
q.bindValue(":parent_id", parentId);
|
||||||
|
q.bindValue(":field_value", fieldValue);
|
||||||
|
jop::db().execQuery(q);
|
||||||
|
q.next();
|
||||||
|
if (!jop::db().errorCheck(q)) return false;
|
||||||
|
if (!q.isValid()) return false;
|
||||||
|
|
||||||
|
loadSqlQuery(q);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool BaseModel::save(bool trackChanges) {
|
bool BaseModel::save(bool trackChanges) {
|
||||||
bool isNew = this->isNew();
|
bool isNew = this->isNew();
|
||||||
|
|
||||||
|
|||||||
@ -43,6 +43,7 @@ public:
|
|||||||
QStringList changedFields() const;
|
QStringList changedFields() const;
|
||||||
static int count(jop::Table table);
|
static int count(jop::Table table);
|
||||||
bool load(const QString& id);
|
bool load(const QString& id);
|
||||||
|
bool loadByField(const QString& parentId, const QString& field, const QString& fieldValue);
|
||||||
virtual bool save(bool trackChanges = true);
|
virtual bool save(bool trackChanges = true);
|
||||||
virtual bool dispose();
|
virtual bool dispose();
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,7 @@ public:
|
|||||||
Folder();
|
Folder();
|
||||||
|
|
||||||
static int count();
|
static int count();
|
||||||
static std::vector<std::unique_ptr<Folder>> all(const QString& orderBy);
|
static std::vector<std::unique_ptr<Folder>> all(const QString& orderBy = "title");
|
||||||
|
|
||||||
//Table table() const;
|
//Table table() const;
|
||||||
bool primaryKeyIsUuid() const;
|
bool primaryKeyIsUuid() const;
|
||||||
|
|||||||
@ -1,29 +1,30 @@
|
|||||||
CREATE TABLE folders (
|
CREATE TABLE folders (
|
||||||
id TEXT PRIMARY KEY,
|
id TEXT PRIMARY KEY,
|
||||||
title TEXT,
|
parent_id TEXT NOT NULL DEFAULT "",
|
||||||
created_time INT,
|
title TEXT NOT NULL DEFAULT "",
|
||||||
updated_time INT
|
created_time INT NOT NULL DEFAULT 0,
|
||||||
|
updated_time INT NOT NULL DEFAULT 0
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE notes (
|
CREATE TABLE notes (
|
||||||
id TEXT PRIMARY KEY,
|
id TEXT PRIMARY KEY,
|
||||||
title TEXT,
|
parent_id TEXT NOT NULL DEFAULT "",
|
||||||
body TEXT,
|
title TEXT NOT NULL DEFAULT "",
|
||||||
parent_id TEXT,
|
body TEXT NOT NULL DEFAULT "",
|
||||||
created_time INT,
|
created_time INT NOT NULL DEFAULT 0,
|
||||||
updated_time INT,
|
updated_time INT NOT NULL DEFAULT 0,
|
||||||
latitude NUMERIC,
|
latitude NUMERIC NOT NULL DEFAULT 0,
|
||||||
longitude NUMERIC,
|
longitude NUMERIC NOT NULL DEFAULT 0,
|
||||||
altitude NUMERIC,
|
altitude NUMERIC NOT NULL DEFAULT 0,
|
||||||
source TEXT,
|
source TEXT NOT NULL DEFAULT "",
|
||||||
author TEXT,
|
author TEXT NOT NULL DEFAULT "",
|
||||||
source_url TEXT,
|
source_url TEXT NOT NULL DEFAULT "",
|
||||||
is_todo BOOLEAN,
|
is_todo BOOLEAN NOT NULL DEFAULT 0,
|
||||||
todo_due INT,
|
todo_due INT NOT NULL DEFAULT 0,
|
||||||
todo_completed INT,
|
todo_completed INT NOT NULL DEFAULT 0,
|
||||||
source_application TEXT,
|
source_application TEXT NOT NULL DEFAULT "",
|
||||||
application_data TEXT,
|
application_data TEXT NOT NULL DEFAULT "",
|
||||||
`order` INT
|
`order` INT NOT NULL DEFAULT 0
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE tags (
|
CREATE TABLE tags (
|
||||||
|
|||||||
@ -6,6 +6,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include <QAbstractListModel>
|
#include <QAbstractListModel>
|
||||||
|
#include <QCoreApplication>
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
@ -32,6 +33,8 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
#include <QCommandLineParser>
|
||||||
|
#include <QProcess>
|
||||||
|
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,10 @@
|
|||||||
{
|
{
|
||||||
"name": "Build evernote-import",
|
"name": "Build evernote-import",
|
||||||
"shell_cmd": "D:\\Programmes\\cygwin\\bin\\bash.exe --login D:\\Web\\www\\joplin\\QtClient\\evernote-import\\build.sh"
|
"shell_cmd": "D:\\Programmes\\cygwin\\bin\\bash.exe --login D:\\Web\\www\\joplin\\QtClient\\evernote-import\\build.sh"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Build QtClient CLI - Linux",
|
||||||
|
"shell_cmd": "/home/laurent/src/notes/QtClient/JoplinQtClient/build.sh"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user