diff --git a/applets/digital-clock/package/contents/ui/configAppearance.qml b/applets/digital-clock/package/contents/ui/configAppearance.qml --- a/applets/digital-clock/package/contents/ui/configAppearance.qml +++ b/applets/digital-clock/package/contents/ui/configAppearance.qml @@ -29,8 +29,6 @@ QtLayouts.ColumnLayout { id: appearancePage - width: childrenRect.width - height: childrenRect.height signal configurationChanged @@ -233,7 +231,7 @@ } icon.name: "format-text-bold" checkable: true - Accessible.name: tooltip + Accessible.name: QtControls.ToolTip.text } QtControls.Button { @@ -243,7 +241,7 @@ } icon.name: "format-text-italic" checkable: true - Accessible.name: tooltip + Accessible.name: QtControls.ToolTip.text } } } diff --git a/applets/digital-clock/package/contents/ui/configTimeZones.qml b/applets/digital-clock/package/contents/ui/configTimeZones.qml --- a/applets/digital-clock/package/contents/ui/configTimeZones.qml +++ b/applets/digital-clock/package/contents/ui/configTimeZones.qml @@ -27,10 +27,10 @@ import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents -Item { +ColumnLayout { id: timeZonesPage - width: parent.width - height: parent.height + anchors.left: parent.left + anchors.right: parent.right property alias cfg_selectedTimeZones: timeZones.selectedTimeZones property alias cfg_wheelChangesTimezone: enableWheelCheckBox.checked @@ -53,157 +53,140 @@ visible: false } + Rectangle { + id: messageWidget - ColumnLayout { - anchors.fill: parent + Layout.fillWidth: true + Layout.margins: 1 - Rectangle { - id: messageWidget + implicitHeight: messageWidgetRow.implicitHeight + (2 * units.smallSpacing) - anchors { - left: parent.left - right: parent.right - margins: 1 - } - - height: 0 - - //TODO: This is the actual color KMessageWidget uses as its base color but here it gives - // a different color, figure out why - //property color gradBaseColor: Qt.rgba(0.69, 0.5, 0, 1) - gradient: Gradient { - GradientStop { position: 0.0; color: "#FFD86D" } //Qt.lighter(messageWidget.gradBaseColor, 1.1) - GradientStop { position: 0.1; color: "#EAC360" } // messageWidget.gradBaseColor - GradientStop { position: 1.0; color: "#CAB064" } //Qt.darker(messageWidget.gradBaseColor, 1.1) - } + //TODO: This is the actual color KMessageWidget uses as its base color but here it gives + // a different color, figure out why + //property color gradBaseColor: Qt.rgba(0.69, 0.5, 0, 1) + gradient: Gradient { + GradientStop { position: 0.0; color: "#FFD86D" } //Qt.lighter(messageWidget.gradBaseColor, 1.1) + GradientStop { position: 0.1; color: "#EAC360" } // messageWidget.gradBaseColor + GradientStop { position: 1.0; color: "#CAB064" } //Qt.darker(messageWidget.gradBaseColor, 1.1) + } - radius: 5 - border.width: 1 - border.color: "#79735B" + radius: 5 + border.width: 1 + border.color: "#79735B" - visible: false + visible: false + opacity: visible ? 1.0 : 0 + height: visible ? implicitHeight : 0 + Behavior on opacity { NumberAnimation { easing.type: Easing.Linear } } + Behavior on height { NumberAnimation { easing.type: Easing.Linear } } - Behavior on visible { - ParallelAnimation { - PropertyAnimation { - target: messageWidget - property: "opacity" - to: messageWidget.visible ? 0 : 1.0 - easing.type: Easing.Linear - } - PropertyAnimation { - target: messageWidget - property: "Layout.minimumHeight" - to: messageWidget.visible ? 0 : messageWidgetLabel.height + (2 *units.largeSpacing) - easing.type: Easing.Linear - } - } + RowLayout { + id: messageWidgetRow + + anchors.fill: messageWidget + anchors.leftMargin: units.smallSpacing + anchors.rightMargin: units.smallSpacing + spacing: units.smallSpacing + + PlasmaCore.IconItem { + Layout.alignment: Qt.AlignVCenter + height: units.iconSizes.smallMedium + width: height + source: "dialog-warning" + opacity: messageWidget.opacity } - RowLayout { - anchors.fill: parent - anchors.margins: units.largeSpacing - anchors.leftMargin: units.smallSpacing - anchors.rightMargin: units.smallSpacing - spacing: units.smallSpacing - - PlasmaCore.IconItem { - anchors.verticalCenter: parent.verticalCenter - height: units.iconSizes.smallMedium - width: height - source: "dialog-warning" - } - - QtControls.Label { - id: messageWidgetLabel - anchors.verticalCenter: parent.verticalCenter - Layout.fillWidth: true - text: i18n("At least one time zone needs to be enabled. 'Local' was enabled automatically.") - verticalAlignment: Text.AlignVCenter - wrapMode: Text.WordWrap - } + QtControls.Label { + Layout.alignment: Qt.AlignVCenter + Layout.fillWidth: true + Layout.topMargin: units.smallSpacing + Layout.bottomMargin: units.smallSpacing + text: i18n("At least one time zone needs to be enabled. 'Local' was enabled automatically.") + verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap + opacity: messageWidget.opacity + } - PlasmaComponents.ToolButton { - anchors.verticalCenter: parent.verticalCenter - iconName: "dialog-close" - flat: true + PlasmaComponents.ToolButton { + Layout.alignment: Qt.AlignVCenter + iconName: "dialog-close" + flat: true + opacity: messageWidget.opacity - onClicked: { - messageWidget.visible = false; - } + onClicked: { + messageWidget.visible = false; } } } + } - QtControls.TextField { - id: filter - Layout.fillWidth: true - placeholderText: i18n("Search Time Zones") - } + QtControls.TextField { + id: filter + Layout.fillWidth: true + placeholderText: i18n("Search Time Zones") + } - QtControls.TableView { - id: timeZoneView + QtControls.TableView { + id: timeZoneView - signal toggleCurrent + signal toggleCurrent - Layout.fillWidth: true - Layout.fillHeight: true + Layout.fillWidth: true + Layout.fillHeight: true - Keys.onSpacePressed: toggleCurrent() + Keys.onSpacePressed: toggleCurrent() - model: TimeZoneFilterProxy { - sourceModel: timeZones - filterString: filter.text - } + model: TimeZoneFilterProxy { + sourceModel: timeZones + filterString: filter.text + } - QtControls.TableViewColumn { - role: "checked" - width: checkbox.width - delegate: - QtControls.CheckBox { - id: checkBox - anchors.centerIn: parent - checked: styleData.value - activeFocusOnTab: false // only let the TableView as a whole get focus - onClicked: { - //needed for model's setData to be called - model.checked = checked; - } + QtControls.TableViewColumn { + role: "checked" + width: checkbox.width + delegate: + QtControls.CheckBox { + id: checkBox + anchors.centerIn: parent + checked: styleData.value + activeFocusOnTab: false // only let the TableView as a whole get focus + onClicked: { + //needed for model's setData to be called + model.checked = checked; + } - Connections { - target: timeZoneView - onToggleCurrent: { - if (styleData.row === timeZoneView.currentRow) { - model.checked = !checkBox.checked - } + Connections { + target: timeZoneView + onToggleCurrent: { + if (styleData.row === timeZoneView.currentRow) { + model.checked = !checkBox.checked } } } + } - resizable: false - movable: false - } - QtControls.TableViewColumn { - role: "city" - title: i18n("City") - } - QtControls.TableViewColumn { - role: "region" - title: i18n("Region") - } - QtControls.TableViewColumn { - role: "comment" - title: i18n("Comment") - } + resizable: false + movable: false } - - RowLayout { - Layout.fillWidth: true - QtControls.CheckBox { - id: enableWheelCheckBox - text: i18n("Switch time zone with mouse wheel") - } + QtControls.TableViewColumn { + role: "city" + title: i18n("City") } + QtControls.TableViewColumn { + role: "region" + title: i18n("Region") + } + QtControls.TableViewColumn { + role: "comment" + title: i18n("Comment") + } + } + RowLayout { + Layout.fillWidth: true + QtControls.CheckBox { + id: enableWheelCheckBox + text: i18n("Switch time zone with mouse wheel") + } } }