From 2a47f513665707e0a7153f488ee86df398db80c5 Mon Sep 17 00:00:00 2001 From: Scharel Clemens Date: Sat, 22 Aug 2020 11:28:31 +0200 Subject: [PATCH] Only small changes --- harbour-nextcloudnotes.pro | 1 + qml/pages/AboutPage.qml | 11 +++--- src/notesapi.h | 2 +- src/notesmodel.cpp | 2 +- translations/harbour-nextcloudnotes-de.ts | 4 +++ translations/harbour-nextcloudnotes-sv.ts | 4 +++ translations/harbour-nextcloudnotes.ts | 41 +++++++++++++---------- 7 files changed, 41 insertions(+), 24 deletions(-) diff --git a/harbour-nextcloudnotes.pro b/harbour-nextcloudnotes.pro index 91b80aa..c136695 100644 --- a/harbour-nextcloudnotes.pro +++ b/harbour-nextcloudnotes.pro @@ -26,6 +26,7 @@ SOURCES += src/harbour-nextcloudnotes.cpp \ src/notesmodel.cpp DISTFILES += qml/harbour-nextcloudnotes.qml \ + icons/icon-launcher-nextcloudnotes.svg \ qml/cover/CoverPage.qml \ qml/img/nextcloud-logo-dark.png \ qml/img/nextcloud-logo-light.png \ diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 94f35c8..78766c1 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -17,6 +17,10 @@ Page { title: qsTr("About") } + SectionHeader { + text: qsTr("Debug") + visible: debug + } Label { id: debugModeLabel x: Theme.horizontalPageMargin @@ -32,7 +36,9 @@ Page { SectionHeader { text: "Nextcloud " + qsTr("Notes") + " v" + Qt.application.version } - + Icon { + source: Qt.resolvedUrl("../../icons/icon-launcher-nextcloudnotes.svg") + } LinkedLabel { id: nextcloudnotesLabel x: Theme.horizontalPageMargin @@ -43,7 +49,6 @@ Page { //: Post-Showdown Github link qsTr(".") + "

" } - Button { anchors.horizontalCenter: parent.horizontalCenter text: qsTr("MIT License") @@ -53,7 +58,6 @@ Page { SectionHeader { text: "ShowdownJS" } - LinkedLabel { id: showdownLabel x: Theme.horizontalPageMargin @@ -64,7 +68,6 @@ Page { qsTr("to convert Markdown to HTML.") + "

" + "

" + qsTr("Showdown 1.x is released under GPL 2.0.") + "

" } - Button { anchors.horizontalCenter: parent.horizontalCenter text: qsTr("GPL 2.0 License") diff --git a/src/notesapi.h b/src/notesapi.h index 2586dec..fe70b0f 100644 --- a/src/notesapi.h +++ b/src/notesapi.h @@ -79,7 +79,7 @@ public: Q_ENUM(CapabilitiesStatus) enum NextcloudStatus { - NextcloudUnknown, // Initial unknown state + NextcloudUnknown, // Initial unknown state NextcloudBusy, // Getting information from the nextcloud server NextcloudSuccess, // Got information about the nextcloud server NextcloudFailed // Error getting information from the nextcloud server, see error() diff --git a/src/notesmodel.cpp b/src/notesmodel.cpp index 2e1674b..67bb765 100644 --- a/src/notesmodel.cpp +++ b/src/notesmodel.cpp @@ -143,7 +143,7 @@ void NotesModel::setAccount(const QString& account) { } endRemoveRows(); beginInsertRows(QModelIndex(), 0, rowCount() - 1); - qDebug() << rowCount() << " notes in account"; + qDebug() << rowCount() << "local notes in account"; endInsertRows(); } /* diff --git a/translations/harbour-nextcloudnotes-de.ts b/translations/harbour-nextcloudnotes-de.ts index 55bcb14..120c359 100644 --- a/translations/harbour-nextcloudnotes-de.ts +++ b/translations/harbour-nextcloudnotes-de.ts @@ -59,6 +59,10 @@ This app is released under the MIT license. Diese App wurde unter der MIT Lizenz veröffentlicht. + + Debug + + CoverPage diff --git a/translations/harbour-nextcloudnotes-sv.ts b/translations/harbour-nextcloudnotes-sv.ts index fae5dd2..e23a289 100644 --- a/translations/harbour-nextcloudnotes-sv.ts +++ b/translations/harbour-nextcloudnotes-sv.ts @@ -59,6 +59,10 @@ This app is released under the MIT license. Denna app är släppt under MIT-licensen. + + Debug + + CoverPage diff --git a/translations/harbour-nextcloudnotes.ts b/translations/harbour-nextcloudnotes.ts index af5acc2..bfbc161 100644 --- a/translations/harbour-nextcloudnotes.ts +++ b/translations/harbour-nextcloudnotes.ts @@ -9,66 +9,71 @@ - + + Debug + + + + The app is running in DEBUG mode! - + Notes - + This app is released under the MIT license. - + The source code is available on Pre-Showdown Github link - + . Post-Showdown Github link - + MIT License - + This app uses Pre-Showdown Github link - + to convert Markdown to HTML. Post-Showdown Github link - + Showdown 1.x is released under GPL 2.0. - + GPL 2.0 License - + Nextcloud Notes - + for Sailfish OS @@ -316,32 +321,32 @@ NotesApi - + No error - + No network connection available - + Failed to communicate with the Nextcloud server - + An error occured while establishing an encrypted connection - + Could not authenticate to the Nextcloud instance - + Unknown error