Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2022-08-15 19:57:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Mon Aug 15 19:57:58 2022 rev:61 rq:995017 version:5.97.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2022-07-11 19:10:48.819732042 +0200 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.1521/qqc2-desktop-style.changes 2022-08-15 20:00:02.897365945 +0200 @@ -1,0 +2,26 @@ +Sun Aug 7 22:27:47 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.97.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.97.0 +- Changes since 5.96.0: + * Install style as a regular QML for Qt6 + * ToolTip: Sync to PC3: Strip out ampersands + * ProgressBar,Slider: Adapt great precision to the harsh reality (kde#455339) + * Fix QQC2 MenuBar theme. (kde#456729) + * properly reset the cursorshape (kde#456911) + * Use QApplication::font with respective widget class + * Wrap checkbox label + * ToolTip: wrap text for long tooltips + * TextArea,TextField: Remove not referenced id from background style item + * TextField: Disable Undo for password fields, including its context menu + * Tests: Add manual test for progress bars and sliders + * Remove dynamic QQC2 version selection + * Clean up code of manual tests, add missing license headers + * Fix: url types (like icon.source) are QVariant without length property + * Nit: reformat long expressions + * Menu: Fix wrong pixel metric being requested for verticalPadding + * ProgressBar: Drop layout direction hack + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.96.0.tar.xz qqc2-desktop-style-5.96.0.tar.xz.sig New: ---- qqc2-desktop-style-5.97.0.tar.xz qqc2-desktop-style-5.97.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.mwXEbQ/_old 2022-08-15 20:00:03.325367138 +0200 +++ /var/tmp/diff_new_pack.mwXEbQ/_new 2022-08-15 20:00:03.333367161 +0200 @@ -16,11 +16,11 @@ # -%define _tar_path 5.96 +%define _tar_path 5.97 # Only needed for the package signature condition %bcond_without released Name: qqc2-desktop-style -Version: 5.96.0 +Version: 5.97.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later ++++++ qqc2-desktop-style-5.96.0.tar.xz -> qqc2-desktop-style-5.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/CMakeLists.txt new/qqc2-desktop-style-5.97.0/CMakeLists.txt --- old/qqc2-desktop-style-5.96.0/CMakeLists.txt 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/CMakeLists.txt 2022-08-07 14:24:51.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.96.0") # handled by release scripts -set(KF_DEP_VERSION "5.96.0") # handled by release scripts +set(KF_VERSION "5.97.0") # handled by release scripts +set(KF_DEP_VERSION "5.97.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF_VERSION}) @@ -21,13 +21,14 @@ ################# set KDE specific information ################# -find_package(ECM 5.96.0 REQUIRED NO_MODULE) +find_package(ECM 5.97.0 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMQmlModule) include(ECMQMLModules) include(KDEInstallDirs) include(KDECMakeSettings) @@ -126,31 +127,16 @@ add_subdirectory(kirigami-plasmadesktop-integration) endif(KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND) -# FIXME: this assumes there will always be a QQC2 release for each Qt release, needs -# something to discover what's the latest qqc2 version available -# Since 5.12, QQC2 version is sync with Qt's minor version: -# https://github.com/qt/qtquickcontrols2/commit/3c7bfc156797b2f3ef08a8cf620b79da80e4b061 -if (Qt5QuickControls2_VERSION_MINOR LESS 12) - math(EXPR QQC2_VERSION_MINOR "${Qt5QuickControls2_VERSION_MINOR} - 7") +if (QT_MAJOR_VERSION EQUAL "5") + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.desktop DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2) else() - set(QQC2_VERSION_MINOR "${Qt5QuickControls2_VERSION_MINOR}") + ecm_add_qml_module(org_kde_desktop URI "org.kde.desktop" VERSION 1.0 NO_PLUGIN) + file(GLOB _public_qml "org.kde.desktop/*.qml") + ecm_target_qml_sources(org_kde_desktop VERSION 1.0 SOURCES ${_public_qml}) + file(GLOB _private_qml "org.kde.desktop/private/*.qml") + ecm_target_qml_sources(org_kde_desktop VERSION 1.0 PATH private SOURCES ${_private_qml}) + ecm_finalize_qml_module(org_kde_desktop DESTINATION ${KDE_INSTALL_QMLDIR}) endif() -set(QQC2_VERSION "2.${QQC2_VERSION_MINOR}") - -# Find all the source qml files -FILE(GLOB_RECURSE inFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/org.kde.desktop/*") - - #for each file, replace @QQC2_VERSION@ with the version we found -FOREACH(infileName ${inFiles}) - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/${infileName}" - "${CMAKE_CURRENT_BINARY_DIR}/${infileName}" - @ONLY - ) -ENDFOREACH(infileName) - -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/org.kde.desktop DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/BusyIndicator.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/BusyIndicator.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/BusyIndicator.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/BusyIndicator.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.6 import org.kde.kirigami 2.4 as Kirigami -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T T.BusyIndicator { id: controlRoot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Button.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Button.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Button.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Button.qml 2022-08-07 14:24:51.000000000 +0200 @@ -6,7 +6,7 @@ */ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.4 as Kirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/CheckBox.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/CheckBox.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/CheckBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/CheckBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T -import QtQuick.Controls @QQC2_VERSION@ +import QtQuick.Templates 2.15 as T +import QtQuick.Controls 2.15 import org.kde.kirigami 2.4 as Kirigami import "private" @@ -59,6 +59,7 @@ visible: controlRoot.text horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter + wrapMode: Text.Wrap FocusRect { control: controlRoot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/CheckDelegate.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/CheckDelegate.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/CheckDelegate.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/CheckDelegate.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.5 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami import "private" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/CheckIndicator.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/CheckIndicator.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/CheckIndicator.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/CheckIndicator.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.4 as Kirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ComboBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ComboBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,8 +8,8 @@ import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Templates @QQC2_VERSION@ as T -import QtQuick.Controls @QQC2_VERSION@ as Controls +import QtQuick.Templates 2.15 as T +import QtQuick.Controls 2.15 as Controls import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.12 as Kirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Container.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Container.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Container.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Container.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.Container { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Control.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Control.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Control.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Control.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.4 as Kirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/DelayButton.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/DelayButton.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/DelayButton.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/DelayButton.qml 2022-08-07 14:24:51.000000000 +0200 @@ -6,7 +6,7 @@ */ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.4 as Kirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Dial.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Dial.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Dial.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Dial.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Dialog.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Dialog.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Dialog.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Dialog.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.12 as Kirigami T.Dialog { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/DialogButtonBox.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/DialogButtonBox.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/DialogButtonBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/DialogButtonBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.DialogButtonBox { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Drawer.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Drawer.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Drawer.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Drawer.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.Drawer { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Frame.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Frame.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Frame.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Frame.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.Frame { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/GroupBox.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/GroupBox.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/GroupBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/GroupBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.GroupBox { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ItemDelegate.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ItemDelegate.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ItemDelegate.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ItemDelegate.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.2 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami import "private" @@ -31,7 +31,7 @@ spacing: Kirigami.Units.smallSpacing Kirigami.Icon { Layout.alignment: Qt.AlignVCenter - visible: controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0) + visible: controlRoot.icon !== undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.toString().length > 0) source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "" Layout.preferredHeight: Kirigami.Units.iconSizes.small Layout.preferredWidth: Layout.preferredHeight @@ -42,7 +42,9 @@ text: controlRoot.text font: controlRoot.font - color: controlRoot.highlighted || controlRoot.checked || (controlRoot.pressed && !controlRoot.checked && !controlRoot.sectionDelegate) ? Kirigami.Theme.highlightedTextColor : (controlRoot.enabled ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor) + color: controlRoot.highlighted || controlRoot.checked || (controlRoot.pressed && !controlRoot.checked && !controlRoot.sectionDelegate) + ? Kirigami.Theme.highlightedTextColor : + (controlRoot.enabled ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor) elide: Text.ElideRight visible: controlRoot.text horizontalAlignment: Text.AlignLeft diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Label.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Label.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Label.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Label.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Window 2.2 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.4 as Kirigami @@ -26,7 +26,7 @@ renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering HoverHandler { - cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : undefined } color: Kirigami.Theme.textColor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Menu.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Menu.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Menu.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Menu.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,8 +8,8 @@ import QtQuick 2.7 import QtQuick.Layouts 1.2 -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.12 as Kirigami @@ -23,7 +23,7 @@ margins: 0 horizontalPadding: style.pixelMetric("menuhmargin") - verticalPadding: style.pixelMetric("menuhmargin") + verticalPadding: style.pixelMetric("menuvmargin") StylePrivate.StyleItem { id: style visible: false @@ -58,10 +58,11 @@ // mimic qtwidgets behaviour in regards to menu highlighting Connections { target: control.contentItem.currentItem + function onHoveredChanged() { const item = control.contentItem.currentItem; if (item instanceof T.MenuItem && item.highlighted - && !item.subMenu && !item.hovered) { + && !item.subMenu && !item.hovered) { control.currentIndex = -1 } } @@ -72,12 +73,14 @@ target: control.contentItem.contentItem function onVisibleChildrenChanged() { - for (let i in control.contentItem.contentItem.visibleChildren) { - const child = control.contentItem.contentItem.visibleChildren[i]; + const children = control.contentItem.contentItem.visibleChildren; + for (let i in children) { + const child = children[i]; if (child.checkable) { control.contentItem.hasCheckables = true; } - if (child.icon && child.icon.hasOwnProperty("name") && (child.icon.name.length > 0 || child.icon.source.length > 0)) { + if (child.icon && child.icon.hasOwnProperty("name") + && (child.icon.name.length > 0 || child.icon.source.toString().length > 0)) { control.contentItem.hasIcons = true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuBar.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuBar.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuBar.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuBar.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,12 +7,15 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.MenuBar { id: controlRoot + Kirigami.Theme.colorSet: Kirigami.Theme.Header + Kirigami.Theme.inherit: false + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuBarItem.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuBarItem.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuBarItem.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuBarItem.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.MenuBarItem { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuItem.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuItem.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuItem.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuItem.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.MenuItem { @@ -46,11 +46,12 @@ contentItem: RowLayout { Item { - Layout.preferredWidth: (controlRoot.ListView.view && controlRoot.ListView.view.hasCheckables) || controlRoot.checkable ? controlRoot.indicator.width : Kirigami.Units.smallSpacing + Layout.preferredWidth: (controlRoot.ListView.view && controlRoot.ListView.view.hasCheckables) || controlRoot.checkable ? controlRoot.indicator.width : Kirigami.Units.smallSpacing } Kirigami.Icon { Layout.alignment: Qt.AlignVCenter - visible: (controlRoot.ListView.view && controlRoot.ListView.view.hasIcons) || (controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0)) + visible: (controlRoot.ListView.view && controlRoot.ListView.view.hasIcons) + || (controlRoot.icon !== undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.toString().length > 0)) source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "" color: controlRoot.icon ? controlRoot.icon.color : "transparent" Layout.preferredHeight: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.iconSizes.smallMedium : Kirigami.Units.iconSizes.small @@ -86,7 +87,7 @@ verticalAlignment: Text.AlignVCenter } Item { - Layout.preferredWidth: Kirigami.Units.smallSpacing + Layout.preferredWidth: Kirigami.Units.smallSpacing } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuSeparator.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuSeparator.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/MenuSeparator.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/MenuSeparator.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.15 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.15 as Kirigami T.MenuSeparator { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Pane.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Pane.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Pane.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Pane.qml 2022-08-07 14:24:51.000000000 +0200 @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LGPL-2.0-or-later import QtQuick 2.12 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import QtQuick.Controls 2.12 import org.kde.kirigami 2.15 as Kirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Popup.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Popup.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Popup.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Popup.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.12 as Kirigami T.Popup { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ProgressBar.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ProgressBar.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ProgressBar.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ProgressBar.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.6 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.ProgressBar { @@ -22,11 +22,15 @@ contentItem: Item {} background: StylePrivate.StyleItem { + // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow. + property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000) + ? 10000 : 1 + elementType: "progressbar" control: controlRoot - maximum: indeterminate ? 0 : 10000 * controlRoot.to - minimum: indeterminate ? 0 : 10000 * controlRoot.from - value: indeterminate ? 0 : 10000 * ((Qt.application.layoutDirection === Qt.LeftToRight ? controlRoot.visualPosition : 1 - controlRoot.visualPosition) * (controlRoot.to - controlRoot.from) + controlRoot.from) + maximum: indeterminate ? 0 : factor * controlRoot.to + minimum: indeterminate ? 0 : factor * controlRoot.from + value: indeterminate ? 0 : factor * controlRoot.value horizontal: true enabled: controlRoot.enabled diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/RadioButton.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/RadioButton.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/RadioButton.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/RadioButton.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T -import QtQuick.Controls @QQC2_VERSION@ +import QtQuick.Templates 2.15 as T +import QtQuick.Controls 2.15 import org.kde.kirigami 2.4 as Kirigami import "private" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/RadioDelegate.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/RadioDelegate.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/RadioDelegate.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/RadioDelegate.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.5 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami import "private" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/RangeSlider.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/RangeSlider.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/RangeSlider.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/RangeSlider.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.RangeSlider { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/RoundButton.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/RoundButton.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/RoundButton.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/RoundButton.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 -import QtQuick.Templates @QQC2_VERSION@ as T -import QtQuick.Controls @QQC2_VERSION@ as Controls +import QtQuick.Templates 2.15 as T +import QtQuick.Controls 2.15 as Controls import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.16 as Kirigami @@ -56,7 +56,7 @@ color: controlRoot.icon.color // defaults to Qt::transparent implicitWidth: controlRoot.icon.width implicitHeight: controlRoot.icon.height - visible: source.length > 0 && controlRoot.display !== T.AbstractButton.TextOnly + visible: source.toString().length > 0 && controlRoot.display !== T.AbstractButton.TextOnly source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "" } Controls.Label { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ScrollBar.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ScrollBar.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ScrollBar.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ScrollBar.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.6 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.11 as Kirigami T.ScrollBar { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ScrollView.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ScrollView.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ScrollView.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ScrollView.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,8 +7,8 @@ import QtQuick 2.9 -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.9 as Kirigami import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Slider.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Slider.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Slider.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Slider.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.6 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.Slider { @@ -28,6 +28,10 @@ snapMode: T.Slider.SnapOnRelease background: StylePrivate.StyleItem { + // Rescale for extra precision. Adapts to the range of `from` & `to` to avoid integer overflow. + property int factor: (Math.abs(controlRoot.from) < 100000 && Math.abs(controlRoot.to) < 100000) + ? 10000 : 1 + control: controlRoot elementType: "slider" sunken: controlRoot.pressed @@ -36,10 +40,10 @@ contentHeight: horizontal ? (Kirigami.Settings.tabletMode ? 24 : 22) : controlRoot.implicitHeight anchors.verticalCenter: controlRoot.verticalCenter - maximum: 10000 * controlRoot.to - minimum: 10000 * controlRoot.from - step: 10000 * controlRoot.stepSize - value: 10000 * controlRoot.value + maximum: factor * controlRoot.to + minimum: factor * controlRoot.from + step: factor * controlRoot.stepSize + value: factor * controlRoot.value horizontal: controlRoot.orientation === Qt.Horizontal enabled: controlRoot.enabled hasFocus: controlRoot.activeFocus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/SpinBox.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/SpinBox.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/SpinBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/SpinBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.6 import QtQuick.Window 2.1 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/StackView.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/StackView.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/StackView.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/StackView.qml 2022-08-07 14:24:51.000000000 +0200 @@ -5,9 +5,9 @@ SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later */ -import QtQuick @QQC2_VERSION@ -import QtQuick.Controls @QQC2_VERSION@ -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.20 as Kirigami diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/Switch.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/Switch.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/Switch.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/Switch.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.CheckBox { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/SwitchDelegate.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/SwitchDelegate.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/SwitchDelegate.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/SwitchDelegate.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,7 +8,7 @@ import QtQuick 2.5 import org.kde.kirigami 2.4 as Kirigami -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import "private" T.SwitchDelegate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/TabBar.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/TabBar.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/TabBar.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/TabBar.qml 2022-08-07 14:24:51.000000000 +0200 @@ -9,7 +9,7 @@ import QtQuick 2.6 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.4 as Kirigami -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T T.TabBar { id: controlRoot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/TabButton.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/TabButton.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/TabButton.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/TabButton.qml 2022-08-07 14:24:51.000000000 +0200 @@ -9,9 +9,9 @@ import QtQuick 2.6 import QtQml.Models 2.1 //for TabBar.* -import QtQuick.Controls @QQC2_VERSION@ +import QtQuick.Controls 2.15 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.TabButton { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/TextArea.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/TextArea.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/TextArea.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/TextArea.qml 2022-08-07 14:24:51.000000000 +0200 @@ -9,7 +9,7 @@ import QtQuick 2.12 import QtQuick.Window 2.1 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.18 as Kirigami import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.sonnet 1.0 as Sonnet @@ -132,7 +132,6 @@ } background: StylePrivate.StyleItem { - id: style control: controlRoot elementType: "edit" implicitWidth: 200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/TextField.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/TextField.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/TextField.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/TextField.qml 2022-08-07 14:24:51.000000000 +0200 @@ -8,8 +8,8 @@ import QtQuick 2.12 import QtQuick.Window 2.1 -import QtQuick.Controls @QQC2_VERSION@ as Controls -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 as Controls +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import "private" as Private @@ -70,6 +70,12 @@ Keys.onPressed: { // trigger if context menu button is pressed Private.TextFieldContextMenu.targetKeyPressed(event, controlRoot) + + // Disable undo action for security reasons + // See QTBUG-103934 + if (event.matches(StandardKey.Undo)) { + event.accepted = true + } } onPressAndHold: { @@ -109,8 +115,6 @@ } background: StylePrivate.StyleItem { - id: style - control: controlRoot elementType: "edit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolBar.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolBar.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolBar.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolBar.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.ToolBar { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolButton.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolButton.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolButton.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolButton.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,7 +7,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolSeparator.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolSeparator.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolSeparator.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolSeparator.qml 2022-08-07 14:24:51.000000000 +0200 @@ -6,7 +6,7 @@ import QtQuick 2.6 -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Templates 2.15 as T import org.kde.kirigami 2.4 as Kirigami T.ToolSeparator { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolTip.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolTip.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/ToolTip.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/ToolTip.qml 2022-08-07 14:24:51.000000000 +0200 @@ -7,12 +7,13 @@ import QtQuick 2.6 -import QtQuick.Controls @QQC2_VERSION@ as Controls -import QtQuick.Templates @QQC2_VERSION@ as T +import QtQuick.Controls 2.15 as Controls +import QtQuick.Templates 2.15 as T +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.12 as Kirigami T.ToolTip { - id: controlRoot + id: control Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip Kirigami.Theme.inherit: false @@ -38,12 +39,20 @@ closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent - contentItem: Controls.Label { - text: controlRoot.text - wrapMode: Text.WordWrap - font: controlRoot.font - Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip - color: Kirigami.Theme.textColor + contentItem: RowLayout { + Controls.Label { + // Strip out ampersands right before non-whitespace characters, i.e. + // those used to determine the alt key shortcut + text: control.text.replace(/&(?=\S)/g, "") + wrapMode: Text.WordWrap + font: control.font + color: Kirigami.Theme.textColor + + Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip + Layout.fillWidth: true + // This value is basically arbitrary. It just looks nice. + Layout.maximumWidth: Kirigami.Units.gridUnit * 14 + } } // TODO: Consider replacing this with a StyleItem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/private/MobileTextActionsToolBar.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/private/MobileTextActionsToolBar.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/private/MobileTextActionsToolBar.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/private/MobileTextActionsToolBar.qml 2022-08-07 14:24:51.000000000 +0200 @@ -9,7 +9,7 @@ import QtQuick 2.1 import QtQuick.Layouts 1.2 import QtQuick.Window 2.2 -import QtQuick.Controls @QQC2_VERSION@ +import QtQuick.Controls 2.15 import org.kde.kirigami 2.5 as Kirigami Popup { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/org.kde.desktop/private/TextFieldContextMenu.qml new/qqc2-desktop-style-5.97.0/org.kde.desktop/private/TextFieldContextMenu.qml --- old/qqc2-desktop-style-5.96.0/org.kde.desktop/private/TextFieldContextMenu.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/org.kde.desktop/private/TextFieldContextMenu.qml 2022-08-07 14:24:51.000000000 +0200 @@ -9,7 +9,7 @@ import QtQuick 2.6 import QtQml 2.2 -import QtQuick.Controls @QQC2_VERSION@ +import QtQuick.Controls 2.15 import org.kde.kirigami 2.5 as Kirigami Menu { @@ -172,7 +172,7 @@ } MenuItem { - visible: target !== null && !target.readOnly + visible: target !== null && !target.readOnly && !targetIsPassword action: Action { icon.name: "edit-undo-symbolic" text: qsTr("Undo") @@ -185,7 +185,7 @@ } } MenuItem { - visible: target !== null && !target.readOnly + visible: target !== null && !target.readOnly && !targetIsPassword action: Action { icon.name: "edit-redo-symbolic" text: qsTr("Redo") @@ -198,7 +198,7 @@ } } MenuSeparator { - visible: target !== null && !target.readOnly + visible: target !== null && !target.readOnly && !targetIsPassword } MenuItem { visible: target !== null && !target.readOnly && !targetIsPassword diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.97.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.96.0/plugin/kquickstyleitem.cpp 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/plugin/kquickstyleitem.cpp 2022-08-07 14:24:51.000000000 +0200 @@ -1575,6 +1575,8 @@ font = qApp->font("QMiniFont"); } else if (m_styleoption->state & QStyle::State_Small) { font = qApp->font("QSmallFont"); + } else { + font = QApplication::font(classNameForItem()); } painter->setFont(font); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/CheckBox.qml new/qqc2-desktop-style-5.97.0/tests/CheckBox.qml --- old/qqc2-desktop-style-5.96.0/tests/CheckBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/CheckBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -1,16 +1,27 @@ -import QtQuick 2.3 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +/* + SPDX-FileCopyrightText: 2020 David Redondo <k...@david-redondo.de> + SPDX-FileCopyrightText: 2021 Nate Graham <n...@kde.org> + SPDX-FileCopyrightText: 2021 Aleix Pol <aleix...@kde.org> + + SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later +*/ + +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 ApplicationWindow { - height: layout.implicitHeight width: 300 + height: layout.implicitHeight + ColumnLayout { - width: parent.width id: layout + width: parent.width + CheckBox { } + CheckBox { checked: true enabled: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/LineEditWithClearButton.qml new/qqc2-desktop-style-5.97.0/tests/LineEditWithClearButton.qml --- old/qqc2-desktop-style-5.96.0/tests/LineEditWithClearButton.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/LineEditWithClearButton.qml 2022-08-07 14:24:51.000000000 +0200 @@ -4,18 +4,18 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -import org.kde.kirigami 2.7 as Kirigami +import org.kde.kirigami 2.20 as Kirigami + Kirigami.ActionTextField { - id: __searchField + id: root + focus: true - rightActions: [ - Kirigami.Action { - iconName: "edit-clear" - visible: __searchField.text !== "" - onTriggered: { - __searchField.text = "" - __searchField.accepted() - } + rightActions: Kirigami.Action { + iconName: "edit-clear" + visible: root.text !== "" + onTriggered: { + root.text = "" + root.accepted() } - ] + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/SpinBox.qml new/qqc2-desktop-style-5.97.0/tests/SpinBox.qml --- old/qqc2-desktop-style-5.96.0/tests/SpinBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/SpinBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -3,12 +3,12 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -import QtQuick 2.3 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 -ApplicationWindow -{ +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 + +ApplicationWindow { visible: true width: 800 height: 600 @@ -18,15 +18,16 @@ anchors.margins: 10 flow: GridLayout.TopToBottom - SpinBox{ - id: spinbox - width: 100 - from : 1 - to : 100 - value: 50 - onValueModified: { - console.log(value) - } + SpinBox { + id: spinbox + + width: 100 + from: 1 + to: 100 + value: 50 + onValueModified: { + console.log(value) + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/ToolButton.qml new/qqc2-desktop-style-5.97.0/tests/ToolButton.qml --- old/qqc2-desktop-style-5.96.0/tests/ToolButton.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/ToolButton.qml 2022-08-07 14:24:51.000000000 +0200 @@ -1,9 +1,15 @@ -import QtQuick 2.3 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +/* + SPDX-FileCopyrightText: 2020 Arjen Hiemstra <ahiems...@heimr.nl> + SPDX-FileCopyrightText: 2021 Nate Graham <n...@kde.org> + + SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later +*/ + +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 -ApplicationWindow -{ +ApplicationWindow { visible: true width: 800 height: 600 @@ -51,6 +57,7 @@ display: ToolButton.TextUnderIcon flat: true } + ToolButton { icon.name: "documentinfo" text: "Tool Button highlighted" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/buttonIcons.qml new/qqc2-desktop-style-5.97.0/tests/buttonIcons.qml --- old/qqc2-desktop-style-5.96.0/tests/buttonIcons.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/buttonIcons.qml 2022-08-07 14:24:51.000000000 +0200 @@ -4,17 +4,21 @@ SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later */ -import QtQuick 2.6 -import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 as Controls -import org.kde.kirigami 2.2 as Kirigami +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 as Controls + +import org.kde.kirigami 2.20 as Kirigami Kirigami.ApplicationWindow { id: root + width: 600 height: 600 + Kirigami.Theme.inherit: false Kirigami.Theme.colorSet: Kirigami.Theme.Complementary + header: Controls.MenuBar { Controls.Menu { title: "&File" @@ -37,6 +41,7 @@ } Controls.Menu { title: "Submenu" + Controls.MenuItem { checkable: true text: "Item1" @@ -65,17 +70,20 @@ } } } + Rectangle { id: background - anchors.centerIn: parent - Kirigami.Theme.inherit: false - Kirigami.Theme.colorSet: Kirigami.Theme.Complementary + anchors.centerIn: parent width: childrenRect.width height: childrenRect.height + color: Kirigami.Theme.backgroundColor + Kirigami.Theme.inherit: false + Kirigami.Theme.colorSet: Kirigami.Theme.Complementary ColumnLayout { + spacing: Kirigami.Units.smallSpacing Controls.ComboBox { Kirigami.Theme.inherit: true @@ -84,7 +92,6 @@ onCurrentTextChanged: background.Kirigami.Theme.colorSet = currentText } Controls.Button { - Kirigami.Theme.inherit: true text: "text" icon.name: "go-previous" @@ -95,10 +102,12 @@ icon.name: "go-previous" } RowLayout { + spacing: Kirigami.Units.smallSpacing + Controls.Label { text: "RGB color for icon:" } - Controls.SpinBox{ + Controls.SpinBox { id: red editable: true from: 0 @@ -107,7 +116,7 @@ coloredIconButton.icon.color = Qt.rgba(red.value/255, green.value/255, blue.value/255, 1); } } - Controls.SpinBox{ + Controls.SpinBox { id: green Kirigami.Theme.inherit: true editable: true @@ -117,7 +126,7 @@ coloredIconButton.icon.color = Qt.rgba(red.value/255, green.value/255, blue.value/255, 1); } } - Controls.SpinBox{ + Controls.SpinBox { id: blue editable: true from: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/scrollView.qml new/qqc2-desktop-style-5.97.0/tests/scrollView.qml --- old/qqc2-desktop-style-5.96.0/tests/scrollView.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/scrollView.qml 2022-08-07 14:24:51.000000000 +0200 @@ -1,9 +1,16 @@ -import QtQuick 2.3 -import QtQuick.Controls 2.3 +/* + SPDX-FileCopyrightText: 2018 Marco Martin <m...@kde.org> + + SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later +*/ + +import QtQuick 2.15 +import QtQuick.Controls 2.15 ScrollView { height: 100 width: 300 + ListView { model: 100 delegate: Text { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/tabbar.qml new/qqc2-desktop-style-5.97.0/tests/tabbar.qml --- old/qqc2-desktop-style-5.96.0/tests/tabbar.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/tabbar.qml 2022-08-07 14:24:51.000000000 +0200 @@ -1,6 +1,13 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.12 +/* + SPDX-FileCopyrightText: 2019 David Edmundson <k...@davidedmundson.co.uk> + SPDX-FileCopyrightText: 2021 Nate Graham <n...@kde.org> + + SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later +*/ + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 Item { width: 400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/testBars.qml new/qqc2-desktop-style-5.97.0/tests/testBars.qml --- old/qqc2-desktop-style-5.96.0/tests/testBars.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qqc2-desktop-style-5.97.0/tests/testBars.qml 2022-08-07 14:24:51.000000000 +0200 @@ -0,0 +1,206 @@ +/* + * SPDX-FileCopyrightText: 2022 ivan (@ratijas) tkachenko <m...@ratijas.tk> + * + * SPDX-License-Identifier: LGPL-2.0-or-later + */ + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Templates 2.15 as T +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.20 as Kirigami + +Kirigami.ApplicationWindow { + title: "Progress Bars & Sliders" + width: demo.implicitWidth + height: demo.implicitHeight + + component LoopAnimation : SequentialAnimation { + running: true + + // this is bound to global time, so that you could open multiple + // windows side by side, and they all play in sync + ScriptAction { + script: phase.value = value() + function value() { + var phase = Date.now() % 7000; + if (phase < 500) { + return 0; + } else if (phase < 3500) { + return (phase - 500) / 3000; + } else if (phase < 4000) { + return 1; + } else { + return 1 - ((phase - 4000) / 3000); + } + } + } + PropertyAction { + id: phase + } + PauseAnimation { duration: 1 } + onFinished: restart() + } + + component Demo : GridLayout { + id: layout + columns: 2 + columnSpacing: Kirigami.Units.smallSpacing + rowSpacing: Kirigami.Units.smallSpacing + + Label { + text: "Mirrorring:" + Layout.alignment: Qt.AlignRight + } + + RowLayout { + spacing: Kirigami.Units.smallSpacing + Label { + text: layout.LayoutMirroring.enabled ? "Enabled" : "Disabled" + Layout.rightMargin: Kirigami.Units.gridUnit * 2 + } + + Label { + text: "Inherit:" + Layout.alignment: Qt.AlignRight + } + + Label { + text: layout.LayoutMirroring.childrenInherit ? "Yes" : "No" + } + } + + Label { + text: "Value:" + Layout.alignment: Qt.AlignRight + } + + Label { + text: value.toFixed(2) + property real value + LoopAnimation on value {} + Layout.fillWidth: true + } + + Item { + Layout.preferredHeight: Kirigami.Units.gridUnit + Layout.columnSpan: 2 + } + + Label { + text: "Progress Bar:" + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + } + + ProgressBar { + LoopAnimation on value {} + Layout.fillWidth: true + } + + Item { + Layout.preferredHeight: Kirigami.Units.gridUnit + Layout.columnSpan: 2 + } + + Label { + text: "Indeterminate:" + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + } + + ProgressBar { + indeterminate: true + Layout.fillWidth: true + } + + Item { + Layout.preferredHeight: Kirigami.Units.gridUnit + Layout.columnSpan: 2 + } + + Label { + text: "Slider:" + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + } + + Slider { + stepSize: 0.1 + LoopAnimation on value {} + Layout.fillWidth: true + } + + Item { + Layout.preferredHeight: Kirigami.Units.gridUnit + Layout.columnSpan: 2 + } + + Label { + text: "Manual:" + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + } + + // Test for BUG-455339 + Slider { + to: 300000 + stepSize: 30000 + value: 90000 + Layout.fillWidth: true + } + } + + Kirigami.Page { + id: demo + + anchors.fill: parent + contentItem: ColumnLayout { + spacing: Kirigami.Units.largeSpacing + RowLayout { + Layout.fillWidth: false + Layout.fillHeight: false + Layout.alignment: Qt.AlignHCenter + spacing: Kirigami.Units.smallSpacing + + Label { + text: "Application Layout Direction:" + Layout.alignment: Qt.AlignRight + } + Label { + text: Qt.application.layoutDirection === Qt.RightToLeft ? "Right to Left" : "Left to Right" + } + } + Kirigami.Separator { Layout.fillWidth: true } + RowLayout { + Layout.fillHeight: false + spacing: Kirigami.Units.largeSpacing + + Demo { + id: sampleDemo + LayoutMirroring.enabled: true + LayoutMirroring.childrenInherit: true + } + Kirigami.Separator { Layout.fillHeight: true } + Demo { + LayoutMirroring.enabled: false + LayoutMirroring.childrenInherit: true + } + Layout.bottomMargin: Kirigami.Units.gridUnit + } + Kirigami.Separator { Layout.fillWidth: true } + Demo { + Layout.fillWidth: false + Layout.fillHeight: false + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: sampleDemo.width + } + Item { + Layout.fillHeight: true + } + Kirigami.SelectableLabel { + Layout.fillWidth: true + horizontalAlignment: Text.AlignHCenter + textFormat: Text.MarkdownText + text: "Hint: run this test both with `export LANGUAGE=ar:en_US LANG=ar_EG.UTF-8 LC_ALL=` and `export LANGUAGE=en:en_US LANG=en_US.UTF-8 LC_ALL=` environments." + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/testComboBox.qml new/qqc2-desktop-style-5.97.0/tests/testComboBox.qml --- old/qqc2-desktop-style-5.96.0/tests/testComboBox.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/testComboBox.qml 2022-08-07 14:24:51.000000000 +0200 @@ -1,6 +1,13 @@ -import QtQuick 2.3 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +/* + SPDX-FileCopyrightText: 2019 Aleix Pol <aleix...@kde.org> + SPDX-FileCopyrightText: 2020 Chris Holland <zrenf...@gmail.com> + + SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later +*/ + +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 ApplicationWindow { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.96.0/tests/testScrollView.qml new/qqc2-desktop-style-5.97.0/tests/testScrollView.qml --- old/qqc2-desktop-style-5.96.0/tests/testScrollView.qml 2022-07-02 16:40:30.000000000 +0200 +++ new/qqc2-desktop-style-5.97.0/tests/testScrollView.qml 2022-08-07 14:24:51.000000000 +0200 @@ -1,29 +1,40 @@ -import QtQuick 2.3 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +/* + SPDX-FileCopyrightText: 2018 Aleix Pol <aleix...@kde.org> -ApplicationWindow -{ + SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later +*/ + +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 + +import org.kde.kirigami 2.20 as Kirigami + +ApplicationWindow { visible: true + RowLayout { anchors.fill: parent + spacing: Kirigami.Units.smallSpacing + ScrollView { Layout.fillWidth: true Layout.fillHeight: true - Layout.minimumWidth: parent.width/2 + Layout.preferredWidth: parent.width / 2 TextArea { text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur ultricies consequat nulla, ut vulputate nulla ultricies ac. Suspendisse lacinia commodo lacus, non tristique mauris dictum vitae. Sed adipiscing augue nec nisi aliquet viverra. Etiam sit amet nulla in tellus consectetur feugiat. Cras in sem tortor. Fusce a nulla at justo accumsan gravida. Maecenas dui felis, lacinia at ornare sed, aliquam et purus. Sed ut sagittis lacus. Etiam dictum pharetra rhoncus. Suspendisse auctor orci ipsum. Pellentesque vitae urna nec felis consequat lobortis dictum in urna. Phasellus a mi ac leo adipiscing varius eget a felis. Cras magna augue, commodo sed placerat vel, tempus vel ligula. In feugiat quam quis est lobortis sed accumsan nunc malesuada. Mauris quis massa sit amet felis tempus suscipit a quis diam.\n\n" + "Aenean quis nulla erat, vel sagittis sem. Praesent vitae mauris arcu. Cras porttitor, ante at scelerisque sodales, nibh felis consectetur orci, ut hendr erit urna urna non urna. Duis eu magna id mi scelerisque adipiscing. Aliquam sed quam in eros sodales accumsan. Phasellus tempus sagittis suscipit. Aliquam rutrum dictum justo ut viverra. Nulla felis sem, molestie sed scelerisque non, consequat vitae nulla. Aliquam ullamcorper malesuada mi, vel vestibulum magna vulputate eget. In hac habitasse platea dictumst. Cras sed lacus dui, vel semper sem. Aenean sodales porta leo vel fringilla.\n\n" + "Ut tempus massa et urna porta non mollis metus ultricies. Duis nec nulla ac metus auctor porta id et mi. Mauris aliquam nibh a ligula malesuada sed tincidunt nibh varius. Sed felis metus, porta et adipiscing non, faucibus id leo. Donec ipsum nibh, hendrerit eget aliquam nec, tempor ut mauris. Suspendisse potenti. Vestibulum scelerisque adipiscing libero tristique eleifend. Donec quis tortor eget elit mollis iaculis ac sit amet nisi. Proin non massa sed nunc rutrum pellentesque. Sed dui lectus, laoreet sed condimentum id, commodo sed urna.\n\n" + "Praesent tincidunt mattis massa mattis porta. Nullam posuere neque at mauris vestibulum vitae elementum leo sodales. Quisque condimentum lectus in libero luctus egestas. Fusce tempor neque ac dui tincidunt eget viverra quam suscipit. In hac habitasse platea dictumst. Etiam metus mi, adipiscing nec suscipit id, aliquet sed sem. Duis urna ligula, ornare sed vestibulum vel, molestie ac nisi. Morbi varius iaculis ligula. Nunc in augue leo, sit amet aliquam elit. Suspendisse rutrum sem diam. Proin eu orci nisl. Praesent porttitor dignissim est, id fermentum arcu venenatis vitae.\n\n" + "Integer in sapien eget quam vulputate lobortis. Morbi nibh elit, elementum vitae vehicula sed, consequat nec erat. Donec placerat porttitor est ut dapibus. Fusce augue orci, dictum et convallis vel, blandit eu tortor. Phasellus non eros nulla. In iaculis nulla fermentum nulla gravida eu mattis purus consectetur. Integer dui nunc, sollicitudin ac tincidunt nec, hendrerit bibendum nunc. Proin sit amet au gue ac velit egestas varius. Sed eu ante quis orci vestibulum sagittis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus vitae urna odio, at molestie leo. In convallis neque vel mi dictum convallis lobortis turpis sagittis.\n\n" } } + ScrollView { Layout.fillWidth: true Layout.fillHeight: true - Layout.minimumWidth: parent.width / 2 + Layout.preferredWidth: parent.width / 2 ListView { model: 100 delegate: ItemDelegate { text: modelData - width: parent.width + width: ListView.view.width } } }
