medvedych/harbour-nextcloudnotes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed on the QML side to adopt the previous changes on the C++ side

Browse source
This commit is contained in:
Scharel Clemens 2020-05-01 12:57:43 +02:00
parent 84d720c7ca
commit 8211acbe51
10 changed files with 87 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
qml/pages/LoginPage.qml
View file

@ -39,12 +39,12 @@ Page {
} }
} }
onStatusChanged: { /*onStatusChanged: {
if (status === PageStatus.Activating) if (status === PageStatus.Activating)
notesApi.getNcStatus() notesApi.getNcStatus()
if (status === PageStatus.Deactivating) if (status === PageStatus.Deactivating)
notesApi.abortFlowV2Login() notesApi.abortFlowV2Login()
} }*/
Connections { Connections {
target: notesApi target: notesApi
@ -85,27 +85,27 @@ Page {
} }
onLoginStatusChanged: { onLoginStatusChanged: {
switch(notesApi.loginStatus) { switch(notesApi.loginStatus) {
case NotesApi.LoginLegacyReady: case notesApi.LoginLegacyReady:
apiProgressBar.label = qsTr("Enter your credentials") apiProgressBar.label = qsTr("Enter your credentials")
break; break;
//case NotesApi.LoginFlowV2Initiating: //case notesApi.LoginFlowV2Initiating:
// break; // break;
case NotesApi.LoginFlowV2Polling: case notesApi.LoginFlowV2Polling:
apiProgressBar.label = qsTr("Follow the instructions in the browser") apiProgressBar.label = qsTr("Follow the instructions in the browser")
break; break;
case NotesApi.LoginFlowV2Success: case notesApi.LoginFlowV2Success:
notesApi.verifyLogin() notesApi.verifyLogin()
break; break;
case NotesApi.LoginFlowV2Failed: case notesApi.LoginFlowV2Failed:
apiProgressBar.label = qsTr("Login failed!") apiProgressBar.label = qsTr("Login failed!")
break break
case NotesApi.LoginSuccess: case notesApi.LoginSuccess:
apiProgressBar.label = qsTr("Login successfull!") apiProgressBar.label = qsTr("Login successfull!")
account.username = notesApi.username account.username = notesApi.username
account.password = notesApi.password account.password = notesApi.password
appSettings.currentAccount = accountId appSettings.currentAccount = accountId
break; break;
case NotesApi.LoginFailed: case notesApi.LoginFailed:
apiProgressBar.label = qsTr("Login failed!") apiProgressBar.label = qsTr("Login failed!")
break; break;
default: default:
@ -155,8 +155,8 @@ Page {
id: apiProgressBar id: apiProgressBar
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: parent.width width: parent.width
indeterminate: notesApi.loginStatus === NotesApi.LoginFlowV2Initiating || indeterminate: notesApi.loginStatus === notesApi.LoginFlowV2Initiating ||
notesApi.loginStatus === NotesApi.LoginFlowV2Polling notesApi.loginStatus === notesApi.LoginFlowV2Polling
} }
Row { Row {
@ -171,15 +171,17 @@ Page {
onClicked: if (text === "") text = "https://" onClicked: if (text === "") text = "https://"
onTextChanged: { onTextChanged: {
statusBusyIndicatorTimer.restart() statusBusyIndicatorTimer.restart()
if (acceptableInput) if (acceptableInput) {
notesApi.server = text notesApi.server = text
notesApi.getNcStatus()
}
} }
//EnterKey.enabled: text.length > 0 //EnterKey.enabled: text.length > 0
EnterKey.iconSource: legacyLoginPossible ? "image://theme/icon-m-enter-next" : flowLoginV2Possible ? "image://theme/icon-m-enter-accept" : "image://theme/icon-m-enter-close" EnterKey.iconSource: legacyLoginPossible ? "image://theme/icon-m-enter-next" : flowLoginV2Possible ? "image://theme/icon-m-enter-accept" : "image://theme/icon-m-enter-close"
EnterKey.onClicked: { EnterKey.onClicked: {
if (legacyLoginPossible) if (legacyLoginPossible)
usernameField.focus = true usernameField.focus = true
else if (flowLoginV2Possible && notesApi.loginStatus !== NotesApi.LoginFlowV2Polling) else if (flowLoginV2Possible && notesApi.loginStatus !== notesApi.LoginFlowV2Polling)
notesApi.initiateFlowV2Login() notesApi.initiateFlowV2Login()
focus = false focus = false
} }
@ -191,7 +193,7 @@ Page {
BusyIndicator { BusyIndicator {
anchors.centerIn: parent anchors.centerIn: parent
size: BusyIndicatorSize.Medium size: BusyIndicatorSize.Medium
running: notesApi.ncStatusStatus === NotesApi.NextcloudBusy || (serverField.focus && statusBusyIndicatorTimer.running && !notesApi.statusInstalled) running: notesApi.ncStatusStatus === notesApi.NextcloudBusy || (serverField.focus && statusBusyIndicatorTimer.running && !notesApi.statusInstalled)
Timer { Timer {
id: statusBusyIndicatorTimer id: statusBusyIndicatorTimer
interval: 200 interval: 200
@ -200,17 +202,28 @@ Page {
} }
} }
TextSwitch {
id: forceLegacyButton
text: qsTr("Enforce legacy login")
onCheckedChanged: {
checked != checked
if (!checked) {
notesApi.getNcStatus()
}
}
}
Column { Column {
id: flowv2LoginColumn id: flowv2LoginColumn
width: parent.width width: parent.width
spacing: Theme.paddingLarge spacing: Theme.paddingLarge
visible: opacity !== 0.0 visible: opacity !== 0.0
opacity: flowLoginV2Possible ? 1.0 : 0.0 opacity: flowLoginV2Possible && !forceLegacyButton.checked ? 1.0 : 0.0
Behavior on opacity { FadeAnimator {} } Behavior on opacity { FadeAnimator {} }
Button { Button {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: notesApi.loginStatus === NotesApi.LoginFlowV2Polling ? qsTr("Abort") : notesApi.loginStatus === NotesApi.LoginSuccess ? qsTr("Re-Login") : qsTr("Login") text: notesApi.loginStatus === notesApi.LoginFlowV2Polling ? qsTr("Abort") : notesApi.loginStatus === notesApi.LoginSuccess ? qsTr("Re-Login") : qsTr("Login")
onClicked: notesApi.loginStatus === NotesApi.LoginFlowV2Polling ? notesApi.abortFlowV2Login() : notesApi.initiateFlowV2Login() onClicked: notesApi.loginStatus === notesApi.LoginFlowV2Polling ? notesApi.abortFlowV2Login() : notesApi.initiateFlowV2Login()
} }
} }
@ -218,7 +231,7 @@ Page {
id: legacyLoginColumn id: legacyLoginColumn
width: parent.width width: parent.width
visible: opacity !== 0.0 visible: opacity !== 0.0
opacity: legacyLoginPossible ? 1.0 : 0.0 opacity: legacyLoginPossible || forceLegacyButton.checked ? 1.0 : 0.0
Behavior on opacity { FadeAnimator {} } Behavior on opacity { FadeAnimator {} }
TextField { TextField {
id: usernameField id: usernameField

14
qml/pages/NotePage.qml
View file

@ -5,9 +5,17 @@ import "../js/showdown/dist/showdown.js" as ShowDown
Dialog { Dialog {
id: noteDialog id: noteDialog
property int index property int id
property var note: notesProxyModel.getNote(notesProxyModel.index(index, 0)) //property var note: notesProxyModel.getNote(notesProxyModel.index(index, 0))
property var note: notesModel.getNoteById(id)
Connections {
target: notesModel
onNoteUpdated: {
if (id === noteDialog.id) {
noteDialog.note = note
}
}
}
property var showdown: ShowDown.showdown property var showdown: ShowDown.showdown
property var converter: new showdown.Converter( property var converter: new showdown.Converter(

2
qml/pages/NotesPage.qml
View file

@ -106,7 +106,7 @@ Page {
id: remorse id: remorse
} }
onClicked: pageStack.push(Qt.resolvedUrl("../pages/NotePage.qml"), { index: index } ) onClicked: pageStack.push(Qt.resolvedUrl("../pages/NotePage.qml"), { id: id } )
onPressAndHold: menu.open(note) onPressAndHold: menu.open(note)
Separator { Separator {

11
src/harbour-nextcloudnotes.cpp
View file

@ -32,17 +32,6 @@ int main(int argc, char *argv[])
notesModel->setNotesApi(notesApi); notesModel->setNotesApi(notesApi);
notesModel->setNotesStore(notesStore); notesModel->setNotesStore(notesStore);
//QObject::connect(notesApi, SIGNAL(allNotesReceived(QList<int>)), notesModel, SLOT());
//QObject::connect(notesApi, SIGNAL(noteCreated(int,QJsonObject)), notesModel, SLOT(insertNoteFromApi(int,QJsonObject)));
//QObject::connect(notesApi, SIGNAL(noteUpdated(int,QJsonObject)), notesModel, SLOT(updateNoteFromApi(int,QJsonObject)));
//QObject::connect(notesApi, SIGNAL(noteDeleted(int)), notesModel, SLOT(removeNoteFromApi(int)));
//QObject::connect(notesApi, SIGNAL(noteUpdated(int,QJsonObject)), notesStore, SLOT(updateNote(int,QJsonObject)));
//QObject::connect(notesApi, SIGNAL(noteDeleted(int)), notesStore, SLOT(deleteNote(int)));
//QObject::connect(notesStore, SIGNAL(noteUpdated(int,QJsonObject)), notesModel, SLOT(updateNoteFromStore(int,QJsonObject)));
//QObject::connect(notesStore, SIGNAL(noteDeleted(int)), notesModel, SLOT(removeNoteFromStore(int)));
QQuickView* view = SailfishApp::createView(); QQuickView* view = SailfishApp::createView();
#ifdef QT_DEBUG #ifdef QT_DEBUG
view->rootContext()->setContextProperty("debug", QVariant(true)); view->rootContext()->setContextProperty("debug", QVariant(true));

4
src/notesapi.cpp
View file

@ -245,11 +245,11 @@ void NotesApi::setPath(QString path) {
bool NotesApi::getNcStatus() { bool NotesApi::getNcStatus() {
QUrl url = apiEndpointUrl(m_statusEndpoint); QUrl url = apiEndpointUrl(m_statusEndpoint);
qDebug() << "POST" << url.toDisplayString(); qDebug() << "GET" << url.toDisplayString();
if (url.isValid() && !url.scheme().isEmpty() && !url.host().isEmpty()) { if (url.isValid() && !url.scheme().isEmpty() && !url.host().isEmpty()) {
setNcStatusStatus(NextcloudStatus::NextcloudBusy); setNcStatusStatus(NextcloudStatus::NextcloudBusy);
m_request.setUrl(url); m_request.setUrl(url);
m_statusReplies << m_manager.post(m_request, QByteArray()); m_statusReplies << m_manager.get(m_request);
return true; return true;
} }
else { else {

4
src/notesmodel.cpp
View file

@ -130,6 +130,10 @@ void NotesModel::setAccount(const QString &account) {
mp_notesStore->setAccount(account); mp_notesStore->setAccount(account);
} }
const QJsonObject NotesModel::getNoteById(const int id) const {
return m_notes[id];
}
bool NotesModel::getAllNotes(const QStringList &exclude) { bool NotesModel::getAllNotes(const QStringList &exclude) {
bool success = true; bool success = true;
if (mp_notesApi) if (mp_notesApi)

2
src/notesmodel.h
View file

@ -72,6 +72,8 @@ public:
QString account() const; QString account() const;
void setAccount(const QString& account); void setAccount(const QString& account);
const QJsonObject getNoteById(const int id) const;
public slots: public slots:
Q_INVOKABLE bool getAllNotes(const QStringList& exclude = QStringList()); Q_INVOKABLE bool getAllNotes(const QStringList& exclude = QStringList());
Q_INVOKABLE bool getNote(const int id, const QStringList& exclude = QStringList()); Q_INVOKABLE bool getNote(const int id, const QStringList& exclude = QStringList());

4
translations/harbour-nextcloudnotes-de.ts
View file

@ -190,6 +190,10 @@
<source>Re-Login</source> <source>Re-Login</source>
<translation>Neu einloggen</translation> <translation>Neu einloggen</translation>
</message> </message>
<message>
<source>Enforce legacy login</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MITLicense</name> <name>MITLicense</name>

4
translations/harbour-nextcloudnotes-sv.ts
View file

@ -190,6 +190,10 @@
<source>Re-Login</source> <source>Re-Login</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Enforce legacy login</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MITLicense</name> <name>MITLicense</name>

51
translations/harbour-nextcloudnotes.ts
View file

@ -143,17 +143,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="226"/> <location filename="../qml/pages/LoginPage.qml" line="239"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="237"/> <location filename="../qml/pages/LoginPage.qml" line="250"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="212"/> <location filename="../qml/pages/LoginPage.qml" line="225"/>
<source>Abort</source> <source>Abort</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -179,52 +179,57 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="212"/> <location filename="../qml/pages/LoginPage.qml" line="207"/>
<source>Enforce legacy login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginPage.qml" line="225"/>
<source>Login</source> <source>Login</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="212"/> <location filename="../qml/pages/LoginPage.qml" line="225"/>
<source>Re-Login</source> <source>Re-Login</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="246"/> <location filename="../qml/pages/LoginPage.qml" line="259"/>
<source>Test Login</source> <source>Test Login</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="252"/> <location filename="../qml/pages/LoginPage.qml" line="265"/>
<source>Note</source> <source>Note</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="260"/> <location filename="../qml/pages/LoginPage.qml" line="273"/>
<source>The &lt;a href=&quot;https://apps.nextcloud.com/apps/notes&quot;&gt;Notes&lt;/a&gt; app needs to be installed on the Nextcloud server for this app to work.</source> <source>The &lt;a href=&quot;https://apps.nextcloud.com/apps/notes&quot;&gt;Notes&lt;/a&gt; app needs to be installed on the Nextcloud server for this app to work.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="264"/> <location filename="../qml/pages/LoginPage.qml" line="277"/>
<source>Security</source> <source>Security</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="271"/> <location filename="../qml/pages/LoginPage.qml" line="284"/>
<source>&lt;strong&gt;CAUTION: Your password will be saved without any encryption on the device!&lt;/strong&gt;&lt;br&gt;Please consider creating a dedicated app password! Open your Nextcloud in a browser and go to &lt;i&gt;Settings&lt;/i&gt; → &lt;i&gt;Security&lt;/i&gt;.</source> <source>&lt;strong&gt;CAUTION: Your password will be saved without any encryption on the device!&lt;/strong&gt;&lt;br&gt;Please consider creating a dedicated app password! Open your Nextcloud in a browser and go to &lt;i&gt;Settings&lt;/i&gt; → &lt;i&gt;Security&lt;/i&gt;.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="275"/> <location filename="../qml/pages/LoginPage.qml" line="288"/>
<source>Do not check certificates</source> <source>Do not check certificates</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="276"/> <location filename="../qml/pages/LoginPage.qml" line="289"/>
<source>Enable this option to allow selfsigned certificates</source> <source>Enable this option to allow selfsigned certificates</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/LoginPage.qml" line="285"/> <location filename="../qml/pages/LoginPage.qml" line="298"/>
<source>Allow unencrypted connections</source> <source>Allow unencrypted connections</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -258,52 +263,52 @@
<context> <context>
<name>NotePage</name> <name>NotePage</name>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="117"/> <location filename="../qml/pages/NotePage.qml" line="125"/>
<source>Delete</source> <source>Delete</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="121"/> <location filename="../qml/pages/NotePage.qml" line="129"/>
<source>Reload</source> <source>Reload</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="121"/> <location filename="../qml/pages/NotePage.qml" line="129"/>
<source>Updating...</source> <source>Updating...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="127"/> <location filename="../qml/pages/NotePage.qml" line="135"/>
<source>Last update</source> <source>Last update</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="130"/> <location filename="../qml/pages/NotePage.qml" line="138"/>
<source>never</source> <source>never</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="137"/> <location filename="../qml/pages/NotePage.qml" line="145"/>
<source>Edit</source> <source>Edit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="138"/> <location filename="../qml/pages/NotePage.qml" line="146"/>
<source>Notes</source> <source>Notes</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="258"/> <location filename="../qml/pages/NotePage.qml" line="266"/>
<source>No category</source> <source>No category</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="259"/> <location filename="../qml/pages/NotePage.qml" line="267"/>
<source>Category</source> <source>Category</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/pages/NotePage.qml" line="274"/> <location filename="../qml/pages/NotePage.qml" line="282"/>
<source>Modified</source> <source>Modified</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>