From d1439ef344277f876519e05ea9f8787cde97e609 Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Sat, 26 Oct 2024 17:29:23 +0100 Subject: [PATCH 1/9] 3rdparty dependencies --- CMakeLists.txt | 9 ++++++--- README.md | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b30451c2a..bd50974fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,9 @@ cmake_minimum_required(VERSION 3.16) project(lightly) -set(PROJECT_VERSION "6.80") +set(PROJECT_VERSION "lightly0.5.3") set(PROJECT_VERSION_MAJOR 6) - -set(KF6_MIN_VERSION "5.240.0") +set(KF6_MIN_VERSION "6.2.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") set(QT_MIN_VERSION "6.6.0") @@ -36,6 +35,10 @@ set(QT_MAJOR_VERSION 6) include(KDEInstallDirs6) include(KDECMakeSettings) +# 3rd-party libraries + +include(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/build-assets/klassy/klassy.cmake) + option(WITH_DECORATIONS "Build Lightly window decorations for KWin" ON) find_package(Qt6 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets DBus) diff --git a/README.md b/README.md index 6d0ccd168..b891be917 100644 --- a/README.md +++ b/README.md @@ -174,3 +174,14 @@ The fix for now until QT is updated is to add `QT_SCALE_FACTOR_ROUNDING_POLICY=R Restart to apply the changes. For further details see: https://bugs.kde.org/show_bug.cgi?id=479891 + + +--- + +# cmake +# cmake --build build_kf6 -j $(nproc) +# sudo cmake --install build_kf6 + +# sudo rm /usr/lib/qt6/plugins/org.kde.kdecoration2/org.kde.klassy.so +# sudo rm -rf /usr/lib/qt6/plugins/org.kde.kdecoration2.kcm/*klassy* +# sudo rm -f /usr/lib/*klassy* \ No newline at end of file From 263dc66a14cec797a838e1a5bc09afcd4bee1370 Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Sat, 26 Oct 2024 17:33:32 +0100 Subject: [PATCH 2/9] 3rdparty dependencies --- 3rdparty/build-assets/klassy/CMakeLists.txt | 111 ++++++++++++++++++ .../build-assets/klassy/KlassyConfig.cmake.in | 11 ++ 3rdparty/build-assets/klassy/klassy.cmake | 46 ++++++++ 3 files changed, 168 insertions(+) create mode 100644 3rdparty/build-assets/klassy/CMakeLists.txt create mode 100644 3rdparty/build-assets/klassy/KlassyConfig.cmake.in create mode 100644 3rdparty/build-assets/klassy/klassy.cmake diff --git a/3rdparty/build-assets/klassy/CMakeLists.txt b/3rdparty/build-assets/klassy/CMakeLists.txt new file mode 100644 index 000000000..285f5ab40 --- /dev/null +++ b/3rdparty/build-assets/klassy/CMakeLists.txt @@ -0,0 +1,111 @@ +cmake_minimum_required(VERSION 3.16) +project(klassy) +set(PROJECT_VERSION "6.2.breeze6.2.1") +set(PROJECT_VERSION_MAJOR 6) + +add_definitions( -DKLASSY_VERSION="${PROJECT_VERSION}" -DKLASSY_GIT_MASTER=0) + +set(KF6_MIN_VERSION "6.2.0") +set(KDE_COMPILERSETTINGS_LEVEL "5.82") +set(QT_MIN_VERSION "6.6.0") + +include(GenerateExportHeader) +include(WriteBasicConfigVersionFile) +include(FeatureSummary) + +find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) + +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +# We need this because we can't include KDECMakeSettings here, because that +# would need KDEInstallDirs, which we can only include in the qt{5,6} builds +# to get the correct installation dirs for each Qt version. +option(BUILD_TESTING "Build the testing tree." ON) +if(BUILD_TESTING) + enable_testing() +endif() + +include(CMakePackageConfigHelpers) +include(ECMInstallIcons) +include(KDECompilerSettings NO_POLICY_SCOPE) +include(KDEClangFormat) +include(KDEGitCommitHooks) + +option(BUILD_QT6 "Build with Qt6" ON) + +set(QT_NO_CREATE_VERSIONLESS_TARGETS ON) +set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON) + +set(WITH_DECORATIONS ON) + + +set(QT_MAJOR_VERSION 6) +include(KDEInstallDirs6) +include(KDECMakeSettings) + +if(UNIX AND NOT APPLE AND NOT ANDROID) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + set(HAVE_QTDBUS ${Qt6DBus_FOUND}) + + find_package(KF6FrameworkIntegration ${KF6_MIN_VERSION} CONFIG ) + set_package_properties(KF${QT_MAJOR_VERSION}FrameworkIntegration PROPERTIES + DESCRIPTION "KF6 Framework Integration" + URL "https://projects.kde.org/projects/frameworks/frameworkintegration" + TYPE OPTIONAL + PURPOSE "Required to use KStyle convenience functionalities in style") + + find_package(KF6KCMUtils ${KF6_MIN_VERSION}) + set_package_properties(KF6KCMUtils PROPERTIES + TYPE REQUIRED + DESCRIPTION "Helps create configuration modules" + PURPOSE "KCMUtils used for the configuration modules or the decoration and Qt Style" + ) +else() + set(WITH_DECORATIONS OFF) +endif() + +find_package(Qt6 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Svg Xml) #Svg and Xml only needed for settings (Qt6 only) + +find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS + GuiAddons + I18n + WindowSystem) + +find_package(Qt6 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Quick) +if(${Qt6Quick_FOUND}) + find_package(KF6KirigamiPlatform ${KF6_MIN_VERSION} REQUIRED) +endif() + +set(BREEZE_HAVE_KSTYLE ${KF6FrameworkIntegration_FOUND}) +set(BREEZE_HAVE_QTQUICK ${Qt6Quick_FOUND}) + +# https://bugreports.qt.io/browse/QTBUG-114706 +add_library(Qt::Core ALIAS Qt6::Core) +add_library(Qt::Gui ALIAS Qt6::Gui) +add_library(Qt::OpenGL ALIAS Qt6::OpenGL) +add_library(Qt::Network ALIAS Qt6::Network) +if(Qt6_VERSION_MINOR GREATER 6) + add_library(Qt::PlatformModuleInternal ALIAS Qt6::PlatformModuleInternal) +endif() + +add_subdirectory(libbreezecommon libbreezecommon6) + + + +find_package(KDecoration2 REQUIRED) +add_subdirectory(kdecoration) + + +unset(QUERY_EXECUTABLE CACHE) + + +#include(KDEInstallDirs) + +# add clang-format target for all our real source files +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) +kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) + +feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/3rdparty/build-assets/klassy/KlassyConfig.cmake.in b/3rdparty/build-assets/klassy/KlassyConfig.cmake.in new file mode 100644 index 000000000..1f4e0fe86 --- /dev/null +++ b/3rdparty/build-assets/klassy/KlassyConfig.cmake.in @@ -0,0 +1,11 @@ +@PACKAGE_INIT@ + +set(BREEZE_WITH_KDECORATION @WITH_DECORATIONS@) +if(${BREEZE_WITH_KDECORATION}) + set(BREEZE_KDECORATION_PLUGIN_ID "org.kde.klassy") +else() + set(BREEZE_KDECORATION_PLUGIN_ID "") +endif() + +set(BREEZE_STYLE_NAME "klassy") +set(BREEZE_COLOR_INSTALL_ROOT "@PACKAGE_KDE_INSTALL_FULL_DATADIR@/color-schemes/") diff --git a/3rdparty/build-assets/klassy/klassy.cmake b/3rdparty/build-assets/klassy/klassy.cmake new file mode 100644 index 000000000..748032eed --- /dev/null +++ b/3rdparty/build-assets/klassy/klassy.cmake @@ -0,0 +1,46 @@ +set(KLASSY_TAG "6.2.breeze6.2.1") +set(KLASSY_PREFIX "klassy") +set(KLASSY_DESTDIR ${CMAKE_CURRENT_BINARY_DIR}/klassy/bin) +include(ECMSetupVersion) +include(ExternalProject) + +# patch klassy CMakeLists.txt since it contains QT5 references + +if(KLASSY_DECORATIONS) + message("Klassy decorations build -- ON") + ExternalProject_Add( + ${KLASSY_PREFIX} + URL "https://github.com/paulmcauley/${KLASSY_PREFIX}/archive/refs/tags/${KLASSY_TAG}.tar.gz" + PREFIX ${KLASSY_PREFIX} + DOWNLOAD_EXTRACT_TIMESTAMP false + SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/${KLASSY_PREFIX}" + PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/3rdparty/build-assets/klassy/CMakeLists.txt /CMakeLists.txt + INSTALL_COMMAND make DESTDIR=${KLASSY_DESTDIR} install + ) + + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Klassy") + + install(DIRECTORY ${KLASSY_DESTDIR}/${CMAKE_INSTALL_PREFIX}/ DESTINATION ".") + + # create a Config.cmake and a ConfigVersion.cmake file and install them + + ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX BREEZE + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfigVersion.cmake" + ) + #set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Klassy") + + configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/build-assets/${KLASSY_PREFIX}/KlassyConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfig.cmake" + PATH_VARS KDE_INSTALL_FULL_DATADIR + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + ) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) +else() + message("Klassy decorations build -- OFF") +endif() + + From b62cbecbe85478438bb3b42d10e9299b8e5c6979 Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Sat, 26 Oct 2024 17:34:34 +0100 Subject: [PATCH 3/9] Removing comments --- README.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index b891be917..bd614a557 100644 --- a/README.md +++ b/README.md @@ -173,15 +173,4 @@ The fix for now until QT is updated is to add `QT_SCALE_FACTOR_ROUNDING_POLICY=R Restart to apply the changes. -For further details see: https://bugs.kde.org/show_bug.cgi?id=479891 - - ---- - -# cmake -# cmake --build build_kf6 -j $(nproc) -# sudo cmake --install build_kf6 - -# sudo rm /usr/lib/qt6/plugins/org.kde.kdecoration2/org.kde.klassy.so -# sudo rm -rf /usr/lib/qt6/plugins/org.kde.kdecoration2.kcm/*klassy* -# sudo rm -f /usr/lib/*klassy* \ No newline at end of file +For further details see: https://bugs.kde.org/show_bug.cgi?id=479891 \ No newline at end of file From 2fa2364f0ef27adbb961754fa45d376b7cdd279e Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Sat, 26 Oct 2024 17:35:46 +0100 Subject: [PATCH 4/9] New line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd614a557..6d0ccd168 100644 --- a/README.md +++ b/README.md @@ -173,4 +173,4 @@ The fix for now until QT is updated is to add `QT_SCALE_FACTOR_ROUNDING_POLICY=R Restart to apply the changes. -For further details see: https://bugs.kde.org/show_bug.cgi?id=479891 \ No newline at end of file +For further details see: https://bugs.kde.org/show_bug.cgi?id=479891 From 77357da9c9f9bc45e1939faae65354c842d65945 Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Mon, 28 Oct 2024 15:58:25 +0000 Subject: [PATCH 5/9] Minor config ui changes. --- kstyle/config/lightlystyleconfig.cpp | 16 +- kstyle/config/ui/lightlystyleconfig.ui | 821 ++++++++++++++----------- 2 files changed, 488 insertions(+), 349 deletions(-) diff --git a/kstyle/config/lightlystyleconfig.cpp b/kstyle/config/lightlystyleconfig.cpp index 7a705a42d..545f81dfd 100644 --- a/kstyle/config/lightlystyleconfig.cpp +++ b/kstyle/config/lightlystyleconfig.cpp @@ -61,8 +61,12 @@ namespace Lightly connect( _scrollBarSubLineButtons, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); connect( _windowDragMode, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) ); connect( _menuOpacity, &QAbstractSlider::valueChanged, this, &StyleConfig::updateChanged ); + connect(_menuOpacity, SIGNAL(valueChanged(int)), _menuOpacitySpinBox, SLOT(setValue(int))); + connect(_menuOpacitySpinBox, SIGNAL(valueChanged(int)), _menuOpacity, SLOT(setValue(int))); connect( _buttonSize, &QAbstractSlider::valueChanged, this, &StyleConfig::updateChanged ); connect( _sidebarOpacity, &QAbstractSlider::valueChanged, this, &StyleConfig::updateChanged ); + connect(_sidebarOpacity, SIGNAL(valueChanged(int)), _sidebarOpacitySpinBox, SLOT(setValue(int))); + connect(_sidebarOpacitySpinBox, SIGNAL(valueChanged(int)), _sidebarOpacity, SLOT(setValue(int))); connect( _kTextEditDrawFrame, &QAbstractButton::toggled, this, &StyleConfig::updateChanged ); connect( _widgetDrawShadow, &QAbstractButton::toggled, this, &StyleConfig::updateChanged ); connect( _oldTabbar, &QAbstractButton::toggled, this, &StyleConfig::updateChanged ); @@ -146,9 +150,15 @@ namespace Lightly else if( _animationsEnabled->isChecked() != StyleConfigData::animationsEnabled() ) modified = true; else if( _animationsDuration->value() != StyleConfigData::animationsDuration() ) modified = true; else if( _windowDragMode->currentIndex() != StyleConfigData::windowDragMode() ) modified = true; - else if( _menuOpacity->value() != StyleConfigData::menuOpacity() ) modified = true; + else if( _menuOpacity->value() != StyleConfigData::menuOpacity() ) { + modified = true; + _menuOpacitySpinBox->setValue( _menuOpacity->value() ); + } else if( _buttonSize->value() != StyleConfigData::buttonSize() ) modified = true; - else if( _sidebarOpacity->value() != StyleConfigData::dolphinSidebarOpacity() ) modified = true; + else if( _sidebarOpacity->value() != StyleConfigData::dolphinSidebarOpacity() ) { + modified = true; + _sidebarOpacitySpinBox->setValue( _sidebarOpacity->value() ); + } else if( _kTextEditDrawFrame->isChecked() != StyleConfigData::kTextEditDrawFrame() ) modified = true; else if( _widgetDrawShadow->isChecked() != StyleConfigData::widgetDrawShadow() ) modified = true; else if( _oldTabbar->isChecked() != StyleConfigData::oldTabbar() ) modified = true; @@ -181,7 +191,9 @@ namespace Lightly _animationsDuration->setValue( StyleConfigData::animationsDuration() ); _windowDragMode->setCurrentIndex( StyleConfigData::windowDragMode() ); _menuOpacity->setValue( StyleConfigData::menuOpacity() ); + _menuOpacitySpinBox->setValue( StyleConfigData::menuOpacity() ); _sidebarOpacity->setValue( StyleConfigData::dolphinSidebarOpacity() ); + _sidebarOpacitySpinBox->setValue( StyleConfigData::dolphinSidebarOpacity() ); _buttonSize->setValue( StyleConfigData::buttonSize() ); _kTextEditDrawFrame->setChecked( StyleConfigData::kTextEditDrawFrame() ); _widgetDrawShadow->setChecked( StyleConfigData::widgetDrawShadow() ); diff --git a/kstyle/config/ui/lightlystyleconfig.ui b/kstyle/config/ui/lightlystyleconfig.ui index 7968ae582..8705b99d9 100644 --- a/kstyle/config/ui/lightlystyleconfig.ui +++ b/kstyle/config/ui/lightlystyleconfig.ui @@ -6,8 +6,8 @@ 0 0 - 609 - 444 + 772 + 521 @@ -31,6 +31,18 @@ + + + 0 + 0 + + + + + 16777215 + 16777215 + + 0 @@ -39,27 +51,47 @@ General - - - - Qt::LeftToRight + + + + Qt::Orientation::Vertical + + + 20 + 49 + + + + + + - Button Size: + Draw focus indicator in lists - - + + - Bigger + Draw toolbar item separators - - + + - Unify konsole tab bar with header area + Draw widget shadow + + + + + + + Qt::LayoutDirection::LeftToRight + + + Button Size: @@ -75,44 +107,21 @@ W&indows' drag mode: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignJustify|Qt::AlignmentFlag::AlignVCenter _windowDragMode - - - - Corner radius: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 65 - 20 - - - - - - + + - Draw widget shadow + „TabBarAltStyle” - + -2 @@ -127,37 +136,64 @@ 4 - Qt::Horizontal + Qt::Orientation::Horizontal - QSlider::TicksBelow + QSlider::TickPosition::TicksBelow 2 - - + + + + Old tabbar + + + + + + + Draw highlight on active tab + + + + + - Always Hide Keyboard Accelerators + Drag windows from titlebar only - Show Keyboard Accelerators When Needed + Drag windows from titlebar, menubar and toolbars - Always Show Keyboard Accelerators + Drag windows from all empty areas - + + + + Unify konsole tab bar with header area + + + + + + + 0 + 0 + + px @@ -172,46 +208,36 @@ - - + + - „TabBarAltStyle” + &Keyboard accelerators visibility: - - - - - - Draw focus indicator in lists + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - Smaller + + _mnemonicsMode - - - - Qt::Vertical - - - - 20 - 49 - - - - - - - - Draw toolbar item separators - - + + + + + + Smaller + + + + + + + Bigger + + + + @@ -223,51 +249,99 @@ - - + + - Drag windows from titlebar only + Always Hide - Drag windows from titlebar, menubar and toolbars + When Needed - Drag windows from all empty areas + Always Show - - + + - &Keyboard accelerators visibility: + Corner radius: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - _mnemonicsMode + Qt::AlignmentFlag::AlignJustify|Qt::AlignmentFlag::AlignVCenter - - - - Draw highlight on active tab + + + + Qt::Orientation::Horizontal - + + + 40 + 20 + + + - - - - Old tabbar + + + + Qt::Orientation::Horizontal - + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + @@ -285,7 +359,7 @@ A&nimations duration: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter _animationsDuration @@ -315,7 +389,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -328,7 +402,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -390,7 +464,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -407,151 +481,75 @@ Scrollbars - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Bottom arrow button t&ype: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - _scrollBarAddLineButtons - - - - - - - &Top arrow button type: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - _scrollBarSubLineButtons - - - - - - - - No Buttons - - - - - One Button - - - - - Two Buttons - - - - - - - - - No Buttons - - - - - One Button - - - - - Two Buttons - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Render a thin separator between the scrollbar - - + + - - - - - Transparency - - - - - - + + + + - Transparent + &Top arrow button type: + + + _scrollBarSubLineButtons - - - - Qt::Horizontal - - - - 40 - 20 - - - + + + + + No Buttons + + + + + One Button + + + + + Two Buttons + + + - - - - - 0 - 0 - - + + - Opaque + Bottom arrow button t&ype: + + + _scrollBarAddLineButtons + + + + + No Buttons + + + + + One Button + + + + + Two Buttons + + + + - - + + - Qt::Vertical + Qt::Orientation::Vertical @@ -561,120 +559,253 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - + + + + Render a thin separator between the scrollbar - + - - + + - Qt::Horizontal - - - QSizePolicy::Preferred + Qt::Orientation::Horizontal - 542 + 40 20 - - - - 0 - + + + + + Transparency + + + + - - - Menu: - - - - - - - 0 - - - 100 - - - 1 - - - 10 - - - 100 - - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksBelow - - - 10 - - - - - - - Sidebars: - - - - - - - 100 - - - 1 - - - 10 - - - 60 - - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksBelow - - - 10 - + + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 69 + 20 + + + + + + + + + 0 + 0 + + + + Transparent + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Preferred + + + + 186 + 20 + + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Opaque + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 91 + 20 + + + + + + + + + + + + Menu: + + + + + + + 0 + + + 100 + + + 1 + + + 10 + + + 100 + + + Qt::Orientation::Horizontal + + + false + + + false + + + QSlider::TickPosition::TicksBelow + + + 10 + + + + + + + % + + + 100 + + + + + + + + + + + Sidebars: + + + + + + + 100 + + + 1 + + + 10 + + + 100 + + + 100 + + + Qt::Orientation::Horizontal + + + false + + + false + + + QSlider::TickPosition::TicksBelow + + + 10 + + + + + + + % + + + 100 + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + @@ -688,16 +819,12 @@ _tabDrawHighlight _toolBarDrawItemSeparator - _mnemonicsMode - _windowDragMode _animationsEnabled _animationsDuration _dockWidgetDrawFrame _titleWidgetDrawFrame _sidePanelDrawFrame _menuItemDrawThinFocus - _scrollBarSubLineButtons - _scrollBarAddLineButtons From 25349144a42349256bcce1cfcaa0d69b220c0eee Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Mon, 28 Oct 2024 16:00:54 +0000 Subject: [PATCH 6/9] Cleanup of unrequired changes --- 3rdparty/build-assets/klassy/CMakeLists.txt | 111 ------------------ .../build-assets/klassy/KlassyConfig.cmake.in | 11 -- 3rdparty/build-assets/klassy/klassy.cmake | 46 -------- 3 files changed, 168 deletions(-) delete mode 100644 3rdparty/build-assets/klassy/CMakeLists.txt delete mode 100644 3rdparty/build-assets/klassy/KlassyConfig.cmake.in delete mode 100644 3rdparty/build-assets/klassy/klassy.cmake diff --git a/3rdparty/build-assets/klassy/CMakeLists.txt b/3rdparty/build-assets/klassy/CMakeLists.txt deleted file mode 100644 index 285f5ab40..000000000 --- a/3rdparty/build-assets/klassy/CMakeLists.txt +++ /dev/null @@ -1,111 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(klassy) -set(PROJECT_VERSION "6.2.breeze6.2.1") -set(PROJECT_VERSION_MAJOR 6) - -add_definitions( -DKLASSY_VERSION="${PROJECT_VERSION}" -DKLASSY_GIT_MASTER=0) - -set(KF6_MIN_VERSION "6.2.0") -set(KDE_COMPILERSETTINGS_LEVEL "5.82") -set(QT_MIN_VERSION "6.6.0") - -include(GenerateExportHeader) -include(WriteBasicConfigVersionFile) -include(FeatureSummary) - -find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) - -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -# We need this because we can't include KDECMakeSettings here, because that -# would need KDEInstallDirs, which we can only include in the qt{5,6} builds -# to get the correct installation dirs for each Qt version. -option(BUILD_TESTING "Build the testing tree." ON) -if(BUILD_TESTING) - enable_testing() -endif() - -include(CMakePackageConfigHelpers) -include(ECMInstallIcons) -include(KDECompilerSettings NO_POLICY_SCOPE) -include(KDEClangFormat) -include(KDEGitCommitHooks) - -option(BUILD_QT6 "Build with Qt6" ON) - -set(QT_NO_CREATE_VERSIONLESS_TARGETS ON) -set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON) - -set(WITH_DECORATIONS ON) - - -set(QT_MAJOR_VERSION 6) -include(KDEInstallDirs6) -include(KDECMakeSettings) - -if(UNIX AND NOT APPLE AND NOT ANDROID) - find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) - set(HAVE_QTDBUS ${Qt6DBus_FOUND}) - - find_package(KF6FrameworkIntegration ${KF6_MIN_VERSION} CONFIG ) - set_package_properties(KF${QT_MAJOR_VERSION}FrameworkIntegration PROPERTIES - DESCRIPTION "KF6 Framework Integration" - URL "https://projects.kde.org/projects/frameworks/frameworkintegration" - TYPE OPTIONAL - PURPOSE "Required to use KStyle convenience functionalities in style") - - find_package(KF6KCMUtils ${KF6_MIN_VERSION}) - set_package_properties(KF6KCMUtils PROPERTIES - TYPE REQUIRED - DESCRIPTION "Helps create configuration modules" - PURPOSE "KCMUtils used for the configuration modules or the decoration and Qt Style" - ) -else() - set(WITH_DECORATIONS OFF) -endif() - -find_package(Qt6 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Svg Xml) #Svg and Xml only needed for settings (Qt6 only) - -find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS - GuiAddons - I18n - WindowSystem) - -find_package(Qt6 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Quick) -if(${Qt6Quick_FOUND}) - find_package(KF6KirigamiPlatform ${KF6_MIN_VERSION} REQUIRED) -endif() - -set(BREEZE_HAVE_KSTYLE ${KF6FrameworkIntegration_FOUND}) -set(BREEZE_HAVE_QTQUICK ${Qt6Quick_FOUND}) - -# https://bugreports.qt.io/browse/QTBUG-114706 -add_library(Qt::Core ALIAS Qt6::Core) -add_library(Qt::Gui ALIAS Qt6::Gui) -add_library(Qt::OpenGL ALIAS Qt6::OpenGL) -add_library(Qt::Network ALIAS Qt6::Network) -if(Qt6_VERSION_MINOR GREATER 6) - add_library(Qt::PlatformModuleInternal ALIAS Qt6::PlatformModuleInternal) -endif() - -add_subdirectory(libbreezecommon libbreezecommon6) - - - -find_package(KDecoration2 REQUIRED) -add_subdirectory(kdecoration) - - -unset(QUERY_EXECUTABLE CACHE) - - -#include(KDEInstallDirs) - -# add clang-format target for all our real source files -file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) -kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) -kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) - -feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/3rdparty/build-assets/klassy/KlassyConfig.cmake.in b/3rdparty/build-assets/klassy/KlassyConfig.cmake.in deleted file mode 100644 index 1f4e0fe86..000000000 --- a/3rdparty/build-assets/klassy/KlassyConfig.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ -@PACKAGE_INIT@ - -set(BREEZE_WITH_KDECORATION @WITH_DECORATIONS@) -if(${BREEZE_WITH_KDECORATION}) - set(BREEZE_KDECORATION_PLUGIN_ID "org.kde.klassy") -else() - set(BREEZE_KDECORATION_PLUGIN_ID "") -endif() - -set(BREEZE_STYLE_NAME "klassy") -set(BREEZE_COLOR_INSTALL_ROOT "@PACKAGE_KDE_INSTALL_FULL_DATADIR@/color-schemes/") diff --git a/3rdparty/build-assets/klassy/klassy.cmake b/3rdparty/build-assets/klassy/klassy.cmake deleted file mode 100644 index 748032eed..000000000 --- a/3rdparty/build-assets/klassy/klassy.cmake +++ /dev/null @@ -1,46 +0,0 @@ -set(KLASSY_TAG "6.2.breeze6.2.1") -set(KLASSY_PREFIX "klassy") -set(KLASSY_DESTDIR ${CMAKE_CURRENT_BINARY_DIR}/klassy/bin) -include(ECMSetupVersion) -include(ExternalProject) - -# patch klassy CMakeLists.txt since it contains QT5 references - -if(KLASSY_DECORATIONS) - message("Klassy decorations build -- ON") - ExternalProject_Add( - ${KLASSY_PREFIX} - URL "https://github.com/paulmcauley/${KLASSY_PREFIX}/archive/refs/tags/${KLASSY_TAG}.tar.gz" - PREFIX ${KLASSY_PREFIX} - DOWNLOAD_EXTRACT_TIMESTAMP false - SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/${KLASSY_PREFIX}" - PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/3rdparty/build-assets/klassy/CMakeLists.txt /CMakeLists.txt - INSTALL_COMMAND make DESTDIR=${KLASSY_DESTDIR} install - ) - - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Klassy") - - install(DIRECTORY ${KLASSY_DESTDIR}/${CMAKE_INSTALL_PREFIX}/ DESTINATION ".") - - # create a Config.cmake and a ConfigVersion.cmake file and install them - - ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX BREEZE - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfigVersion.cmake" - ) - #set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Klassy") - - configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/build-assets/${KLASSY_PREFIX}/KlassyConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfig.cmake" - PATH_VARS KDE_INSTALL_FULL_DATADIR - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KlassyConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) -else() - message("Klassy decorations build -- OFF") -endif() - - From 49797c61bc03015c65a08da05529d53d4904d830 Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Mon, 28 Oct 2024 16:02:12 +0000 Subject: [PATCH 7/9] Aligning CMakelists --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd50974fb..8c5977a08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(lightly) -set(PROJECT_VERSION "lightly0.5.3") +set(PROJECT_VERSION "6.80") set(PROJECT_VERSION_MAJOR 6) -set(KF6_MIN_VERSION "6.2.0") + +set(KF6_MIN_VERSION "5.240.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") set(QT_MIN_VERSION "6.6.0") From 3988069151714464849f0e80be642a9e3ca14c68 Mon Sep 17 00:00:00 2001 From: DeltaCopy <7x0bb03yq@mozmail.com> Date: Mon, 28 Oct 2024 16:02:34 +0000 Subject: [PATCH 8/9] Aligning CMakelists --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c5977a08..b30451c2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,10 +36,6 @@ set(QT_MAJOR_VERSION 6) include(KDEInstallDirs6) include(KDECMakeSettings) -# 3rd-party libraries - -include(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/build-assets/klassy/klassy.cmake) - option(WITH_DECORATIONS "Build Lightly window decorations for KWin" ON) find_package(Qt6 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets DBus) From 0a4fbace4523c615403856ea9c8692aebd5cfdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9ra=20Bal=C3=A1zs?= Date: Mon, 28 Oct 2024 19:07:53 +0100 Subject: [PATCH 9/9] Button size label alignment --- kstyle/config/ui/lightlystyleconfig.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kstyle/config/ui/lightlystyleconfig.ui b/kstyle/config/ui/lightlystyleconfig.ui index 8705b99d9..24b6cb39e 100644 --- a/kstyle/config/ui/lightlystyleconfig.ui +++ b/kstyle/config/ui/lightlystyleconfig.ui @@ -235,6 +235,9 @@ Bigger + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter +