Index: leahi.qrc =================================================================== diff -u -r44eb40bd3d3676d972c035a8fad1bf51eb01f4af -r6d75606a09a42cd8477aaadbc652171a6623b520 --- leahi.qrc (.../leahi.qrc) (revision 44eb40bd3d3676d972c035a8fad1bf51eb01f4af) +++ leahi.qrc (.../leahi.qrc) (revision 6d75606a09a42cd8477aaadbc652171a6623b520) @@ -44,6 +44,8 @@ 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/InformationDialog.qml @@ -96,6 +98,7 @@ resources/images/CloudSync.png resources/images/Information.png resources/images/Storage.png + resources/images/help.png sources/gui/qml/components/MainMenu.qml @@ -143,14 +146,12 @@ sources/gui/qml/components/DebugDataColumn.qml sources/gui/qml/components/RangeSlider.qml sources/gui/qml/components/MuteButton.qml - sources/gui/qml/components/UpDownButton.qml sources/gui/qml/components/ImageText.qml sources/gui/qml/components/WaitDone.qml sources/gui/qml/components/TimeCircle.qml sources/gui/qml/components/Footer.qml sources/gui/qml/components/TextEntry.qml sources/gui/qml/components/ScrollBar.qml - sources/gui/qml/compounds/Fader.qml sources/gui/qml/components/FooterStatic.qml sources/gui/qml/components/TimeEntry.qml sources/gui/qml/components/Label.qml @@ -162,6 +163,7 @@ sources/gui/qml/components/ArrowButton.qml sources/gui/qml/components/HeaderBar.qml sources/gui/qml/components/HeaderBarPopup.qml + sources/gui/qml/components/AlarmButtonRow.qml sources/gui/qml/compounds/PressureRangeSlider.qml Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -r6d75606a09a42cd8477aaadbc652171a6623b520 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 6d75606a09a42cd8477aaadbc652171a6623b520) @@ -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 : _informationDialog.openDialog(_informationButton) } } } Index: sources/gui/qml/main.qml =================================================================== diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -r6d75606a09a42cd8477aaadbc652171a6623b520 --- sources/gui/qml/main.qml (.../main.qml) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15) +++ sources/gui/qml/main.qml (.../main.qml) (revision 6d75606a09a42cd8477aaadbc652171a6623b520) @@ -330,6 +330,7 @@ WiFiDialog { id: _wifiDialog } StorageDialog { id: _storageDialog } SettingsDialog { id: _settingsDialog } + InformationDialog { id: _informationDialog } LockDialog { id: _lockDialog } AlarmItem { id: _alarmItem ; z: 996 } PowerItem { id: _powerItem ; z: 997 } @@ -349,10 +350,4 @@ timeout : _alarmItem.timeout z : 995 } - - GuiView { id: _GuiView - // Component.onCompleted: { - // console.debug("GuiView - complete") - // } - } }