Index: sources/gui/qml/components/BaseSwitch.qml =================================================================== diff -u -r01a8c935f7d90ce3b168970765c0f20ea0c1a273 -r3d5bd682a4dc4bd36e26ca17067bafd489fa970b --- sources/gui/qml/components/BaseSwitch.qml (.../BaseSwitch.qml) (revision 01a8c935f7d90ce3b168970765c0f20ea0c1a273) +++ sources/gui/qml/components/BaseSwitch.qml (.../BaseSwitch.qml) (revision 3d5bd682a4dc4bd36e26ca17067bafd489fa970b) @@ -29,8 +29,8 @@ implicitHeight : Variables.sliderCircleDiameter + ( _root.margin * 2 ) radius : implicitHeight anchors.centerIn: parent - color : _root.checked ? Colors.backgroundButtonSelect : Colors.createTreatmentInactive - border.color : _root.checked ? Colors.borderButton : Colors.createTreatmentInactive + color : _root.checked && _root.active ? Colors.backgroundButtonSelect : Colors.createTreatmentInactive + border.color : _root.checked && _root.active ? Colors.borderButton : Colors.createTreatmentInactive Rectangle { x: _root.checked ? parent.width - width - _root.margin : _root.margin Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -re7adb742d7dd362b2deb795259694b223eea3bc0 -r3d5bd682a4dc4bd36e26ca17067bafd489fa970b --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision e7adb742d7dd362b2deb795259694b223eea3bc0) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 3d5bd682a4dc4bd36e26ca17067bafd489fa970b) @@ -63,12 +63,10 @@ top : parent.top left : parent.left bottom : parent.bottom - margins : 5 } Column { id: _dateTimeColumn anchors.fill: parent - spacing : 5 Text { id: _timeText color : Colors.textMain Index: sources/gui/qml/dialogs/ConfirmDialog.qml =================================================================== diff -u -re7adb742d7dd362b2deb795259694b223eea3bc0 -r3d5bd682a4dc4bd36e26ca17067bafd489fa970b --- sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision e7adb742d7dd362b2deb795259694b223eea3bc0) +++ sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision 3d5bd682a4dc4bd36e26ca17067bafd489fa970b) @@ -53,7 +53,7 @@ TitleText { id: _messageText anchors.centerIn : parent - anchors.verticalCenterOffset: Variables.defaultMargin * -1 + anchors.verticalCenterOffset: Variables.defaultMargin * -3 width : parent.width height : Variables.mainMenuHeight * 4 // title + reason + 2*Gap clip : true Index: sources/gui/qml/pages/settings/SettingsDateTime.qml =================================================================== diff -u -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f -r3d5bd682a4dc4bd36e26ca17067bafd489fa970b --- sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f) +++ sources/gui/qml/pages/settings/SettingsDateTime.qml (.../SettingsDateTime.qml) (revision 3d5bd682a4dc4bd36e26ca17067bafd489fa970b) @@ -22,6 +22,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" /*! * \brief SettingsDateTimeSet is used to adjust the @@ -61,95 +62,104 @@ } contentItem: Column { id: _container - spacing: 70 - Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } } + spacing : 25 - Row { // time - spacing: 5 - anchors.horizontalCenter: parent.horizontalCenter - Text { id: _timeLabel - width: labelWidth - text: qsTr("Time (HH:MM)") - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTextRectExtra - } + LabelUnitContainer { id: _timeContainer + anchors.horizontalCenter : parent.horizontalCenter + width : Variables.adjustmentLabelUnitContainerWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Time") + unitText : qsTr("HH:MM") - TextEntry { id : _hours - nextInput : _minutes - label.visible : false - width : entryWidth - validator : IntValidator { - bottom : 0 - top : 23 + contentItem: Row { // time + spacing : 10 + anchors.centerIn: parent + + TextEntry { id: _hours + nextInput : _minutes + line.visible : false + width : entryWidth + showPlaceHolderText : true + validator : IntValidator { + bottom : 0 + top : 23 + } + textInput.font.pixelSize: Fonts.fontPixelValueControl } - } - Text { id : _colon - text : qsTr(":") - color : Colors.textMain - font.pixelSize : Fonts.fontPixelTextRectExtra - } + Label { + text : qsTr(":") + width : 10 + } - TextEntry { id : _minutes - nextInput : _month - label.visible : false - width : entryWidth - validator : IntValidator { - bottom : 0 - top : 59 + TextEntry { id: _minutes + nextInput : _month + line.visible : false + width : entryWidth + showPlaceHolderText : true + validator : IntValidator { + bottom : 0 + top : 59 + } + textInput.font.pixelSize: Fonts.fontPixelValueControl } } } - Row { // date - spacing: 5 - anchors.horizontalCenter: parent.horizontalCenter + LabelUnitContainer { id: _dateContainer + anchors.horizontalCenter : parent.horizontalCenter + width : Variables.adjustmentLabelUnitContainerWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Date") + unitText : qsTr("MM/DD/YYYY") - Text { id : _dateLabel - width : labelWidth - text : qsTr("Date (MM/DD/YYYY)") - color : Colors.textMain - font.pixelSize : Fonts.fontPixelTextRectExtra - } + contentItem: Row { // time + spacing : 10 + anchors.centerIn: parent - TextEntry { id : _month - nextInput : _day - label.visible : false - width : entryWidth - validator : IntValidator { - bottom : 1 - top : 12 + TextEntry { id: _month + nextInput : _day + line.visible : false + width : entryWidth + showPlaceHolderText : true + validator : IntValidator { + bottom : 1 + top : 12 + } + textInput.font.pixelSize: Fonts.fontPixelValueControl } - } - Text { id : _slashMonthDay - text : qsTr("/") - color : Colors.textMain - font.pixelSize : Fonts.fontPixelTextRectExtra - } + Label { id : _slashMonthDay + text : qsTr(":") + width : 10 + } - TextEntry { id : _day - nextInput : _year - label.visible : false - width : entryWidth - validator : IntValidator { - bottom : 1 - top : 31 + TextEntry { id: _day + nextInput : _year + line.visible : false + width : entryWidth + showPlaceHolderText : true + validator : IntValidator { + bottom : 1 + top : 31 + } + textInput.font.pixelSize: Fonts.fontPixelValueControl } - } - Text { id : _slashDayYear - text : qsTr("/") - color : Colors.textMain - font.pixelSize : Fonts.fontPixelTextRectExtra - } + Label { id : _slashDayYear + text : qsTr(":") + width : 10 + } - TextEntry { id : _year - label.visible : false - width : entryWidth - validator : IntValidator { - bottom : 1970 - top : 2100 // seems date command is not accepting more than 2100 + TextEntry { id: _year + line.visible : false + width : entryWidth + showPlaceHolderText : true + validator : IntValidator { + bottom : 1970 + top : 2100 // seems date command is not accepting more than 2100 + } + textInput.font.pixelSize: Fonts.fontPixelValueControl } } } Index: sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml =================================================================== diff -u -r33f808e5b8d9134231fc0d016bfb16605c2de812 -r3d5bd682a4dc4bd36e26ca17067bafd489fa970b --- sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml (.../SettingsRootSSHAccess.qml) (revision 33f808e5b8d9134231fc0d016bfb16605c2de812) +++ sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml (.../SettingsRootSSHAccess.qml) (revision 3d5bd682a4dc4bd36e26ca17067bafd489fa970b) @@ -34,7 +34,7 @@ confirmVisible : false contentItem: Column { - spacing : 20 + spacing : 25 LabelUnitContainer { id: _settingsRootSSHAccess_SSHDRow anchors.horizontalCenter : parent.horizontalCenter Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r3d5bd682a4dc4bd36e26ca17067bafd489fa970b --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 3d5bd682a4dc4bd36e26ca17067bafd489fa970b) @@ -48,8 +48,9 @@ void VDateTime::onSetDateUIErrored(QProcess::ProcessError error){ QString mScript = Storage::Scripts_Path_Name(); mScript += Storage::Date_Time_Set_Sh; - LOG_DEBUG(QString("%1 errored. Error %2").arg(mScript).arg(error)); - //DEBUG: qDebug()<< QString("%1 errored. Error ").arg(mScript) << error; + QString errorString = QString("%1 errored. Error %2").arg(mScript).arg(error); + LOG_DEBUG(errorString); + status(errorString); } /*! @@ -106,14 +107,8 @@ status("Setting date and time ..."); dateTimeUI(dateTimeLocalStr ); - dateTimeHD(epochUTC_sec ); - dateTimeDG(epochUTC_sec ); - - //DEBUG: QDateTime convertBack; - //DEBUG: convertBack.setSecsSinceEpoch(epochUTC_sec); - //DEBUG: qDebug()<<"Secs since Epoch" << convertBack.toSecsSinceEpoch() << " UTC: " << convertBack.toUTC().toString(_Settings.getDatetimeFormat()); - - //DEBUG: qDebug() << "doConfirm RTC | epoch : " << epochUTC_sec << " | local: " << currentDateTimeLocal.toString(_Settings.getDatetimeFormat()) << " | current time zone: " << currentDateTimeLocal.timeZone() << " | UTC: " << currentDateTimeUTC.toString(_Settings.getDatetimeFormat()) ; + dateTimeHD(epochUTC_sec ); // ??? TODO + dateTimeDG(epochUTC_sec ); // ??? TODO } /*!