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

Small changes in the LoginDialog

Browse source
This commit is contained in:
Scharel Clemens 2020-01-16 22:14:47 +01:00
parent 9cb7237e81
commit 4563e95ef7
5 changed files with 31 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
harbour-nextcloudnotes.pro
View file

@ -27,6 +27,7 @@ SOURCES += src/harbour-nextcloudnotes.cpp \
src/notesmodel.cpp
DISTFILES += qml/harbour-nextcloudnotes.qml \
LoginWebview.qml \
qml/cover/CoverPage.qml \
rpm/harbour-nextcloudnotes.changes.run.in \
rpm/harbour-nextcloudnotes.changes \

25
qml/pages/LoginDialog.qml
View file

@ -74,6 +74,7 @@ Dialog {
Column {
id: column
width: parent.width
spacing: Theme.paddingLarge
DialogHeader {
//title: qsTr("Nextcloud Login")
@ -87,15 +88,26 @@ Dialog {
source: "../img/nextcloud-logo-transparent.png"
}
TextField {
width: parent.width
placeholderText: qsTr("Nextcloud server")
validator: RegExpValidator { regExp: /^https?:\/\/([-a-zA-Z0-9@:%._\+~#=].*)/ }
inputMethodHints: Qt.ImhUrlCharactersOnly
label: placeholderText
onClicked: if (text === "") text = "https://"
onTextChanged: {
if (acceptableInput)
notesApi.host = text
}
}
Column {
id: flowv2LoginColumn
width: parent.width
spacing: Theme.paddingLarge
visible: notesApi.statusVersion.split('.')[0] >= 16
Label {
x: Theme.horizontalPageMargin
width: parent.width - 2*x
text: qsTr("Login Flow v2") + " " + notesApi.statusVersionString
text: "Flow Login v2"
}
}
@ -103,11 +115,8 @@ Dialog {
id: legacyLoginColumn
width: parent.width
visible: !flowv2LoginColumn.visible
Label {
x: Theme.horizontalPageMargin
width: parent.width - 2*x
text: qsTr("Legacy Login") + " " + notesApi.statusVersionString
text: "Legacy Login"
}
}

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

@ -115,14 +115,6 @@
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Login Flow v2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Legacy Login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Account name</source>
<translation type="unfinished"></translation>

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

@ -115,14 +115,6 @@
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Login Flow v2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Legacy Login</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Account name</source>
<translation type="unfinished"></translation>

35
translations/harbour-nextcloudnotes.ts
View file

@ -131,7 +131,7 @@
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="80"/>
<location filename="../qml/pages/LoginDialog.qml" line="174"/>
<location filename="../qml/pages/LoginDialog.qml" line="186"/>
<source>Login</source>
<translation type="unfinished"></translation>
</message>
@ -141,67 +141,58 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="98"/>
<source>Login Flow v2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="110"/>
<source>Legacy Login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="120"/>
<location filename="../qml/pages/LoginDialog.qml" line="132"/>
<source>Account name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="135"/>
<location filename="../qml/pages/LoginDialog.qml" line="101"/>
<location filename="../qml/pages/LoginDialog.qml" line="147"/>
<source>Nextcloud server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="150"/>
<location filename="../qml/pages/LoginDialog.qml" line="162"/>
<source>Username</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="163"/>
<location filename="../qml/pages/LoginDialog.qml" line="175"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="174"/>
<location filename="../qml/pages/LoginDialog.qml" line="186"/>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="183"/>
<location filename="../qml/pages/LoginDialog.qml" line="195"/>
<source>Follow the login procedure</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="191"/>
<location filename="../qml/pages/LoginDialog.qml" line="203"/>
<source>Security</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="198"/>
<location filename="../qml/pages/LoginDialog.qml" line="210"/>
<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>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="202"/>
<location filename="../qml/pages/LoginDialog.qml" line="214"/>
<source>Do not check certificates</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="203"/>
<location filename="../qml/pages/LoginDialog.qml" line="215"/>
<source>Enable this option to allow selfsigned certificates</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/pages/LoginDialog.qml" line="209"/>
<location filename="../qml/pages/LoginDialog.qml" line="221"/>
<source>Allow unencrypted connections</source>
<translation type="unfinished"></translation>
</message>