Index: denali.pro =================================================================== diff -u -rcb7aaf6a2207a1112a086676391d504bafbc58e4 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- denali.pro (.../denali.pro) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) +++ denali.pro (.../denali.pro) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -90,6 +90,7 @@ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \ sources/model/hd/adjustment/MAdjustHDDateTimeResponse.h \ sources/model/hd/adjustment/MAdjustHDServiceResponse.h \ + sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \ @@ -258,6 +259,7 @@ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \ sources/model/hd/adjustment/MAdjustHDDateTimeResponse.cpp \ sources/model/hd/adjustment/MAdjustHDServiceResponse.cpp \ + sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r8a08d20dadae71373b8eb12c4febdbb4d4669cff -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8a08d20dadae71373b8eb12c4febdbb4d4669cff) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -86,6 +86,7 @@ {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 1 }, // 1 parameter each 1bytes {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmVolumeSetReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmVolumeSetRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TreatmentStartReq , 1 * 4 }, // 1 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rcb7aaf6a2207a1112a086676391d504bafbc58e4 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -363,6 +363,7 @@ case Gui::GuiActionType::ID_AdjustHDVersionsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; case Gui::GuiActionType::ID_HDAdjustServiceRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAdjustServiceRsp ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>() Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rcb7aaf6a2207a1112a086676391d504bafbc58e4 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -103,6 +103,7 @@ ID_AlarmSilenceReq = 0x3200, // 50 ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD ID_AlarmVolumeSetReq = 0x4E00, // 78 + ID_AlarmVolumeSetRsp = 0x7C00, // 124 // Pre-Treatment Parameters ID_TreatmentCreateReq = 0x3500, // 53 Index: sources/gui/qml/pages/SettingsAlarmVolume.qml =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsAlarmVolume.qml (.../SettingsAlarmVolume.qml) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/gui/qml/pages/SettingsAlarmVolume.qml (.../SettingsAlarmVolume.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -15,7 +15,7 @@ */ ScreenItem { id: _root - signal clickedBack() + signal backClicked() BackButton { id : _backButton anchors { @@ -25,8 +25,7 @@ } onClicked: { - vAlarmVolume.doCancelAlarmVolume() - _root.clickedBack() + _root.backClicked() } } @@ -38,8 +37,7 @@ } onClicked: { - vAlarmVolume.doConfirmAlarmVolume() - _root.clickedBack() + vAlarmVolume.doConfirmAlarmVolume(_volume.value) } } @@ -80,10 +78,6 @@ selectedValue.visible: false slider.minText.visible: false slider.maxText.visible: false - - onReleased: { - vAlarmVolume.doSetAlarmVolume(_volume.value) - } } Text { @@ -109,13 +103,19 @@ right: _volume.right } } - } - onVisibleChanged: { - if (visible) { - vAlarmVolume.editingAlarmVolume = true - } else { - vAlarmVolume.editingAlarmVolume = false - } + NotificationBarSmall { id: _notification + imageAutoSize: true + height : 25 + color: "transparent" + imageSource : "" + text : vAlarmVolume.status + textColor: Colors.textMain + textfontSize: Fonts.fontPixelTextRectExtra + anchors { + top: _volume.bottom + topMargin: Variables.settingsMargin + } + } } } Index: sources/gui/qml/pages/SettingsBluetooth.qml =================================================================== diff -u -r5600d2133dd0ea6dc1f733aa78bd26e2a4892a38 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 5600d2133dd0ea6dc1f733aa78bd26e2a4892a38) +++ sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -30,12 +30,12 @@ */ ScreenItem { id: _root - signal clickedBack() + signal backClicked() BackButton { id : _backButton onClicked: { vBluetooth.doSaveMyDevices() - _root.clickedBack() + _root.backClicked() } } Index: sources/gui/qml/pages/SettingsBrightness.qml =================================================================== diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsBrightness.qml (.../SettingsBrightness.qml) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79) +++ sources/gui/qml/pages/SettingsBrightness.qml (.../SettingsBrightness.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -15,7 +15,7 @@ */ ScreenItem { id: _root - signal clickedBack() + signal backClicked() BackButton { id : _backButton anchors { @@ -25,7 +25,7 @@ } onClicked: { - _root.clickedBack() + _root.backClicked() } } @@ -38,7 +38,7 @@ onClicked: { vBrightness.doSaveBrightness() - _root.clickedBack() + _root.backClicked() } } @@ -73,7 +73,7 @@ value: vBrightness.brightness min: vBrightness.brightnessMinimum max: vBrightness.brightnessMaximum - step: 1 + step: vBrightness.step selectedValue.visible: false slider.minText.visible: false Index: sources/gui/qml/pages/SettingsDateTimeSet.qml =================================================================== diff -u -rd1a6830c486a9ee9c388a80b570aa8141a8366c9 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsDateTimeSet.qml (.../SettingsDateTimeSet.qml) (revision d1a6830c486a9ee9c388a80b570aa8141a8366c9) +++ sources/gui/qml/pages/SettingsDateTimeSet.qml (.../SettingsDateTimeSet.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -29,12 +29,12 @@ */ ScreenItem { id: _root - signal clickedBack() + signal backClicked() BackButton { id : _backButton onClicked: { vBluetooth.doSaveMyDevices() - _root.clickedBack() + _root.backClicked() } } Index: sources/gui/qml/pages/SettingsDeviceInformation.qml =================================================================== diff -u -rfeb7724c8a7a2932650c5daa490c90923c9fbe77 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsDeviceInformation.qml (.../SettingsDeviceInformation.qml) (revision feb7724c8a7a2932650c5daa490c90923c9fbe77) +++ sources/gui/qml/pages/SettingsDeviceInformation.qml (.../SettingsDeviceInformation.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -30,11 +30,11 @@ */ ScreenItem { id: _root - signal clickedBack() + signal backClicked() BackButton { id : _backButton onClicked: { - _root.clickedBack() + _root.backClicked() } } Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -rcb7aaf6a2207a1112a086676391d504bafbc58e4 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -115,34 +115,34 @@ SettingsBluetooth { id: _bluetooth - onClickedBack: _settingsStack.pop() + onBackClicked: _settingsStack.pop() } SettingsWifi { id: _wifi - onClickedBack: _settingsStack.pop() + onBackClicked: _settingsStack.pop() } SettingsDeviceInformation { id: _deviceInformation - onClickedBack: _settingsStack.pop() + onBackClicked: _settingsStack.pop() } SettingsDateTimeSet { id: _dateTimeSet - onClickedBack: _settingsStack.pop() + onBackClicked: _settingsStack.pop() } SettingsAlarmVolume { id: _alarmVolume - onClickedBack: _settingsStack.pop() + onBackClicked: _settingsStack.pop() } SettingsBrightness { id: _brightness - onClickedBack: _settingsStack.pop() + onBackClicked: _settingsStack.pop() } Column { @@ -181,21 +181,20 @@ vDateTime.doGetCurrentTime() push(_dateTimeSet) } + visible: vServiceMode.isServiceMode } SettingsItem { id: _itemAlarmVolume title : qsTr("Alarm Volume") onClicked: { push(_alarmVolume) } - visible: vServiceMode.isServiceMode } SettingsItem { id: _itemBrightness title : qsTr("Brightness") onClicked: { vBrightness.doGetBrightness() push(_brightness) } - visible: vServiceMode.isServiceMode } } Index: sources/gui/qml/pages/SettingsWifi.qml =================================================================== diff -u -r091bc0425b84f094cbd863865a5edac2477208eb -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/gui/qml/pages/SettingsWifi.qml (.../SettingsWifi.qml) (revision 091bc0425b84f094cbd863865a5edac2477208eb) +++ sources/gui/qml/pages/SettingsWifi.qml (.../SettingsWifi.qml) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -30,11 +30,11 @@ */ ScreenItem { id: _root - signal clickedBack() + signal backClicked() BackButton { id : _backButton onClicked: { - _root.clickedBack() + _root.backClicked() } } Index: sources/model/MModel.h =================================================================== diff -u -rcb7aaf6a2207a1112a086676391d504bafbc58e4 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/model/MModel.h (.../MModel.h) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) +++ sources/model/MModel.h (.../MModel.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -77,6 +77,7 @@ #include "MAlarmVolumeData.h" #include "MAdjustHDServiceResponse.h" #include "MAdjustDGServiceResponse.h" +#include "MAdjustHDAlarmVolumeResponse.h" /*! * \page MessageFlow Message interpretation Flow @@ -289,6 +290,7 @@ REGISTER_METATYPE( DGSerialNumberResponseData ) \ REGISTER_METATYPE( AdjustHDServiceResponseData ) \ REGISTER_METATYPE( AdjustDGServiceResponseData ) \ + REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ //===============================================================================// /*! @@ -366,6 +368,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGSerialNumberResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDServiceResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ @@ -477,6 +480,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGSerialNumberResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDServiceResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGServiceResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ @@ -628,6 +632,7 @@ ACTION_RECEIVE_SIGNAL( DGSerialNumberResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDServiceResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGServiceResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.cpp (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -0,0 +1,45 @@ +/*! + * + * Copyright (c) 2021 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDAlarmVolumeResponse.cpp + * \author (last) Peter Lucia + * \date (last) 04-May-2021 + * \author (original) Peter Lucia + * \date (original) 04-May-2021 + * + */ +#include "MAdjustHDAlarmVolumeResponse.h" + +using namespace Model; + +QVariantList MAdjustHDAlarmVolumeResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustHDAlarmVolumeResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAdjustHDDateTimeResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustHDAlarmVolumeResponseData MAdjustHDAlarmVolumeResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.h (revision 0) +++ sources/model/hd/adjustment/MAdjustHDAlarmVolumeResponse.h (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -0,0 +1,82 @@ +/*! + * + * Copyright (c) 2021 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustHDAlarmVolumeResponse.h + * \author (last) Peter Lucia + * \date (last) 04-May-2021 + * \author (original) Peter Lucia + * \date (original) 04-May-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustHDAlarmVolumeResponse class + * \details The HD Alarm Volume adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------:| + * |0x7C00| 0x020 | Rsp | Y | HD | UI | Set Alarm Volume Rsp | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustHDAlarmVolume| + * + */ +class MAdjustHDAlarmVolumeResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted; + Types::U32 mReason ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("AdjustHDAlarmVolume") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustHDAlarmVolumeResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustHDAlarmVolumeResponse::Data AdjustHDAlarmVolumeResponseData; Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rcb7aaf6a2207a1112a086676391d504bafbc58e4 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision cb7aaf6a2207a1112a086676391d504bafbc58e4) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -497,12 +497,12 @@ }; /*! - * \brief The MAdjustVersionsReq class + * \brief The MAdjustAlarmVolumeReq class * \details The DG/HD versions request model * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| - * | 0x4E00 | 0x100 | Req | Y | UI | All | HD Set Alarm Volume Request | + * | 0x4E00 | 0x100 | Req | Y | UI | HD | HD Set Alarm Volume Request | * * | Payload || * | || @@ -523,8 +523,6 @@ static QString toString(const QVariantList &vParameters) { return MModel::toString("AlarmVolume", vParameters); } - - static Can::Can_Id canid () { return Can::eChlid_UI_HD; } }; /*! Index: sources/view/VAlarmVolume.cpp =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/view/VAlarmVolume.cpp (.../VAlarmVolume.cpp) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/view/VAlarmVolume.cpp (.../VAlarmVolume.cpp) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -21,52 +21,31 @@ ADJUST_VIEW_CONNECTION(AdjustAlarmVolumeRequestData) // responses - ACTION_VIEW_CONNECTION(AlarmVolumeData); + ACTION_VIEW_CONNECTION(AdjustHDAlarmVolumeResponseData); } /*! - * \brief VAlarmVolume::doSetAlarmVolume - * Sends a request to change the alarm volume - * \param vVolume - */ -void VAlarmVolume::doSetAlarmVolume(const quint32 &vVolume) -{ - alarmVolumeTemp(vVolume); - AdjustAlarmVolumeRequestData data; - data.volume = alarmVolumeTemp(); - emit didAdjustment(data); -} - -/*! * \brief VAlarmVolume::doConfirmAlarmVolume * Sets the alarm volume to the last volume level selected by the user */ -void VAlarmVolume::doConfirmAlarmVolume() +void VAlarmVolume::doConfirmAlarmVolume(const quint32 &vVolume) { - alarmVolume(alarmVolumeTemp()); + status(""); + alarmVolume(vVolume); AdjustAlarmVolumeRequestData data; data.volume = alarmVolume(); emit didAdjustment(data); } /*! - * \brief VAlarmVolume::doCancelAlarmVolume - * Reverts the alarm volume setting back to before editing began - */ -void VAlarmVolume::doCancelAlarmVolume() -{ - AdjustAlarmVolumeRequestData data; - data.volume = alarmVolume(); - emit didAdjustment(data); -} - -/*! * \brief VAlarmVolume::onActionReceive * When we receive a broadcast of the alarm volume from the HD * \param vData - (AlarmVolumeData) the alarm volume information */ -void VAlarmVolume::onActionReceive(const AlarmVolumeData &vData) +void VAlarmVolume::onActionReceive(const AdjustHDAlarmVolumeResponseData &vData) { - if (!editingAlarmVolume()) - alarmVolume(vData.mAlarmVolume); + if (vData.mAccepted) + status(tr("HD Accepted Alarm Volume %1/%2").arg(alarmVolume()).arg(alarmVolumeMaximum())); + else + status(tr("HD Rejected Alarm Volume %1 with reason %2").arg(alarmVolume(), vData.mReason)); } Index: sources/view/VAlarmVolume.h =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/view/VAlarmVolume.h (.../VAlarmVolume.h) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/view/VAlarmVolume.h (.../VAlarmVolume.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -8,7 +8,7 @@ #include "VView.h" #include "main.h" #include "GuiController.h" -#include "MAlarmVolumeData.h" +#include "MAdjustHDAlarmVolumeResponse.h" // forward declarations class tst_views; @@ -28,19 +28,16 @@ friend class ::tst_views; VIEW_DEC_CLASS(VAlarmVolume) -VIEW_DEC_SLOT(AlarmVolumeData) +VIEW_DEC_SLOT(AdjustHDAlarmVolumeResponseData) protected: + PROPERTY(QString, status, "") PROPERTY(quint32, alarmVolume, 5) - PROPERTY(quint32, alarmVolumeTemp, 5) PROPERTY(quint32, alarmVolumeMinimum, 1) PROPERTY(quint32, alarmVolumeMaximum, 5) - PROPERTY(bool, editingAlarmVolume, false) public slots: - void doSetAlarmVolume(const quint32 &vVolume); - void doConfirmAlarmVolume(); - void doCancelAlarmVolume(); + void doConfirmAlarmVolume(const quint32 &vVolume); signals: void didAdjustment(const AdjustAlarmVolumeRequestData &vData); Index: sources/view/VBrightness.h =================================================================== diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/view/VBrightness.h (.../VBrightness.h) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79) +++ sources/view/VBrightness.h (.../VBrightness.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -35,7 +35,8 @@ protected: PROPERTY(QString, status, "") PROPERTY(quint32, brightness, 10) - PROPERTY(quint32, brightnessMinimum, 1) + PROPERTY(quint32, step, 2) // PRS 134 + PROPERTY(quint32, brightnessMinimum, 2) PROPERTY(quint32, brightnessMaximum, 10) private: