Code Review
/
apps
/
hvac.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
HVAC.qml: Allow scaling at lower resolutions
[apps/hvac.git]
/
app
/
HVAC.qml
diff --git
a/app/HVAC.qml
b/app/HVAC.qml
index
8867168
..
dbab358
100644
(file)
--- a/
app/HVAC.qml
+++ b/
app/HVAC.qml
@@
-17,9
+17,9
@@
import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
+import QtQuick.Window 2.11
import AGL.Demo.Controls 1.0
import Translator 1.0
import AGL.Demo.Controls 1.0
import Translator 1.0
-import 'api' as API
ApplicationWindow {
id: root
ApplicationWindow {
id: root
@@
-29,12
+29,11
@@
ApplicationWindow {
Translator {
id: translator
Translator {
id: translator
- language:
binding.language
+ language:
"en_US"
}
}
- API.Binding {
- id: binding
- url: bindingAddress
+ Connections {
+ target: hvac
onFanSpeedChanged: fanSpeedSlider.value = fanSpeed
onLanguageChanged: translator.language = language
}
onFanSpeedChanged: fanSpeedSlider.value = fanSpeed
onLanguageChanged: translator.language = language
}
@@
-42,9
+41,10
@@
ApplicationWindow {
Item {
id: container
anchors.centerIn: parent
Item {
id: container
anchors.centerIn: parent
- width: 1080
- height: 1487
- scale: screenInfo.scale_factor()
+
+ height: 1920 - 218 - 215
+ width: 1080
+ scale: (Screen.width / 1080.0)
ColumnLayout {
anchors.fill: parent
ColumnLayout {
anchors.fill: parent
@@
-67,7
+67,7
@@
ApplicationWindow {
to: 255.0
stepSize: 1.0
onValueChanged: {
to: 255.0
stepSize: 1.0
onValueChanged: {
-
binding
.fanSpeed = value
+
hvac
.fanSpeed = value
}
}
Label {
}
}
Label {
@@
-93,7
+93,7
@@
ApplicationWindow {
HeatDegree {
onCurrentItemChanged: {
console.log("Left Temp changed",degree)
HeatDegree {
onCurrentItemChanged: {
console.log("Left Temp changed",degree)
-
binding
.leftTemperature = degree
+
hvac
.leftTemperature = degree
}
}
}
}
}
}
@@
-145,7
+145,7
@@
ApplicationWindow {
HeatDegree {
onCurrentItemChanged: {
console.log("Right Temp changed",degree)
HeatDegree {
onCurrentItemChanged: {
console.log("Right Temp changed",degree)
-
binding
.rightTemperature = degree
+
hvac
.rightTemperature = degree
}
}
}
}
}
}