ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust repeat combobox width when creating a rule

pull/1014/head
Michael Zanetti 2023-05-02 21:54:26 +02:00
parent 1c901d4c7d
commit 08039189ee
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nymea-app/ui/magic/EditCalendarItemPage.qml
View File

@ -91,7 +91,7 @@ Page {
GridLayout {
columns: app.landscape ? 2 : 1
Layout.alignment: app.landscape ? Qt.AlignHCenter : Qt.AlignLeft
Layout.margins: app.margins
Layout.margins: Style.margins
Layout.fillWidth: !app.landscape
Label {
@ -131,7 +131,7 @@ Page {
RowLayout {
Layout.fillHeight: !app.landscape
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
visible: root.isDateBased
ComboBox {
id: dayBox
@ -212,7 +212,7 @@ Page {
RowLayout {
Layout.fillHeight: !app.landscape
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
visible: root.isDateBased
ComboBox {
id: toDayBox
@ -263,15 +263,16 @@ Page {
Label {
text: qsTr("Repeat")
Layout.topMargin: app.margins
Layout.topMargin: Style.margins
}
RowLayout {
Layout.fillWidth: true
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
ComboBox {
id: repeatingBox
Layout.fillWidth: true
model: [qsTr("never"), qsTr("hourly"), qsTr("daily"), qsTr("weekly"), qsTr("monthly"), qsTr("yearly")]
currentIndex: {
@ -298,7 +299,7 @@ Page {
Label {
text: qsTr("Weekdays")
Layout.topMargin: app.margins
Layout.topMargin: Style.margins
visible: root.isWeekDayBased
}
@ -307,7 +308,7 @@ Page {
property var weekDays: root.calendarItem.repeatingOption.weekDays
visible: root.isWeekDayBased
Layout.fillWidth: !app.landscape
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
delegate: ToolButton {
text: model.shortName
checked: weekDayRow.weekDays.indexOf(index + 1) >= 0
@ -327,7 +328,7 @@ Page {
Label {
text: qsTr("Day of month")
Layout.topMargin: app.margins
Layout.topMargin: Style.margins
visible: root.isMonthDayBased
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
}
@ -336,7 +337,7 @@ Page {
id: monthDayGrid
columns: Math.sqrt(children.length)
Layout.fillWidth: !app.landscape
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
visible: root.isMonthDayBased
property var monthDays: root.calendarItem.repeatingOption.monthDays
Repeater {
@ -363,7 +364,7 @@ Page {
Button {
Layout.fillWidth: !app.landscape
Layout.margins: app.margins
Layout.margins: Style.margins
Layout.alignment: Qt.AlignRight
text: qsTr("OK")
onClicked: {

21
nymea-app/ui/magic/EditTimeEventItemPage.qml
View File

@ -84,7 +84,7 @@ Page {
GridLayout {
columns: app.landscape ? 2 : 1
Layout.alignment: app.landscape ? Qt.AlignHCenter : Qt.AlignLeft
Layout.margins: app.margins
Layout.margins: Style.margins
Layout.fillWidth: !app.landscape
Label {
@ -124,15 +124,16 @@ Page {
Label {
text: qsTr("Repeat")
Layout.topMargin: app.margins
Layout.topMargin: Style.margins
}
RowLayout {
Layout.fillWidth: true
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
ComboBox {
id: repeatingBox
Layout.fillWidth: true
model: [qsTr("never"), qsTr("hourly"), qsTr("daily"), qsTr("weekly"), qsTr("monthly"), qsTr("yearly")]
currentIndex: {
@ -158,13 +159,13 @@ Page {
Label {
text: qsTr("Date")
Layout.topMargin: app.margins
Layout.topMargin: Style.margins
visible: root.isDateBased
}
RowLayout {
Layout.fillHeight: !app.landscape
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
visible: root.isDateBased
ComboBox {
id: dayBox
@ -210,7 +211,7 @@ Page {
Label {
text: qsTr("Weekdays")
Layout.topMargin: app.margins
Layout.topMargin: Style.margins
visible: root.isWeekDayBased
}
@ -219,7 +220,7 @@ Page {
property var weekDays: root.timeEventItem.repeatingOption.weekDays
visible: root.isWeekDayBased
Layout.fillWidth: !app.landscape
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
delegate: ToolButton {
text: model.shortName
checked: weekDayRow.weekDays.indexOf(index + 1) >= 0
@ -239,7 +240,7 @@ Page {
Label {
text: qsTr("Day of month")
Layout.topMargin: app.margins
Layout.topMargin: Style.margins
visible: root.isMonthDayBased
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
}
@ -248,7 +249,7 @@ Page {
id: monthDayGrid
columns: Math.sqrt(children.length)
Layout.fillWidth: !app.landscape
Layout.topMargin: app.landscape ? app.margins : 0
Layout.topMargin: app.landscape ? Style.margins : 0
visible: root.isMonthDayBased
property var monthDays: root.timeEventItem.repeatingOption.monthDays
Repeater {
@ -275,7 +276,7 @@ Page {
Button {
Layout.fillWidth: !app.landscape
Layout.margins: app.margins
Layout.margins: Style.margins
Layout.alignment: Qt.AlignRight
text: qsTr("OK")
onClicked: {