self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Moved main page to separate qml file

Browse Source
This commit is contained in:
Laurent Cozic
2017-01-10 20:32:10 +01:00
parent 2322d931a6
commit 7e0ee0ba9c
6 changed files with 121 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
QtClient/JoplinQtClient/application.cpp
View File

@ -17,7 +17,6 @@ Application::Application(int &argc, char **argv) :
QGuiApplication(argc, argv),
db_(jop::db()),
api_(jop::API_BASE_URL),
//api_("https://joplin.cozic.net"),
synchronizer_(api_.baseUrl(), db_),
folderModel_(db_)
@ -45,7 +44,7 @@ Application::Application(int &argc, char **argv) :
ctxt->setContextProperty("noteListModel", &noteModel_);
ctxt->setContextProperty("noteModel", &selectedQmlNote_);
view_.setSource(QUrl("qrc:/main.qml"));
view_.setSource(QUrl("qrc:/app.qml"));
QObject* rootObject = (QObject*)view_.rootObject();
@ -68,17 +67,17 @@ Application::Application(int &argc, char **argv) :
connect(&api_, SIGNAL(requestDone(const QJsonObject&, const QString&)), this, SLOT(api_requestDone(const QJsonObject&, const QString&)));
// Don't store password, store session ID
QString clientId = "B6E12222B6E12222";
if (!settings.contains("user.email")) {
settings.setValue("user.email", "laurent@cozic.net");
settings.setValue("user.password", "12345678");
}
// QString clientId = "B6E12222B6E12222";
// if (!settings.contains("user.email")) {
// settings.setValue("user.email", "laurent@cozic.net");
// settings.setValue("user.password", "12345678");
// }
QUrlQuery postData;
postData.addQueryItem("email", settings.value("user.email").toString());
postData.addQueryItem("password", settings.value("user.password").toString());
postData.addQueryItem("client_id", clientId);
api_.post("sessions", QUrlQuery(), postData, "getSession");
// QUrlQuery postData;
// postData.addQueryItem("email", settings.value("user.email").toString());
// postData.addQueryItem("password", settings.value("user.password").toString());
// postData.addQueryItem("client_id", clientId);
// api_.post("sessions", QUrlQuery(), postData, "getSession");
}
void Application::api_requestDone(const QJsonObject& response, const QString& tag) {