Index: denali.pro.user =================================================================== diff -u -rcd7956150072dcb5264c891ee363074623052ead -r768259b3c00ee3fbc5ba04475763b43cfac76bfe --- denali.pro.user (.../denali.pro.user) (revision cd7956150072dcb5264c891ee363074623052ead) +++ denali.pro.user (.../denali.pro.user) (revision 768259b3c00ee3fbc5ba04475763b43cfac76bfe) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1221,7 +1221,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - --logOut --disable-timeout --disable-alarm-no-minimize --disable-unhandled-report --disable-check-in-log + --disable-timeout --disable-alarm-no-minimize --disable-unhandled-report --disable-check-in-log 3768 false true @@ -1544,7 +1544,7 @@ 1 false - --disable-timeout -disable-alarm-no-minimize --disable-unhandled-report + --disable-alarm-no-minimize --disable-timeout -disable-alarm-no-minimize --disable-unhandled-report 3768 false true Index: scripts/run.sh =================================================================== diff -u -r301c0a2101eb9374145ae274c8d91460fc9a6a62 -r768259b3c00ee3fbc5ba04475763b43cfac76bfe --- scripts/run.sh (.../run.sh) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) +++ scripts/run.sh (.../run.sh) (revision 768259b3c00ee3fbc5ba04475763b43cfac76bfe) @@ -89,8 +89,10 @@ if [ $? -eq 0 ]; then SDTEST="$(mount | grep "$SDCARD_DEV on $SDCARD_MNT.*(rw,")" if ! [ -z "$SDTEST" ]; then - echo $SDTEST >> $POSTLOG + SDINFO="$(df -h | grep -i $SDCARD_MNT)" echo $POSTMSG_SDCARD >> $POSTLOG + echo $SDTEST >> $POSTLOG + echo $SDINFO >> $POSTLOG fi fi Index: sources/gui/qml/SDItem.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r768259b3c00ee3fbc5ba04475763b43cfac76bfe --- sources/gui/qml/SDItem.qml (.../SDItem.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/SDItem.qml (.../SDItem.qml) (revision 768259b3c00ee3fbc5ba04475763b43cfac76bfe) @@ -33,6 +33,15 @@ signal clicked signal doubleClicked + readonly property int sizePowers : 1000000 + + function sdTotalConverted() { + return (_GuiView.sdTotal + /sizePowers // convert from byte to Giga byte + /1000) // round to 1000 + .toFixed(1) // round to 1 floating point + } + color : Colors.transparent anchors { top : parent.top @@ -55,10 +64,19 @@ anchors.fill: parent diameter: _root.width minimum : 0 - maximum : _GuiView.sdTotal / 1000000 // convert to MB since the value in byte is too big for ProgressCircle. - value : _GuiView.sdAvail / 1000000 // convert to MB since the value in byte is too big for ProgressCircle. + maximum : _GuiView.sdTotal / sizePowers // convert to MB since the value in byte is too big for ProgressCircle. + value : _GuiView.sdAvail / sizePowers // convert to MB since the value in byte is too big for ProgressCircle. color : ! _GuiView.sdIsReady ? "red" : _GuiView.sdIsReadOnly ? "gray" : _GuiView.sdIsLow ? Colors.red : "green" } + Text { id: _SDTotal + anchors.top: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + color : Colors.white + text : _root.sdTotalConverted() + visible : _GuiView.sdIsReady + font.pixelSize: 12 + font.bold: true + } MouseArea { id: _mouseArea anchors.fill : parent Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r768259b3c00ee3fbc5ba04475763b43cfac76bfe --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 768259b3c00ee3fbc5ba04475763b43cfac76bfe) @@ -138,6 +138,7 @@ itemPressed(index) } anchors.right: parent.right + anchors.rightMargin: parent.rightPdding anchors.verticalCenter: parent.verticalCenter } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r768259b3c00ee3fbc5ba04475763b43cfac76bfe --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 768259b3c00ee3fbc5ba04475763b43cfac76bfe) @@ -51,6 +51,7 @@ titles : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ] spacing : 20 leftPdding : 20 + rightPdding : 50 partitionWidth : 100 // Todo Important : max width should be the width for all bottons hasRightText : true hasLogo : true