Index: leahi.qrc
===================================================================
diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r56c2adbc6e724c09d5ca9d61cb0a1581d46daf02
--- leahi.qrc (.../leahi.qrc) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7)
+++ leahi.qrc (.../leahi.qrc) (revision 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02)
@@ -44,9 +44,9 @@
sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
- sources/gui/qml/dialogs/headerbar/WiFiDialog.qml
- sources/gui/qml/dialogs/headerbar/StorageDialog.qml
- sources/gui/qml/dialogs/headerbar/SettingsDialog.qml
+ sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml
+ sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml
+ sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml
resources/images/Logo d.png
Index: sources/gui/qml/components/BaseComboBox.qml
===================================================================
diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r56c2adbc6e724c09d5ca9d61cb0a1581d46daf02
--- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7)
+++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02)
@@ -79,7 +79,7 @@
}
popup: Popup { id: _popup
- y : _root.height
+ y : _root.height + 10
x : 0
width : _root.width
implicitHeight : contentItem.implicitHeight
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -r56c2adbc6e724c09d5ca9d61cb0a1581d46daf02
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02)
@@ -136,7 +136,7 @@
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iWifi"
extraSpace : _headerButtonRow.spacing
- onPressed : _wifiDialog.openDialog(_wifiButton)
+ onPressed : _headerbarWifi.openDialog(_wifiButton)
}
IconButton { id : _bluetoothButton
@@ -160,15 +160,15 @@
iconImageSource : "qrc:/images/iStorage"
extraSpace : _headerButtonRow.spacing
- onPressed : _storageDialog.openDialog(_storageButton)
+ onPressed : _headerbarStorage.openDialog(_storageButton)
}
IconButton { id : _settingsButton
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iSettings"
extraSpace : _headerButtonRow.spacing
- onPressed : _settingsDialog.openDialog(_settingsButton)
+ onPressed : _headerbarSettings.openDialog(_settingsButton)
}
IconButton { id : _informationButton
Index: sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (revision 0)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (revision 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02)
@@ -0,0 +1,144 @@
+import QtQuick 2.12
+
+import "qrc:/components"
+import "qrc:/globals"
+
+HeaderBarPopup { id: _root
+ readonly property int sliderWidth : 430
+ readonly property color sliderBkgndColor : Colors.dialogShadowColor
+ readonly property color valueColor : Colors.dialogValueColor
+
+ padding : Variables.defaultMargin
+
+ QtObject { id: _private
+ readonly property var textFont : Qt.font ({ pixelSize: Fonts.fontPixelDialogText, weight: Font.Medium })
+ readonly property var valueFont : Qt.font ({ pixelSize: 28, weight: Font.DemiBold })
+ readonly property int columnWidth : sliderWidth + padding * 2
+ readonly property int columnSpacing : Variables.defaultMargin * 2
+ readonly property int itemHeight : 30
+ }
+
+ contentItem: Column { id : _dialogColumn
+ anchors.centerIn : parent
+ width : _private.columnWidth
+ spacing : Variables.defaultMargin
+
+ Column { id: _brightness
+ width : _private.columnWidth
+ spacing : _private.columnSpacing
+
+ Item { id: _brightnessTextItem
+ height : _private.itemHeight
+ width : parent.width
+
+ Text { id: _brightnessText
+ anchors.left : parent.left
+ anchors.verticalCenter : parent.verticalCenter
+ text : ("%1: ").arg(qsTr("Brightness"))
+ color : Colors.dialogText
+ font : _private.textFont
+ }
+
+ Text { id: _brightnessValue
+ anchors.left : _brightnessText.right
+ anchors.bottom : _brightnessText.bottom
+ text : ("%1").arg(vDevice.brightnesss)
+ color : _root.valueColor
+ font : _private.valueFont
+ }
+ }
+
+ Slider { id : _brightnessSlider
+ anchors.horizontalCenter: parent.horizontalCenter
+ width : _root.sliderWidth
+ height : 10
+ showMinMaxText : false
+ step : 1 // no zero
+ minimum : 1
+ maximum : 5
+ ticks : true
+ unit : ""
+ bgColor : _root.sliderBkgndColor
+ diameter : 26
+ hasBorder : false
+ handleBorderColor : Colors.highlightProgressBar
+
+ onReleased : vDevice.brightness = _brightnessSlider.value
+
+ Connections { target: vDevice
+ // in case the value is rejected it will be set to the previous value
+ // also the init value shall be set when navigate to the screen
+ function onBrightnessChanged ( vValue ) { _brightnessSlider.reset(vValue) }
+
+ // TODO do something with rejection message
+ function onStatusChanged ( vValue ) { print("**** Brightness Status: " + vValue) }
+ }
+ }
+ }
+
+ Line { id: _divider
+ anchors.horizontalCenter: parent.horizontalCenter
+ length : parent.width
+ color : _root.sliderBkgndColor
+ }
+
+ Column { id: _volume
+ width : _private.columnWidth
+ spacing : _private.columnSpacing
+
+ Item { id: _volumeTextItem
+ height : _private.itemHeight
+ width : parent.width
+
+ Text { id: _volumeText
+ anchors.left : parent.left
+ anchors.verticalCenter : parent.verticalCenter
+ text : ("%1: ").arg(qsTr("Alarm Volume"))
+ color : Colors.dialogText
+ font : _private.textFont
+ }
+
+ Text { id: _volumeValue
+ anchors.left : _volumeText.right
+ anchors.bottom : _volumeText.bottom
+ text : vAdjustmentAlarmVolume.hdAlarmVolume
+ color : _root.valueColor
+ font : _private.valueFont
+ }
+ }
+
+ Slider { id : _volumeSlider
+ anchors.horizontalCenter: parent.horizontalCenter
+ width : _root.sliderWidth
+ height : 10
+ showMinMaxText : false
+ step : 1 // no zero
+ minimum : 1
+ maximum : 5
+ ticks : true
+ unit : ""
+ bgColor : _root.sliderBkgndColor
+ diameter : 26
+ hasBorder : false
+ handleBorderColor : Colors.highlightProgressBar
+
+ onReleased : vAdjustmentAlarmVolume.doAdjustment( _volumeSlider.value )
+
+ Connections { target: vAdjustmentAlarmVolume
+ function onAdjustmentTriggered ( vValue ) {
+ if ( vAdjustmentAlarmVolume.adjustment_Accepted ) {
+ vSettings .alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume
+ }
+ else {
+ // TODO do something with rejection message
+ print("**** Volume Rejected Reason: " + vAdjustmentAlarmVolume.adjustment_ReasonText)
+ }
+
+ // regardless of the rejection or acceptance the value will be sent from C++ to be adjusted.
+ _volumeSlider.reset ( vAdjustmentAlarmVolume.hdAlarmVolume )
+ }
+ }
+ }
+ }
+ }
+}
Index: sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml (revision 0)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml (revision 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02)
@@ -0,0 +1,41 @@
+import QtQuick 2.12
+
+import "qrc:/"
+import "qrc:/components"
+import "qrc:/globals"
+
+HeaderBarPopup { id: _root
+ readonly property int progressCircleHeight : 70
+
+ contentItem: Row { id : _dialogRow
+ anchors.centerIn : parent
+
+ Item { id: _progressItem
+ height : _root.progressCircleHeight
+ width : height
+
+ SDCProgressItem { id: _SDC_progressItem
+ anchors.fill : parent
+ circleShadowColor : Colors.dialogShadowColor
+ textColor : Colors.dialogText
+ percentFontSize : 18
+ totalFontSize : 16
+ }
+ }
+
+ Column { id : _dialogColumn
+ Repeater { id: _repeater
+ model: [("%1 (%2)") .arg(qsTr("SD-Card")) .arg("MB"),
+ ("%1: %2") .arg(qsTr("Free")) .arg(Variables.sizeConverted( _GuiView.sdAvail, 1000, 3)),
+ ("%1: %2") .arg(qsTr("Total")) .arg(Variables.sizeConverted( _GuiView.sdTotal, 1000, 3))]
+
+ delegate: Text {
+ anchors.right: _dialogColumn.right
+ color : Colors.dialogText
+ text : modelData
+ font.pixelSize : Fonts.fontPixelDialogText
+ }
+ }
+ }
+ }
+}
Index: sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml (revision 0)
+++ sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml (revision 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02)
@@ -0,0 +1,28 @@
+import QtQuick 2.12
+
+import "qrc:/components"
+import "qrc:/globals"
+
+HeaderBarPopup { id: _root
+ readonly property int pixelSize : Fonts.fontPixelDialogText
+ readonly property bool isConnected : vDevice.ssid !== ""
+
+ // TODO: Later add Securty type and signal strength if needed
+ contentItem: Column { id : _dialogColumn
+ anchors.centerIn : parent
+
+ Text { id: _ssid
+ text : ("%1: %2").arg(qsTr("SSID")).arg(vDevice.ssid)
+ color : Colors.dialogText
+ font.pixelSize : _root.pixelSize
+ visible : _root.isConnected
+ }
+
+ Text { id: _ipAddress
+ text : _root.isConnected ? ("%1: %2").arg(qsTr("IP")).arg(vDevice.ipAddress) :
+ qsTr(vDevice.ipAddress)
+ color : Colors.dialogText
+ font.pixelSize : _root.pixelSize
+ }
+ }
+}
Fisheye: Tag 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02 refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/SettingsDialog.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02 refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/StorageDialog.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 56c2adbc6e724c09d5ca9d61cb0a1581d46daf02 refers to a dead (removed) revision in file `sources/gui/qml/dialogs/headerbar/WiFiDialog.qml'.
Fisheye: No comparison available. Pass `N' to diff?