Commit e65453a0 authored by Aleksei German's avatar Aleksei German
Browse files

Washing Machine: resized project to 480x272

parent 0278de5b
......@@ -2,13 +2,19 @@ import QtQuick 2.8
Item {
id: flatbackground
width: 400
height: 275
width: 480
height: 272
Image {
id: backgroundfull
x: 0
y: 0
source: "assets/backgroundfull.png"
Rectangle {
id: rectangle
color: "#333333"
anchors.fill: parent
}
// Image {
// id: backgroundfull
// x: 0
// y: 0
// source: "assets/backgroundfull.png"
// }
}
......@@ -5,34 +5,24 @@ Item {
width: 43
height: 43
property bool isLocked: true
property alias unlockediconoffY: unlockediconoff.y
property alias unlockediconoffX: unlockediconoff.x
property alias lockedicononY: lockediconon.y
property alias lockedicononX: lockediconon.x
property alias unlockedicononY: unlockediconon.y
property alias unlockedicononX: unlockediconon.x
property alias currenticonoffY: currenticonoff.y
property alias currenticonoffX: currenticonoff.x
property alias unlockediconoffSource: unlockediconoff.source
property alias lockedicononSource: lockediconon.source
property alias unlockedicononSource: unlockediconon.source
property alias currenticonoffSource: currenticonoff.source
// state: "lockedDefault"
Image {
id: outllineoff
x: 2
y: 2
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
source: "assets/outllineoff.png"
fillMode: Image.PreserveAspectFit
}
Image {
id: smallbuttoniconfill
x: 2
y: 2
width: 39
height: 39
anchors.verticalCenter: parent.verticalCenter
source: "assets/smallbuttoniconfill.png"
anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.PreserveAspectFit
}
......@@ -41,6 +31,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
source: "assets/currenticonoff.png"
anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.PreserveAspectFit
}
Image {
......
......@@ -2,58 +2,46 @@ import QtQuick 2.8
Item {
id: presets
width: 400
height: 275
width: 480
height: 272
property int duration: 20
signal presetSelected
Flatbackground {
id: backgroundfull
x: 0
y: 0
width: 400
height: 275
anchors.fill: parent
}
Text {
id: presetlabel
y: 42
width: 302
height: 35
height: 32
color: "#B8B8B8"
text: "Recently Used Presets"
font.pixelSize: 30
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.horizontalCenter: parent.horizontalCenter
font.family: "Maven Pro"
}
// Flickable {
// Item {
// id: presetsContainer
// width: 390
// height: 95
// anchors.verticalCenter: parent.verticalCenter
// anchors.horizontalCenter: parent.horizontalCenter
// clip: true
Presetsroll {
id: presetscrollinstance
width: 390
height: 95
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
Connections {
target: presetscrollinstance
onPresetSelected: {
presets.duration = presetscrollinstance.duration
presets.presetSelected()
}
Presetsroll {
id: presetscrollinstance
width: 480
height: 95
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
Connections {
target: presetscrollinstance
onPresetSelected: {
presets.duration = presetscrollinstance.duration
presets.presetSelected()
}
}
// }
}
}
......@@ -2,8 +2,8 @@ import QtQuick 2.11
Item {
id: presetsScreen
width: 400
height: 275
width: 480
height: 272
signal startRun
signal cancelPresets
......@@ -12,10 +12,7 @@ Item {
Flatbackground {
id: backgroundFull
x: 0
y: 0
width: 400
height: 275
anchors.fill: parent
}
Presets {
......@@ -57,6 +54,7 @@ Item {
id: washprogram
visible: false
anchors.fill: parent
Connections {
target: washprogram
......@@ -84,8 +82,8 @@ Item {
Timedate {
id: settings_timedateinstance
x: 345
y: 7
x: 425
y: 8
width: 47
height: 30
}
......
......@@ -2,15 +2,12 @@ import QtQuick 2.8
Item {
id: presetsave
width: 400
height: 275
width: 480
height: 272
Flatbackground {
id: backgroundfull
x: 0
y: 0
width: 400
height: 275
anchors.fill: parent
}
Image {
......
......@@ -5,16 +5,17 @@ Item {
property int duration: 20
signal presetSelected
width: 390
width: 480
height: 95
Bigbutton {
id: preset0
x: 0
y: 3
presetlabelText: "Custom"
property int customDefaultDuration: 20
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: -180
anchors.horizontalCenter: parent.horizontalCenter
Connections {
target: preset0
......@@ -28,8 +29,9 @@ Item {
Bigbutton {
id: preset1
x: 100
y: 3
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: -60
anchors.horizontalCenter: parent.horizontalCenter
presetlabelText: "Sports"
property int sportsDuration: 45
......@@ -46,11 +48,12 @@ Item {
Bigbutton {
id: preset2
x: 200
y: 3
presetlabelText: "Eco"
property int ecoDuration: 75
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: 60
anchors.horizontalCenter: parent.horizontalCenter
Connections {
target: preset2
......@@ -64,11 +67,12 @@ Item {
Bigbutton {
id: preset3
x: 300
y: 3
presetlabelText: "Hot"
property int hotDuration: 60
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: 180
anchors.horizontalCenter: parent.horizontalCenter
Connections {
target: preset3
......@@ -83,7 +87,7 @@ Item {
/*##^##
Designer {
D{i:0;formeditorZoom:2;height:95;width:363}
D{i:0;formeditorZoom:1.75;height:95;width:480}
}
##^##*/
......@@ -2,8 +2,8 @@ import QtQuick 2.8
Item {
id: quickstarts
width: 400
height: 275
width: 480
height: 272
property int runDuration: 0
signal detailsClicked
......@@ -11,18 +11,16 @@ Item {
Flatbackground {
id: backgroundfull
x: 0
y: 0
width: 400
height: 275
anchors.fill: parent
}
Bigbutton {
id: quickstartdetails
x: 93
y: 103
width: 84
height: 84
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: -90
anchors.horizontalCenter: parent.horizontalCenter
presetlabelText: "Details"
Connections {
......@@ -35,10 +33,11 @@ Item {
Bigbutton {
id: quickstartgo
x: 217
y: 103
width: 84
height: 84
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: 90
anchors.horizontalCenter: parent.horizontalCenter
presetlabelText: "GO"
Connections {
......@@ -58,9 +57,9 @@ Item {
text: "Quick Start?"
font.pixelSize: 30
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.horizontalCenter: parent.horizontalCenter
font.family: "Maven Pro"
// font.styleName: "Regular"
}
}
......
......@@ -3,8 +3,8 @@ import QtQuick.Timeline 1.0
Item {
id: running
width: 400
height: 275
width: 480
height: 272
clip: true
property int runDuration: 20
......@@ -45,68 +45,80 @@ Item {
}
}
Image {
id: backgroundhole
x: 123
y: 69
source: "assets/backgroundhole.png"
// Image {
// id: backgroundhole
// x: 163
// y: 68
// source: "assets/backgroundhole.png"
// }
Rectangle {
id: background
color: "#333333"
anchors.fill: parent
}
WaveAni {
id: waveAni
x: 0
y: 176
width: 400
height: 367
anchors.horizontalCenter: backgroundcutout.horizontalCenter
clip: true
}
Image {
id: backgroundcutout
x: 0
y: 0
y: -2
source: "assets/backgroundcutout.png"
anchors.horizontalCenterOffset: 2
anchors.horizontalCenter: parent.horizontalCenter
}
Image {
id: washdrumoutlne
anchors.verticalCenter: parent.verticalCenter
source: "assets/washdrumoutlne.png"
anchors.horizontalCenter: parent.horizontalCenter
}
anchors.verticalCenterOffset: 6
source: "assets/washdrumoutlne.png"
Text {
id: remaintimelabel
x: 106
y: 237
color: "#B8B8B8"
text: "Remaining Time: "
font.pixelSize: 16
horizontalAlignment: Text.AlignHCenter
font.family: "Maven Pro"
Text {
id: text1
x: 53
y: 76
visible: true
color: "#e544a1"
text: qsTr("Ready!")
font.pixelSize: 20
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: washdrumoutlne.verticalCenter
anchors.horizontalCenter: washdrumoutlne.horizontalCenter
font.family: "Maven Pro"
}
}
Text {
id: remaintimedynamiclabel
x: 236
y: 237
id: remaintimelabel
y: 233
color: "#B8B8B8"
text: (logic.minutesLeft + " min")
text: "Remaining Time: " + (logic.minutesLeft + " min")
font.pixelSize: 16
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.horizontalCenter: parent.horizontalCenter
font.family: "Maven Pro"
}
Text {
id: finishingatlabel
x: 148
y: 255
y: 251
width: 104
height: 15
color: "#B8B8B8"
text: "Finishing At: " + hoursStr + ":" + minutesStr
font.pixelSize: 12
horizontalAlignment: Text.AlignHCenter
anchors.horizontalCenter: parent.horizontalCenter
font.family: "Maven Pro"
property int subminutes: datetimeinstance_running.currentMinuteInt + logic.minutesLeft
......@@ -119,26 +131,30 @@ Item {
Timedate {
id: datetimeinstance_running
x: 338
y: 10
x: 425
y: 8
width: 47
height: 30
}
LockButton {
id: lockbuttoninstance
x: 16
y: 16
width: 43
height: 43
anchors.left: parent.left
anchors.top: parent.top
anchors.leftMargin: 16
anchors.topMargin: 16
}
LockButton {
id: pausebuttoninstance
x: 342
y: 213
width: 43
height: 43
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.bottomMargin: 16
anchors.rightMargin: 16
unlockedicononSource: "assets/resumeiconon.png"
unlockediconoffSource: "assets/resumeiconoff.png"
lockedicononSource: "assets/pauseiconoff.png"
......@@ -147,10 +163,12 @@ Item {
Smallbutton {
id: stopbuttoninstance
x: 16
y: 213
width: 43
height: 43
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.bottomMargin: 16
anchors.leftMargin: 16
lockedicononSource: "assets/closeiconoff.png"
currenticonoffSource: "assets/pauseiconon.png"
......@@ -162,19 +180,6 @@ Item {
}
}
Text {
id: text1
visible: true
color: "#e544a1"
text: qsTr("Ready!")
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 20
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.horizontalCenter: waveAni.horizontalCenter
font.family: "Maven Pro"
}
states: [
State {
name: "inactive"
......@@ -324,7 +329,7 @@ Item {
/*##^##
Designer {
D{i:0;formeditorZoom:1.66;height:275;width:400}D{i:40}
D{i:0;formeditorZoom:1.75}D{i:13}D{i:39}
}
##^##*/
......@@ -2,26 +2,22 @@ import QtQuick 2.8
Item {
id: quickstarts
width: 400
height: 275
width: 480
height: 272
signal canceled
signal accepted
Flatbackground {
id: backgroundfull
x: 0
y: 0
width: 400
height: 275
anchors.fill: parent
}
Bigbutton {
id: quickstartdetails
x: 93
y: 103
// width: 84
// height: 84
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: -90
anchors.horizontalCenter: parent.horizontalCenter
presetlabelText: "No"
Connections {
......@@ -34,10 +30,9 @@ Item {
Bigbutton {
id: quickstartgo
x: 217
y: 103
// width: 84
// height: 84
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: 90
anchors.horizontalCenter: parent.horizontalCenter
presetlabelText: "Yes"
Connections {
......@@ -50,19 +45,21 @@ Item {
Text {
id: quickstrartlabel
x: 73
y: 47
y: 42
height: 32
color: "#B8B8B8"
text: "Cancel wash cycle?"
font.pixelSize: 30
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.horizontalCenter: parent.horizontalCenter
font.family: "Maven Pro"
}
}
/*##^##
Designer {
D{i:0;formeditorZoom:1.3300000429153442}
D{i:0;height:272;width:480}
}
##^##*/
......@@ -2,8 +2,8 @@ import QtQuick 2.11
Item {
id: runningScreen
width: 400
height: 275
width: 480
height: 272