alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DaysCalendar: port to PC3/QQC2 where possible

Browse Source 
This allows DaysCalendar to take advantage of the work in the previous commits
removing hover animations on PC3 components, and is generally good for modernisation
anyways.
This commit is contained in:
Jan Blackquill 2021-01-14 19:28:11 -05:00
parent f25b093325
commit 8c320d6841
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/declarativeimports/calendar/qml/DaysCalendar.qml
View File

@ -8,11 +8,11 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1 as QQC1
import org.kde.plasma.calendar 2.0 import org.kde.plasma.calendar 2.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as Components import org.kde.plasma.components 3.0 as Components
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
Item { Item {
@ -69,7 +69,7 @@ Item {
} }
} }
Stack.onStatusChanged: { QQC1.Stack.onStatusChanged: {
if (Stack.status === Stack.Inactive) { if (Stack.status === Stack.Inactive) {
daysCalendar.transformScale = 1 daysCalendar.transformScale = 1
opacity = 1 opacity = 1
@ -134,28 +134,37 @@ Item {
Components.ToolButton { Components.ToolButton {
id: previousButton id: previousButton
iconName: Qt.application.layoutDirection === Qt.RightToLeft ? "go-next" : "go-previous" property string tooltip
icon.name: Qt.application.layoutDirection === Qt.RightToLeft ? "go-next" : "go-previous"
onClicked: daysCalendar.previous() onClicked: daysCalendar.previous()
Accessible.name: tooltip Accessible.name: tooltip
Components.ToolTip { text: parent.tooltip }
//SEE QTBUG-58307 //SEE QTBUG-58307
Layout.preferredHeight: implicitHeight + implicitHeight%2 Layout.preferredHeight: implicitHeight + implicitHeight%2
} }
Components.ToolButton { Components.ToolButton {
iconName: "go-jump-today" icon.name: "go-jump-today"
property string tooltip
onClicked: root.resetToToday() onClicked: root.resetToToday()
tooltip: i18ndc("libplasma5", "Reset calendar to today", "Today") tooltip: i18ndc("libplasma5", "Reset calendar to today", "Today")
Accessible.name: tooltip Accessible.name: tooltip
Accessible.description: i18nd("libplasma5", "Reset calendar to today") Accessible.description: i18nd("libplasma5", "Reset calendar to today")
Components.ToolTip { text: parent.tooltip }
//SEE QTBUG-58307 //SEE QTBUG-58307
Layout.preferredHeight: implicitHeight + implicitHeight%2 Layout.preferredHeight: implicitHeight + implicitHeight%2
} }
Components.ToolButton { Components.ToolButton {
id: nextButton id: nextButton
iconName: Qt.application.layoutDirection === Qt.RightToLeft ? "go-previous" : "go-next" property string tooltip
icon.name: Qt.application.layoutDirection === Qt.RightToLeft ? "go-previous" : "go-next"
onClicked: daysCalendar.next() onClicked: daysCalendar.next()
Accessible.name: tooltip Accessible.name: tooltip
Components.ToolTip { text: parent.tooltip }
//SEE QTBUG-58307 //SEE QTBUG-58307
Layout.preferredHeight: implicitHeight + implicitHeight%2 Layout.preferredHeight: implicitHeight + implicitHeight%2
} }