diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,12 @@ include(ECMAddAppIcon) include(FindPkgConfig) -find_package( Qt5 5.8.0 REQUIRED COMPONENTS Core DBus Gui Quick QuickWidgets Qml Script ScriptTools Sql Svg Test Widgets Xml ) +find_package( Qt5 5.8.0 REQUIRED COMPONENTS Core DBus Gui QuickWidgets Qml Script ScriptTools Sql Svg Test Widgets Xml ) +find_package( Qt5 5.8.0 COMPONENTS QuickControls2 ) +set_package_properties( Qt5QuickControls2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area" ) find_package( KF5 REQUIRED COMPONENTS Archive Codecs CoreAddons DBusAddons Declarative DNSSD GlobalAccel GuiAddons I18n IconThemes KCMUtils KIO NewStuff Notifications NotifyConfig Package Solid TextEditor ThreadWeaver WindowSystem ) +find_package( KF5 COMPONENTS Kirigami2 ) +set_package_properties( KF5Kirigami2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area" ) ############### option(WITH_UTILITIES "Enable building of utilities" ON) diff --git a/src/context/ContextView.h b/src/context/ContextView.h --- a/src/context/ContextView.h +++ b/src/context/ContextView.h @@ -28,10 +28,9 @@ #include + class ContextUrlRunner; -class FontFilter; class QPalette; -class QQmlPropertyMap; class QScreen; namespace Context @@ -45,12 +44,6 @@ { Q_OBJECT - // Properties copied from KF5::Plasma::Units - Q_PROPERTY( int smallSpacing READ smallSpacing NOTIFY spacingChanged ) - Q_PROPERTY( int largeSpacing READ largeSpacing NOTIFY spacingChanged ) - Q_PROPERTY( QQmlPropertyMap *iconSizes READ iconSizes CONSTANT ) - Q_PROPERTY( qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged ) - public: ContextView( QWidget *parent = Q_NULLPTR ); ~ContextView(); @@ -81,39 +74,17 @@ Q_INVOKABLE void warning( const QString &error ) const; Q_INVOKABLE void error( const QString &error ) const; - int smallSpacing() const { return m_smallSpacing; } - int largeSpacing() const { return m_largeSpacing; } - QQmlPropertyMap* iconSizes() const { return m_iconSizes; } - qreal devicePixelRatio() const { return m_devicePixelRatio; } - private slots: void slotStatusChanged( QQuickWidget::Status status ); - void updateSpacing(); - void updateDevicePixelRatio( QScreen *screen ); - void iconLoaderSettingsChanged(); void updatePalette( const QPalette &palette ); -signals: - void spacingChanged(); - void iconSizesChanged(); - void devicePixelRatioChanged(); - private: - // copied from KF5::Plasma::Units - int devicePixelIconSize( int size ) const; - static ContextView *s_self; ContextUrlRunner *m_urlRunner; AppletLoader *m_loader; AppletModel *m_appletModel; AppletProxyModel *m_proxyModel; - FontFilter *m_fontFilter; - - int m_smallSpacing; - int m_largeSpacing; - QQmlPropertyMap *m_iconSizes; - qreal m_devicePixelRatio; }; } // Context namespace diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp --- a/src/context/ContextView.cpp +++ b/src/context/ContextView.cpp @@ -36,40 +36,13 @@ #include #include #include -#include #include #include #include #include -class FontFilter : public QObject -{ - Q_OBJECT - -public: - FontFilter( QObject *parent ) - : QObject( parent ) - { - qApp->installEventFilter( this ); - } - - bool eventFilter( QObject *watched, QEvent *event ) - { - if( watched == qApp ) - { - if( event->type() == QEvent::ApplicationFontChange ) - emit fontChanged(); - } - return QObject::eventFilter( watched, event ); - } - -signals: - void fontChanged(); -}; - - namespace Context { @@ -82,26 +55,16 @@ , m_loader( new AppletLoader( this ) ) , m_appletModel( new AppletModel( m_loader, this ) ) , m_proxyModel( new AppletProxyModel( m_appletModel, this ) ) - , m_fontFilter( new FontFilter( this ) ) - , m_smallSpacing( 2 ) - , m_largeSpacing( 8 ) - , m_iconSizes( new QQmlPropertyMap( this ) ) { DEBUG_BLOCK KDeclarative::KDeclarative decl; decl.setDeclarativeEngine( engine() ); decl.setupBindings(); connect( this, &QQuickWidget::statusChanged, this, &ContextView::slotStatusChanged ); - connect( qApp, &QGuiApplication::primaryScreenChanged, this, &ContextView::updateDevicePixelRatio ); - connect( m_fontFilter, &FontFilter::fontChanged, this, &ContextView::updateSpacing ); - connect( KIconLoader::global(), &KIconLoader::iconLoaderSettingsChanged, this, &ContextView::iconLoaderSettingsChanged ); connect( The::paletteHandler(), &PaletteHandler::newPalette, this, &ContextView::updatePalette ); - updateSpacing(); - updateDevicePixelRatio( qApp->primaryScreen() ); - m_urlRunner = new ContextUrlRunner(); The::amarokUrlHandler()->registerRunner( m_urlRunner, "context" ); @@ -188,67 +151,6 @@ error( e.description() ); } -void -ContextView::updateSpacing() -{ - int gridUnit = QFontMetrics( QGuiApplication::font() ).boundingRect( QStringLiteral("M") ).height(); - if (gridUnit % 2 != 0) - gridUnit++; - - if (gridUnit != m_largeSpacing) - { - m_smallSpacing = qMax( 2, (int)( gridUnit / 4 ) ); // 1/4 of gridUnit, at least 2 - m_largeSpacing = gridUnit; // msize.height - emit spacingChanged(); - } -} - -void -ContextView::updateDevicePixelRatio( QScreen *screen ) -{ - if (!screen) - return; - - const qreal dpi = screen->logicalDotsPerInchX(); - // Usual "default" is 96 dpi - m_devicePixelRatio = (qreal)dpi / (qreal)96; - iconLoaderSettingsChanged(); - emit devicePixelRatioChanged(); -} - -void -ContextView::iconLoaderSettingsChanged() -{ - m_iconSizes->insert( QStringLiteral( "tiny" ), devicePixelIconSize( KIconLoader::SizeSmall ) / 2 ); - m_iconSizes->insert( QStringLiteral( "small" ), devicePixelIconSize( KIconLoader::SizeSmall ) ); - m_iconSizes->insert( QStringLiteral( "smallMedium" ), devicePixelIconSize( KIconLoader::SizeSmallMedium ) ); - m_iconSizes->insert( QStringLiteral( "medium" ), devicePixelIconSize( KIconLoader::SizeMedium ) ); - m_iconSizes->insert( QStringLiteral( "large" ), devicePixelIconSize( KIconLoader::SizeLarge ) ); - m_iconSizes->insert( QStringLiteral( "huge" ), devicePixelIconSize( KIconLoader::SizeHuge ) ); - m_iconSizes->insert( QStringLiteral( "enormous" ), devicePixelIconSize( KIconLoader::SizeEnormous ) ); - - emit iconSizesChanged(); -} - -int -ContextView::devicePixelIconSize( int size ) const -{ - const qreal ratio = devicePixelRatio(); - - if ( ratio < 1.5 ) - return size; - else if ( ratio < 2.0 ) - return size * 1.5; - else if ( ratio < 2.5 ) - return size * 2.0; - else if ( ratio < 3.0 ) - return size * 2.5; - else if ( ratio < 3.5 ) - return size * 3.0; - else - return size * ratio; -} - void ContextView::updatePalette( const QPalette &palette ) { diff --git a/src/context/applets/analyzer/package/contents/ui/main.qml b/src/context/applets/analyzer/package/contents/ui/main.qml --- a/src/context/applets/analyzer/package/contents/ui/main.qml +++ b/src/context/applets/analyzer/package/contents/ui/main.qml @@ -19,6 +19,7 @@ import QtQuick.Dialogs 1.2 as Dialogs // QtQuick.Controls Dialogs only work properly with ApplicationWindow import QtQuick.Layouts 1.0 import QtQml.Models 2.1 +import org.kde.kirigami 2.0 as Kirigami import org.kde.amarok.qml 1.0 as AmarokQml import org.kde.amarok.analyzer 1.0 @@ -35,7 +36,7 @@ id: dialog title: i18nc("The title of the analyzer config dialog", "%1 config", applet.name) - width: Context.largeSpacing * 25 + width: Kirigami.Units.largeSpacing * 25 standardButtons: Dialogs.StandardButton.Ok | Dialogs.StandardButton.Apply | Dialogs.StandardButton.Cancel function applyChanges() { @@ -53,7 +54,7 @@ Column { width: parent.width - spacing: Context.smallSpacing + spacing: Kirigami.Units.smallSpacing RowLayout { width: parent.width diff --git a/src/context/applets/currenttrack/package/contents/ui/InfoItem.qml b/src/context/applets/currenttrack/package/contents/ui/InfoItem.qml --- a/src/context/applets/currenttrack/package/contents/ui/InfoItem.qml +++ b/src/context/applets/currenttrack/package/contents/ui/InfoItem.qml @@ -17,6 +17,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.0 as Kirigami import org.kde.amarok.currenttrack 1.0 ColumnLayout { @@ -26,7 +27,7 @@ property alias album: albumLabel.text property alias artist: artistLabel.text - spacing: Context.smallSpacing + spacing: Kirigami.Units.smallSpacing Label { id: titleLabel diff --git a/src/context/applets/currenttrack/package/contents/ui/StatsItem.qml b/src/context/applets/currenttrack/package/contents/ui/StatsItem.qml --- a/src/context/applets/currenttrack/package/contents/ui/StatsItem.qml +++ b/src/context/applets/currenttrack/package/contents/ui/StatsItem.qml @@ -17,12 +17,13 @@ import QtQuick 2.4 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.0 as Kirigami import org.kde.amarok.currenttrack 1.0 Column { id: root - property real textSize: Context.largeSpacing + property real textSize: Kirigami.Units.largeSpacing property alias playCount: playCountLabel.text property alias score: scoreLabel.text property alias lastPlayed: lastPlayedLabel.text diff --git a/src/context/applets/currenttrack/package/contents/ui/main.qml b/src/context/applets/currenttrack/package/contents/ui/main.qml --- a/src/context/applets/currenttrack/package/contents/ui/main.qml +++ b/src/context/applets/currenttrack/package/contents/ui/main.qml @@ -17,6 +17,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.0 as Kirigami import org.kde.amarok.qml 1.0 as AmarokQml import org.kde.amarok.currenttrack 1.0 @@ -28,7 +29,7 @@ id: cover color: "white" - radius: Context.smallSpacing / 2 + radius: Kirigami.Units.smallSpacing / 2 border.width: 1 border.color: applet.palette.light height: parent.height @@ -79,7 +80,7 @@ AmarokQml.RatingItem { id: ratingItem - height: Context.largeSpacing * 2 + height: Kirigami.Units.largeSpacing * 2 width: height * 6 Layout.alignment: Qt.AlignTop | Qt.AlignRight rating: CurrentTrackEngine.rating @@ -91,7 +92,7 @@ Layout.fillWidth: true Layout.alignment: Qt.AlignBottom - height: Context.largeSpacing * 3 + height: Kirigami.Units.largeSpacing * 3 } } } diff --git a/src/context/applets/info/package/contents/ui/main.qml b/src/context/applets/info/package/contents/ui/main.qml --- a/src/context/applets/info/package/contents/ui/main.qml +++ b/src/context/applets/info/package/contents/ui/main.qml @@ -16,6 +16,7 @@ import QtQuick 2.4 // import QtWebView 1.1 +import org.kde.kirigami 2.0 as Kirigami import org.kde.amarok.qml 1.0 as AmarokQml import org.kde.amarok.info 1.0 @@ -25,9 +26,7 @@ // WebView { // id: content // -// anchors.top: parent.top -// width: parent.width -// height: Context.largeSpacing * 20 //TODO: Find a more elegant solution to set the height +// anchors.fill: parent // // Connections { // target: InfoEngine diff --git a/src/context/applets/photos/package/contents/ui/main.qml b/src/context/applets/photos/package/contents/ui/main.qml --- a/src/context/applets/photos/package/contents/ui/main.qml +++ b/src/context/applets/photos/package/contents/ui/main.qml @@ -16,6 +16,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.0 +import org.kde.kirigami 2.0 as Kirigami import org.kde.amarok.qml 1.0 as AmarokQml import org.kde.amarok.photos 1.0 @@ -33,7 +34,7 @@ id: contentRow height: parent.height - spacing: Context.smallSpacing + spacing: Kirigami.Units.smallSpacing Repeater { model: PhotosEngine.photoTitles.length diff --git a/src/context/applets/wikipedia/package/contents/ui/main.qml b/src/context/applets/wikipedia/package/contents/ui/main.qml --- a/src/context/applets/wikipedia/package/contents/ui/main.qml +++ b/src/context/applets/wikipedia/package/contents/ui/main.qml @@ -18,103 +18,102 @@ import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import QtWebEngine 1.1 +import org.kde.kirigami 2.0 as Kirigami import org.kde.amarok.qml 1.0 as AmarokQml import org.kde.amarok.wikipedia 1.0 AmarokQml.Applet { id: applet - RowLayout { - id: buttonRow + ColumnLayout { + anchors.fill: parent - anchors.top: parent.top - width: parent.width + RowLayout { + Layout:fillWidth: true + Layout.alignment: Qt.AlignTop - Button { - iconName: "go-previous" - enabled: content.canGoBack - Layout.alignment: Qt.AlignLeft - ToolTip.text: i18n("Previous") + Button { + iconName: "go-previous" + enabled: content.canGoBack + Layout.alignment: Qt.AlignLeft + ToolTip.text: i18n("Previous") - onClicked: content.goBack() - } - Button { - iconName: "go-next" - enabled: content.canGoForward - Layout.alignment: Qt.AlignLeft - ToolTip.text: i18n("Next") + onClicked: content.goBack() + } + Button { + iconName: "go-next" + enabled: content.canGoForward + Layout.alignment: Qt.AlignLeft + ToolTip.text: i18n("Next") - onClicked: content.goForward() - } - Button { - iconName: "view-refresh" - enabled: !content.loading - Layout.alignment: Qt.AlignLeft - ToolTip.text: i18n("Refresh") + onClicked: content.goForward() + } + Button { + iconName: "view-refresh" + enabled: !content.loading + Layout.alignment: Qt.AlignLeft + ToolTip.text: i18n("Refresh") - onClicked: content.reload() - } - Item { - Layout.fillWidth: true - } - Button { - iconName: "filename-artist-amarok" - Layout.alignment: Qt.AlignRight - ToolTip.text: i18n("Artist") + onClicked: content.reload() + } + Item { + Layout.fillWidth: true + } + Button { + iconName: "filename-artist-amarok" + Layout.alignment: Qt.AlignRight + ToolTip.text: i18n("Artist") - onClicked: WikipediaEngine.selection = WikipediaEngine.Artist - } - Button { - iconName: "filename-composer-amarok" - Layout.alignment: Qt.AlignRight - ToolTip.text: i18n("Composer") + onClicked: WikipediaEngine.selection = WikipediaEngine.Artist + } + Button { + iconName: "filename-composer-amarok" + Layout.alignment: Qt.AlignRight + ToolTip.text: i18n("Composer") - onClicked: WikipediaEngine.selection = WikipediaEngine.Composer - } - Button { - iconName: "filename-album-amarok" - Layout.alignment: Qt.AlignRight - ToolTip.text: i18n("Album") + onClicked: WikipediaEngine.selection = WikipediaEngine.Composer + } + Button { + iconName: "filename-album-amarok" + Layout.alignment: Qt.AlignRight + ToolTip.text: i18n("Album") - onClicked: WikipediaEngine.selection = WikipediaEngine.Album - } - Button { - iconName: "filename-title-amarok" - Layout.alignment: Qt.AlignRight - ToolTip.text: i18n("Track") + onClicked: WikipediaEngine.selection = WikipediaEngine.Album + } + Button { + iconName: "filename-title-amarok" + Layout.alignment: Qt.AlignRight + ToolTip.text: i18n("Track") - onClicked: WikipediaEngine.selection = WikipediaEngine.Track + onClicked: WikipediaEngine.selection = WikipediaEngine.Track + } } - } - - WebEngineView { - id: content - anchors.top: buttonRow.bottom - anchors.topMargin: applet.spacing - width: parent.width - height: Context.largeSpacing * 25 //TODO: Find a more elegant solution to set the height + WebEngineView { + id: content - onNavigationRequested: { - if (request.navigationType == WebEngineNavigationRequest.LinkClickedNavigation) { - request.action = WebEngineNavigationRequest.IgnoreRequest; - WikipediaEngine.url = request.url; + Layout.fillWidth: true + Layout.fillHeight: true + Layout.alignment: Qt.AlignBottom + height: Kirigami.Units.largeSpacing * 25 //TODO: Find a more elegant solution to set the height + + onNavigationRequested: { + if (request.navigationType == WebEngineNavigationRequest.LinkClickedNavigation) { + request.action = WebEngineNavigationRequest.IgnoreRequest; + WikipediaEngine.url = request.url; + } } - } - Connections { - target: WikipediaEngine + Connections { + target: WikipediaEngine - onPageChanged: content.loadHtml(WikipediaEngine.page, WikipediaEngine.url) - } + onPageChanged: content.loadHtml(WikipediaEngine.page, WikipediaEngine.url) + } - BusyIndicator { - anchors.centerIn: parent - running: WikipediaEngine.busy + BusyIndicator { + anchors.centerIn: parent + running: WikipediaEngine.busy + } } } - - SystemPalette { - id: palette - } } diff --git a/src/context/context_qml_package/contents/ui/main.qml b/src/context/context_qml_package/contents/ui/main.qml --- a/src/context/context_qml_package/contents/ui/main.qml +++ b/src/context/context_qml_package/contents/ui/main.qml @@ -18,6 +18,7 @@ import QtQuick.Controls 2.0 import QtQuick.Layouts 1.2 import QtQml.Models 2.2 +import org.kde.kirigami 2.0 as Kirigami import "toolbar" Item { @@ -36,7 +37,7 @@ Layout.alignment: Qt.AlignTop Layout.fillHeight: true Layout.fillWidth: true - spacing: Context.smallSpacing + spacing: Kirigami.Units.smallSpacing displayMarginEnd: 100000 displayMarginBeginning: 100000 clip: true @@ -100,7 +101,7 @@ id: appletToolbarAddItem Layout.fillWidth: true - height: Context.iconSizes.enormous + height: Kirigami.Units.iconSizes.enormous visible: appletToolbar.configEnabled } AppletToolbar { diff --git a/src/context/context_qml_package/contents/ui/toolbar/AppletToolbar.qml b/src/context/context_qml_package/contents/ui/toolbar/AppletToolbar.qml --- a/src/context/context_qml_package/contents/ui/toolbar/AppletToolbar.qml +++ b/src/context/context_qml_package/contents/ui/toolbar/AppletToolbar.qml @@ -18,6 +18,8 @@ import QtQuick.Controls 1.4 import QtQml.Models 2.1 import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.0 as Kirigami + Rectangle { id: root @@ -69,7 +71,7 @@ } } - height: configureButton.height + Context.smallSpacing + height: configureButton.height + Kirigami.Units.smallSpacing radius: 4 color: palette.mid @@ -85,7 +87,7 @@ rightMargin: spacing } orientation: ListView.Horizontal - spacing: Context.smallSpacing + spacing: Kirigami.Units.smallSpacing interactive: false clip: true diff --git a/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAddItem.qml b/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAddItem.qml --- a/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAddItem.qml +++ b/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAddItem.qml @@ -17,6 +17,7 @@ import QtQuick 2.4 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.0 as Kirigami ScrollView { @@ -28,18 +29,18 @@ ListView { id: listView - anchors.margins: Context.smallSpacing + anchors.margins: Kirigami.Units.smallSpacing orientation: ListView.Horizontal - spacing: Context.smallSpacing + spacing: Kirigami.Units.smallSpacing model: AppletModel delegate: Rectangle { readonly property bool appletEnabled: AppletProxyModel.enabledApplets.indexOf(appletId) != -1 - height: root.height - 3 * Context.smallSpacing + height: root.height - 3 * Kirigami.Units.smallSpacing width: height - radius: Context.smallSpacing + radius: Kirigami.Units.smallSpacing color: delegateMouseArea.pressed ? palette.highlight : appletEnabled ? palette.highlight : "transparent" border.color: delegateMouseArea.containsMouse ? palette.highlight : "transparent" border.width: 2 @@ -52,13 +53,13 @@ Layout.fillHeight: true Layout.fillWidth: true Layout.alignment: Qt.AlignTop - Layout.margins: Context.smallSpacing + Layout.margins: Kirigami.Units.smallSpacing sourceSize.width: width sourceSize.height: height } Label { Layout.alignment: Qt.AlignBottom - Layout.margins: Context.smallSpacing + Layout.margins: Kirigami.Units.smallSpacing Layout.fillWidth: true text: name wrapMode: Text.Wrap diff --git a/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAppletItem.qml b/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAppletItem.qml --- a/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAppletItem.qml +++ b/src/context/context_qml_package/contents/ui/toolbar/AppletToolbarAppletItem.qml @@ -17,6 +17,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.0 as Kirigami MouseArea { @@ -29,9 +30,9 @@ property bool configEnabled: !!toolbar ? toolbar.configEnabled : false property bool held: false - height: held ? toolbar.height : toolbar.height - Context.smallSpacing + height: held ? toolbar.height : toolbar.height - Kirigami.Units.smallSpacing anchors.verticalCenter: parent.verticalCenter - implicitWidth: label.implicitWidth + Context.smallSpacing * 2 + implicitWidth: label.implicitWidth + Kirigami.Units.smallSpacing * 2 acceptedButtons: Qt.LeftButton hoverEnabled: true @@ -47,8 +48,8 @@ DropArea { anchors { fill: parent - leftMargin: Context.smallSpacing - rightMargin: Context.smallSpacing + leftMargin: Kirigami.Units.smallSpacing + rightMargin: Kirigami.Units.smallSpacing } onEntered: { @@ -64,7 +65,7 @@ border.width: 1 color: root.pressed ? palette.highlight : palette.button border.color: root.containsMouse ? palette.highlight : palette.buttonText - radius: Context.smallSpacing / 2 + radius: Kirigami.Units.smallSpacing / 2 anchors { horizontalCenter: root.horizontalCenter verticalCenter: root.verticalCenter @@ -98,8 +99,8 @@ anchors { fill: parent - leftMargin: Context.smallSpacing - rightMargin: Context.smallSpacing + leftMargin: Kirigami.Units.smallSpacing + rightMargin: Kirigami.Units.smallSpacing } horizontalAlignment: Text.AlignHCenter diff --git a/src/context/qml_plugin/Applet.qml b/src/context/qml_plugin/Applet.qml --- a/src/context/qml_plugin/Applet.qml +++ b/src/context/qml_plugin/Applet.qml @@ -16,6 +16,8 @@ import QtQuick 2.4 import QtQuick.Dialogs 1.2 +import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 2.0 as Kirigami Rectangle { @@ -29,13 +31,13 @@ property url iconSource property bool collapsed: false property bool configEnabled: false - property real spacing: Context.smallSpacing + property real spacing: Kirigami.Units.smallSpacing property real padding: spacing property real contentHeight: content.childrenRect.height property Dialog configDialog: null readonly property SystemPalette palette: palette - radius: Context.smallSpacing + radius: Kirigami.Units.smallSpacing border.width: 2 border.color: palette.mid color: "transparent" @@ -88,7 +90,7 @@ preventStealing: true onMouseYChanged: { if(pressed) { - root.contentHeight = Math.max(Context.largeSpacing, root.contentHeight + mouseY); + root.contentHeight = Math.max(Kirigami.Units.largeSpacing, root.contentHeight + mouseY); } } }