mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort

Browse source 
This merge was a bit more challenging given how far things had diverged,
but I hope I got it mostly right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-03-31 21:57:12 -05:00
commit 2efa047999
17 changed files with 436 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

18
qt-mobile/qml/CloudCredentials.qml
View file

@ -3,12 +3,12 @@ import QtQuick.Controls 1.2
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
import org.kde.kirigami 1.0 as Kirigami
import org.subsurfacedivelog.mobile 1.0
Item {
id: loginWindow
height: outerLayout.height + 2 * MobileComponents.Units.gridUnit
height: outerLayout.height + 2 * Kirigami.Units.gridUnit
property string username: login.text;
property string password: password.text;
@ -21,7 +21,7 @@ Item {
ColumnLayout {
id: outerLayout
width: subsurfaceTheme.columnWidth - 2 * MobileComponents.Units.gridUnit
width: subsurfaceTheme.columnWidth - 2 * Kirigami.Units.gridUnit
onVisibleChanged: {
if (visible) {
@ -34,13 +34,13 @@ Item {
}
}
MobileComponents.Heading {
Kirigami.Heading {
text: "Cloud credentials"
level: headingLevel
Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
}
MobileComponents.Label {
Kirigami.Label {
text: "Email"
}
@ -52,7 +52,7 @@ Item {
Qt.ImhNoAutoUppercase
}
MobileComponents.Label {
Kirigami.Label {
text: "Password"
}
@ -75,10 +75,10 @@ Item {
password.echoMode = checked ? TextInput.Normal : TextInput.Password
}
}
MobileComponents.Label {
Kirigami.Label {
text: "Show password"
}
}
Item { width: MobileComponents.Units.gridUnit; height: width }
Item { width: Kirigami.Units.gridUnit; height: width }
}
}