Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r2721daffd0af06accf99ed7c9a1b5a7035f8634f -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 2721daffd0af06accf99ed7c9a1b5a7035f8634f) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 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 NotificationDialog.qml - * \author (last) Peter Lucia - * \date (last) 06-Oct-2020 - * \author (original) Peter Lucia - * \date (original) 02-Jun-2020 + * \file AlarmListDialog.qml + * \author (last) Behrouz NematiPour + * \date (last) 04-Aug-2021 + * \author (original) Behrouz NematiPour + * \date (original) 10-Dec-2020 * */ @@ -34,6 +34,7 @@ property alias isSilenced : _muteButton.isSilenced property alias timeout : _muteButton.timeout property int alarmID : -1 + property bool minVisible : true radius : Variables.dialogRadius @@ -73,12 +74,14 @@ } MouseArea { id: _minimizeArea + enabled : _root.minVisible anchors.fill: parent onClicked : _root.minimizeClicked() } UpDownButton { - isUp: false + isUp : false + isList : ! _root.minVisible anchors { verticalCenter : _titleBar.verticalCenter right : _titleBar.right @@ -126,7 +129,7 @@ bottomMargin : Variables.mainMenuHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } - width : Variables.dialogWidth - Variables.minVGap2 * 2 // * 2 : for each side + width : Variables.dialogWidth - Variables.minVGap * 2 // * 2 : for each side height : Variables.dialogHeight - Variables.minVGap * 2 - _titleBar.height // * 2 : for each side contentWidth : width contentHeight: _alarmGrid.height @@ -138,16 +141,16 @@ colCount : 1 rowCount : vAlarmActiveList.alarmIDs.length itemHeight : 80 - itemWidth : Variables.dialogWidth - Variables.minVGap2 * (2 + 1) // * 2 : for each side & + 1 to not cover the scrollbar + itemWidth : Variables.dialogWidth - Variables.minVGap * (2 + 1) // * 2 : for each side & the +1 to not cover the scrollbar rowSpacing : 0 - columnSpacing : 0 + colSpacing : 0 lineColor : Colors.backgroundMain itemsText : vAlarmActiveList.alarmIDs itemsValue : vAlarmActiveList.alarmTexts - itemsTouchable : [ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, ] // just kept one touchable as an example - itemsValueLeftMargin : 100 // if decreased maybe covered by title + itemsTouchable : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ] + itemsValueLeftMargin : 80 // if decreased maybe covered by title itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable - onItemClicked: _root.itemClicked(vIndex) + onItemClicked : _root.itemClicked(vIndex) } } }