Index: denali.qrc
===================================================================
diff -u -r577ab4647b2584d4e32b26797281ec1543d2e1aa -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- denali.qrc (.../denali.qrc) (revision 577ab4647b2584d4e32b26797281ec1543d2e1aa)
+++ denali.qrc (.../denali.qrc) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -54,6 +54,7 @@
resources/images/Decelerate.png
resources/images/Busy.png
resources/images/BusyDone.png
+ resources/images/eject.png
sources/gui/qml/components/MainMenu.qml
@@ -67,7 +68,6 @@
sources/gui/qml/components/USBButton.qml
sources/gui/qml/components/ExportButton.qml
sources/gui/qml/components/TouchArea.qml
- sources/gui/qml/components/SettingsItem.qml
sources/gui/qml/components/TextRect.qml
sources/gui/qml/components/Background.qml
sources/gui/qml/components/Line.qml
Index: resources/images/eject.png
===================================================================
diff -u
Binary files differ
Index: sources/gui/qml/components/BackButton.qml
===================================================================
diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/BackButton.qml (.../BackButton.qml) (revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
+++ sources/gui/qml/components/BackButton.qml (.../BackButton.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -24,7 +24,7 @@
* \brief Denali project Back Button
*/
TouchRect { id : _root
- readonly property int margin: (_root.height - Variables.backIconDiameter) / 2
+ readonly property int margin: (_root.height - Variables.iconsDiameter) / 2
width : 120
height : 50
anchors {
@@ -40,8 +40,8 @@
verticalCenter: parent.verticalCenter
}
- width : Variables.backIconDiameter
- height: Variables.backIconDiameter
+ width : Variables.iconsDiameter
+ height: Variables.iconsDiameter
source: "qrc:/images/iBack"
}
Index: sources/gui/qml/components/CloseButton.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/CloseButton.qml (.../CloseButton.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/CloseButton.qml (.../CloseButton.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -32,10 +32,10 @@
right : parent.right
margins : 35
}
- Image {
- source: "qrc:/images/iClose"
- width : 25
- height : 25
+ Image { id : _image
+ source : "qrc:/images/iClose"
+ width : Variables.iconsDiameter
+ height : Variables.iconsDiameter
anchors.centerIn: parent
}
MouseArea {
Index: sources/gui/qml/components/ImageLogoD.qml
===================================================================
diff -u -rd619b1355f03ab8e2e53956908bda66fea542224 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/ImageLogoD.qml (.../ImageLogoD.qml) (revision d619b1355f03ab8e2e53956908bda66fea542224)
+++ sources/gui/qml/components/ImageLogoD.qml (.../ImageLogoD.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -36,8 +36,8 @@
Image { id: _image
anchors.centerIn: parent
- width : Variables.logoWidth
- height: Variables.logoHeight
+ width : Variables.logoDiameter
+ height: Variables.logoDiameter
source: "qrc:/images/iLogoD"
}
}
Index: sources/gui/qml/components/ImageLogoDDarkTransparent.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/ImageLogoDDarkTransparent.qml (.../ImageLogoDDarkTransparent.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ImageLogoDDarkTransparent.qml (.../ImageLogoDDarkTransparent.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -29,8 +29,8 @@
Image { id: _image
anchors.centerIn: parent
- width : Variables.logoWidth
- height: Variables.logoHeight
+ width : Variables.logoDiameter
+ height: Variables.logoDiameter
source: "qrc:/images/iLogoDDT"
}
}
Index: sources/gui/qml/components/MuteButton.qml
===================================================================
diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
+++ sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -33,10 +33,10 @@
anchors.fill: _root
leftPadding: 10
spacing: 5
- Image { id: _muteImage
+ Image { id: _image
anchors.verticalCenter: parent.verticalCenter
- height : 25
- width : 25
+ height : Variables.iconsDiameter
+ width : Variables.iconsDiameter
source : _root.isSilenced ? "qrc:/images/iBellOff" : "qrc:/images/iBellOn"
}
Index: sources/gui/qml/components/NotificationBar.qml
===================================================================
diff -u -r2230a5b1b891f47b64165164710aa680ddfc7040 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040)
+++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -28,7 +28,7 @@
property alias isSilenced : _muteButton.isSilenced
property alias timeout : _muteButton.timeout
property alias backgroundColor : _root.color
- property alias iconVisible : _icon.visible
+ property alias iconVisible : _muteImage.visible
property bool enableMute : true
clip : true // the mute button expands so we need to clip the outside unwanted area.
@@ -47,8 +47,7 @@
signal listClicked()
signal maximizeClicked()
- Image {
- id: _icon
+ Image { id: _muteImage
source: "qrc:/images/iAlarm"
anchors.right: _text.left
anchors.rightMargin: Variables.notificationBarIconMargin;
@@ -113,10 +112,10 @@
rightMargin : Variables.silenceIconMargin * 2
}
- Image { id: _image
+ Image { id: _alarmListImage
anchors.centerIn: parent
- height : 25
- width : 25
+ height : Variables.iconsDiameter
+ width : Variables.iconsDiameter
source : "qrc:/images/iList"
}
Index: sources/gui/qml/components/NotificationBarSmall.qml
===================================================================
diff -u -rf7392d985121b21e9f9814e444b0810cd1d00b18 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision f7392d985121b21e9f9814e444b0810cd1d00b18)
+++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -51,8 +51,8 @@
anchors.centerIn: parent
spacing: 10
Image { id: _image
- width : source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconSize
- height: source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconSize
+ width : source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconDiameter
+ height: source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconDiameter
anchors.verticalCenter : imageAutoSize ? parent.verticalCenter : undefined
anchors.top : imageAutoSize ? undefined : parent.top
anchors.topMargin : height > _root.height ? -((height - _root.height) / 2) : 0
Fisheye: Tag 1a8e9578b27bb3877116675d0b2361ce4f5b5539 refers to a dead (removed) revision in file `sources/gui/qml/components/SettingsItem.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/components/USBButton.qml
===================================================================
diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/USBButton.qml (.../USBButton.qml) (revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
+++ sources/gui/qml/components/USBButton.qml (.../USBButton.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -24,7 +24,12 @@
width: 50
height: width
x: width - 10
- text.text: qsTr("USB")
+ Image { id: _image
+ width : Variables.iconsDiameter
+ height : Variables.iconsDiameter
+ anchors.centerIn: parent
+ source : "qrc:/images/iEject"
+ }
text.font.pixelSize: Fonts.fontPixelButton * 0.75
onPressed : {
_GuiView.doUSBDriveUmount()
Index: sources/gui/qml/components/UpDownButton.qml
===================================================================
diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
+++ sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -30,8 +30,8 @@
Image { id: _image
anchors.centerIn: parent
- height : 25
- width : 25
+ height : Variables.iconsDiameter
+ width : Variables.iconsDiameter
source : _root.isUp ? "qrc:/images/iChevronUp" : "qrc:/images/iChevronDown"
}
}
Index: sources/gui/qml/dialogs/AlarmListDialog.qml
===================================================================
diff -u -r2230a5b1b891f47b64165164710aa680ddfc7040 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040)
+++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -52,8 +52,8 @@
anchors.horizontalCenter: _title.horizontalCenter
anchors.verticalCenter: _title.verticalCenter
anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset;
- height : 45
- width : 45
+ height : Variables.alarmListIconDiameter
+ width : Variables.alarmListIconDiameter
}
Text { id: _title
Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -r2230a5b1b891f47b64165164710aa680ddfc7040 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040)
+++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -68,8 +68,8 @@
anchors.horizontalCenter: _title.horizontalCenter
anchors.verticalCenter: _title.verticalCenter
anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset;
- height : 45
- width : 45
+ height : Variables.alarmListIconDiameter
+ width : Variables.alarmListIconDiameter
}
Text { id: _title
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r2230a5b1b891f47b64165164710aa680ddfc7040 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2230a5b1b891f47b64165164710aa680ddfc7040)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -38,15 +38,18 @@
readonly property int minVGap : 15
readonly property int minVGap2 : 30
- readonly property int logoWidth : 50
- readonly property int logoHeight : 50
+ readonly property int logoDiameter : 50
+ readonly property int iconsDiameter : 25
+
readonly property int largeArrowWidth : 24
readonly property int largeArrowHeight : 32
readonly property int arrowWidth : 12
readonly property int arrowHeight : 16
+ readonly property int alarmListIconDiameter : 45
+
readonly property int borderWidth : 2
readonly property int touchRectWidth : 512 //K:D //425
@@ -88,12 +91,11 @@
readonly property int treatmentSpacing : 60
readonly property int notificationHeight : 60
- readonly property int notificationIconSize : 36
+ readonly property int notificationIconDiameter : 36
readonly property int checkListViewItemWidth : 350
readonly property int checkListViewItemHeight : 60
- readonly property int backIconDiameter : 17
readonly property int pauseIconDiameter : 60
readonly property int topBarMenuHeight : 100
Index: sources/gui/qml/pages/settings/SettingsHome.qml
===================================================================
diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -r1a8e9578b27bb3877116675d0b2361ce4f5b5539
--- sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793)
+++ sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539)
@@ -50,13 +50,13 @@
TouchRect { id : _clearAlarmCondition
objectName: "_clearAlarmCondition"
width : 300
- height : Variables.logoHeight
+ height : Variables.logoDiameter
animated: true
anchors {
top : parent.top
right : _usbButton.left
- topMargin : (Variables.headerHeight - Variables.logoHeight) / 2
- rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+ topMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
+ rightMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
}
text.text: qsTr("Clear Alarm Condition")
onClicked: {
@@ -68,8 +68,8 @@
anchors {
top : parent.top
right : _exportButton.left
- topMargin : (Variables.headerHeight - Variables.logoHeight) / 2
- rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+ topMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
+ rightMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
}
}
@@ -79,19 +79,19 @@
anchors {
top : parent.top
right : _poweroffButton.left
- topMargin : (Variables.headerHeight - Variables.logoHeight) / 2
- rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+ topMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
+ rightMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
}
}
TouchRect { id : _poweroffButton
width: 150
- height: Variables.logoHeight
+ height: Variables.logoDiameter
anchors {
top : parent.top
right : parent.right
- topMargin : (Variables.headerHeight - Variables.logoHeight) / 2
- rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+ topMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
+ rightMargin : (Variables.headerHeight - Variables.logoDiameter) / 2
}
text.text: qsTr("Shutdown")
onPressed: {