Index: SDDs/HeaderBar/images/Bluetooth.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/ButtonRow.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/CloudSync.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/DateText.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/DateTime.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/HeaderBar.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/Highlight.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/Information.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/MainMenu.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/MenuRow.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/Prescription.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/Settings.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/Storage.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/Thumbs.db
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/TimeText.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/Wifi.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/main.dot
===================================================================
diff -u
--- SDDs/HeaderBar/main.dot (revision 0)
+++ SDDs/HeaderBar/main.dot (revision cf4466dfa9b676d38cf535e2c1a23b14a83ea8b5)
@@ -0,0 +1,74 @@
+digraph HeaderBar {
+ bgcolor=lightgray
+ margin=50
+ ordering=out;
+
+ // Prefix: q - Qt component, d - Diality component, i - image
+ // Define the main componenets
+ dTopLevelComponent [shape=box, label="HeaderBar.qml\nRectangle", fontsize="30pt"];
+ dMainMenu [shape=box, label="MainMenu.qml\nItem", fontsize="30pt"];
+ dWifiButton [shape=box, label="IconButton.qml\nTouchRect.qml", fontsize="30pt"];
+ dCloudSyncButton [shape=box, label="IconButton.qml\nTouchRect.qml", fontsize="30pt"];
+ dBlueToothButton [shape=box, label="IconButton.qml\nTouchRect.qml", fontsize="30pt"];
+ dSettingsButton [shape=box, label="IconButton.qml\nTouchRect.qml", fontsize="30pt"];
+ dPrescriptionButton [shape=box, label="IconButton.qml\nTouchRect.qml", fontsize="30pt"];
+ dInformationButton [shape=box, label="IconButton.qml\nTouchRect.qml", fontsize="30pt"];
+ dStorageButton [shape=box, label="IconButton.qml\nTouchRect.qml", fontsize="30pt"];
+
+ // screenshots
+ iHeaderBar [shape=none, label="", image="images/HeaderBar.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iDateTime [shape=none, label="", image="images/DateTime.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iDateText [shape=none, label="", image="images/DateText.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iTimeText [shape=none, label="", image="images/TimeText.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iMainMenu [shape=none, label="", image="images/MainMenu.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iHighlight [shape=none, label="", image="images/Highlight.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iButtonRow [shape=none, label="", image="images/ButtonRow.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iWifi [shape=none, label="", image="images/Wifi.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iSettings [shape=none, label="", image="images/Settings.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iPrescription [shape=none, label="", image="images/Prescription.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iBluetooth [shape=none, label="", image="images/Bluetooth.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iCloudSync [shape=none, label="", image="images/CloudSync.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iInformation [shape=none, label="", image="images/Information.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iStorage [shape=none, label="", image="images/Storage.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+ iMenuRow [shape=none, label="", image="images/MenuRow.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+
+ // qml types
+ qDateTimeItem [shape=ellipse, label="Item\nid: _dateTimeItem", fontsize="30pt"];
+ qDateTimeColumn [shape=ellipse, label="Column", fontsize="30pt"];
+ qTimeText [shape=ellipse, label="Text\nvDateTime.time", fontsize="30pt"];
+ qDateText [shape=ellipse, label="Text\nvDateTime.date", fontsize="30pt"];
+ qButtonRow [shape=ellipse, label="ButtonRow", fontsize="30pt"];
+ qWifiButton [shape=ellipse, label="Image", fontsize="30pt"];
+ qCloudSyncButton [shape=ellipse, label="Image", fontsize="30pt"];
+ qBlueToothButton [shape=ellipse, label="Image", fontsize="30pt"];
+ qSettingsButton [shape=ellipse, label="Image", fontsize="30pt"];
+ qPrescriptionButton [shape=ellipse, label="Image", fontsize="30pt"];
+ qInformationButton [shape=ellipse, label="Image", fontsize="30pt"];
+ qStorageButton [shape=ellipse, label="Image", fontsize="30pt"];
+ qHighlight [shape=ellipse, label="Rectangle\nid : _highlightRect", fontsize="30pt"];
+ qMenuRow [shape=ellipse, label="Row\nRepeater\nTouchRect", fontsize="30pt"];
+
+ // Diagram Layout
+ subgraph cluster_one {
+ label="Main Component"
+ fontsize="30pt"
+ labeljust=l
+
+ dTopLevelComponent -> iHeaderBar -> qDateTimeItem -> iDateTime -> qDateTimeColumn;
+ qDateTimeColumn -> qTimeText -> iTimeText;
+ qDateTimeColumn -> qDateText -> iDateText;
+
+ iHeaderBar -> dMainMenu -> iMainMenu
+ iMainMenu -> qHighlight -> iHighlight
+ iMainMenu -> qMenuRow -> iMenuRow
+
+ iHeaderBar -> qButtonRow -> iButtonRow
+ iButtonRow -> dPrescriptionButton -> iPrescription -> qPrescriptionButton
+ iButtonRow -> dSettingsButton -> iSettings -> qSettingsButton
+ iButtonRow -> dWifiButton -> iWifi -> qWifiButton
+ iButtonRow -> dBlueToothButton -> iBluetooth -> qBlueToothButton
+ iButtonRow -> dCloudSyncButton -> iCloudSync -> qCloudSyncButton
+ iButtonRow -> dStorageButton ->iStorage -> qStorageButton
+ iButtonRow -> dInformationButton -> iInformation -> qInformationButton
+ }
+}
Index: leahi.qrc
===================================================================
diff -u -r3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5 -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5
--- leahi.qrc (.../leahi.qrc) (revision 3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5)
+++ leahi.qrc (.../leahi.qrc) (revision cf4466dfa9b676d38cf535e2c1a23b14a83ea8b5)
@@ -81,6 +81,10 @@
resources/images/PauseOrange.png
resources/images/arrowsExpanding.png
resources/images/HomeBackground.png
+ resources/images/Bluetooth.png
+ resources/images/CloudSync.png
+ resources/images/Information.png
+ resources/images/Storage.png
sources/gui/qml/components/MainMenu.qml
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5 -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision cf4466dfa9b676d38cf535e2c1a23b14a83ea8b5)
@@ -27,10 +27,10 @@
bottom : parent.bottom
margins : 10
}
- Column {
+ Column { id: _dateTimeColumn
spacing : 0
anchors.fill: parent
- Text {
+ Text { id: _timeText
color : Colors.textMain
width : parent.width
height : parent.height * 3/5
@@ -39,7 +39,7 @@
text : vDateTime.time
font.pixelSize: 40
}
- Text {
+ Text { id: _dateText
color : Colors.textMain
width : parent.width
height : parent.height * 2/5
@@ -123,7 +123,7 @@
bottom : parent.bottom
}
height : parent.height
- width : parent.width
+ width : parent.width / 2
position : MainMenu.Position.Top
hidden : true
visible : ! hidden
@@ -165,5 +165,37 @@
onPressed: print("Wifi button pressed!")
}
+
+ IconButton { id : _bluetoothButton
+ iconSize : Variables.headerIconDiameter
+ iconImageSource : "qrc:/images/iBluetooth"
+ extraSpace : Variables.defaultMargin * 2
+
+ onPressed: print("Bluetooth button pressed!")
+ }
+
+ IconButton { id : _cloudSyncButton
+ iconSize : Variables.headerIconDiameter
+ iconImageSource : "qrc:/images/iCloudSync"
+ extraSpace : Variables.defaultMargin * 2
+
+ onPressed: print("CloudSync button pressed!")
+ }
+
+ IconButton { id : _storageButton
+ iconSize : Variables.headerIconDiameter
+ iconImageSource : "qrc:/images/iStorage"
+ extraSpace : Variables.defaultMargin * 2
+
+ onPressed: print("Storage button pressed!")
+ }
+
+ IconButton { id : _informationButton
+ iconSize : Variables.headerIconDiameter
+ iconImageSource : "qrc:/images/iInformation"
+ extraSpace : Variables.defaultMargin * 2
+
+ onPressed: print("Information button pressed!")
+ }
}
}
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -r3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5 -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5
--- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 3ef1a4ff361ba1774ad1a6f6170dbb174cadbdd5)
+++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision cf4466dfa9b676d38cf535e2c1a23b14a83ea8b5)
@@ -36,7 +36,6 @@
property int position : MainMenu.Position.Bottom
property bool hasRightText : false
property int rightTextGaps : 20
- property bool hasLogo : false
property int currentIndex : 0
property string currentTitle : titles[currentIndex] === undefined ? null : titles[currentIndex]
property bool disable : false
@@ -88,7 +87,6 @@
property alias leftPdding : _row.leftPadding
property alias rightPdding : _row.rightPadding
-
clip: true
x: 0
y: Variables.applicationHeight - Variables.mainMenuHeight
@@ -108,11 +106,6 @@
anchors.fill: parent
}
- ImageLogoDDarkTransparent { id: _image
- visible: hasLogo
- anchors.centerIn: parent
- }
-
// normal texts with highlighter bottom ribon.
Row { id: _row
anchors.fill: parent