Index: leahi.qrc
===================================================================
diff -u -rb1611462da7580dc1eb5168d5054e31624a131ca -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057
--- leahi.qrc (.../leahi.qrc) (revision b1611462da7580dc1eb5168d5054e31624a131ca)
+++ leahi.qrc (.../leahi.qrc) (revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
@@ -46,6 +46,7 @@
sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml
sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml
sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml
+ sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml
resources/images/Logo d.png
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rb1611462da7580dc1eb5168d5054e31624a131ca -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision b1611462da7580dc1eb5168d5054e31624a131ca)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
@@ -68,27 +68,13 @@
}
}
- Text { id: _version // TEST : Application version should be moved into the information screen later.
+ Text { id: _timeZone // TEST : Current timezone
color : Colors.textMain
anchors {
top : parent.top
left : parent.left
+ leftMargin : parent.width / 5
}
- horizontalAlignment : Text.AlignHCenter
- verticalAlignment : Text.AlignBottom
-
- height : 15
- width : _root.width / 4
- text : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]"
- font.pixelSize: 14
- }
-
- Text { id: _timeZone // TEST : Current timezone
- color : Colors.textMain
- anchors {
- top : parent.top
- left : _version.right
- }
horizontalAlignment : Text.Alignleft
verticalAlignment : Text.AlignBottom
@@ -143,6 +129,7 @@
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iBluetooth"
extraSpace : _headerButtonRow.spacing
+ enabled : false
onPressed : print("Bluetooth button pressed!")
}
@@ -151,6 +138,7 @@
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iCloudSync"
extraSpace : _headerButtonRow.spacing
+ enabled : false
onPressed : print("CloudSync button pressed!")
}
@@ -176,7 +164,7 @@
iconImageSource : "qrc:/images/iInformation"
extraSpace : _headerButtonRow.spacing
- onPressed : print("Information button pressed!")
+ onPressed : _headerbarInformation.openDialog(_informationButton)
}
}
}
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rb1611462da7580dc1eb5168d5054e31624a131ca -re1ecb77ba0ff9619b7363f14e1ed3c3e110c4057
--- sources/gui/qml/main.qml (.../main.qml) (revision b1611462da7580dc1eb5168d5054e31624a131ca)
+++ sources/gui/qml/main.qml (.../main.qml) (revision e1ecb77ba0ff9619b7363f14e1ed3c3e110c4057)
@@ -324,17 +324,23 @@
anchors.top: parent.top
}
+ GuiView { id: _GuiView
+ // Component.onCompleted: {
+ // console.debug("GuiView - complete")
+ // }
+ }
// keyboard should always be before AlarmItem to not to covet it.
- KeyboardItem { id: _keyboard }
+ KeyboardItem { id: _keyboard }
- HeaderbarWiFi { id: _headerbarWifi }
- HeaderbarStorage { id: _headerbarStorage }
- HeaderbarSettings { id: _headerbarSettings }
- LockDialog { id: _lockDialog }
- AlarmItem { id: _alarmItem ; z: 996 }
- PowerItem { id: _powerItem ; z: 997 }
- ConfirmDialog { id: _confirmDialog ; z: 998 }
- DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
+ HeaderbarWiFi { id: _headerbarWifi }
+ HeaderbarStorage { id: _headerbarStorage }
+ HeaderbarSettings { id: _headerbarSettings }
+ HeaderbarInformation { id: _headerbarInformation }
+ LockDialog { id: _lockDialog }
+ AlarmItem { id: _alarmItem ; z: 996 }
+ PowerItem { id: _powerItem ; z: 997 }
+ ConfirmDialog { id: _confirmDialog ; z: 998 }
+ DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
// Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
// then cannot be anchored.
@@ -349,10 +355,4 @@
timeout : _alarmItem.timeout
z : 995
}
-
- GuiView { id: _GuiView
- // Component.onCompleted: {
- // console.debug("GuiView - complete")
- // }
- }
}