saundersp/saundersp-overlay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added gui-apps/qt6ct-kde-0.9

Browse Source
This commit is contained in:
saundersp 2025-03-07 15:01:15 +01:00
parent 90eac83866
commit e5d36cac70
5 changed files with 299 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui-apps/qt6ct-kde/Manifest Normal file
View File

@ -0,0 +1 @@
DIST qt6ct-0.9.tar.xz 75868 BLAKE2B 32c3cb641edcedc5a3c675e9f9541c1d8269f9b40ed3dff7da14ce6b2686302f3812ec365fc746bd872cba1a12bcee1a644e3bad5885ba7a27d3fe1de0693f01 SHA512 ea5242cc10d9d210e190dd442c72c9f75c6a13e50191ec164fc9772de0475ca39453f22b061cfe24e1face4d660159d491627b65f2637b5d611cfe5fb0ac228f

226
gui-apps/qt6ct-kde/files/qt6ct-shenanigans.patch Normal file
View File

@ -0,0 +1,226 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6b608c..948436c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,10 @@ set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DUSE_WIDGETS)
-find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Widgets OPTIONAL_COMPONENTS LinguistTools)
+find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Widgets QuickControls2 OPTIONAL_COMPONENTS LinguistTools)
+find_package(KF6Config REQUIRED)
+find_package(KF6ColorScheme REQUIRED)
+find_package(KF6IconThemes REQUIRED)
get_target_property(QT_QTPATHS_EXECUTABLE Qt6::qtpaths IMPORTED_LOCATION)
@@ -50,8 +53,10 @@ if(Qt6LinguistTools_FOUND)
endif()
endif()
-#execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} -query QT_INSTALL_PLUGINS OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} --plugin-dir OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(NOT PLUGINDIR)
+ #execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} -query QT_INSTALL_PLUGINS OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${QT_QTPATHS_EXECUTABLE} --plugin-dir OUTPUT_VARIABLE PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
if(PLUGINDIR)
message(STATUS "Plugin path: ${PLUGINDIR}")
diff --git a/src/qt6ct-common/qt6ct.cpp b/src/qt6ct-common/qt6ct.cpp
index d97d4c7..b2443cf 100644
--- a/src/qt6ct-common/qt6ct.cpp
+++ b/src/qt6ct-common/qt6ct.cpp
@@ -116,6 +116,7 @@ QStringList Qt6CT::sharedColorSchemePaths()
for(const QString &p : QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation))
{
paths << (p + QLatin1String("/qt6ct/colors"));
+ paths << (p + QLatin1String("/color-schemes"));
}
paths << QLatin1String(QT6CT_DATADIR"/qt6ct/colors");
paths.removeDuplicates();
diff --git a/src/qt6ct-qtplugin/CMakeLists.txt b/src/qt6ct-qtplugin/CMakeLists.txt
index c3d7498..0c78445 100644
--- a/src/qt6ct-qtplugin/CMakeLists.txt
+++ b/src/qt6ct-qtplugin/CMakeLists.txt
@@ -9,5 +9,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
add_library(qt6ct-qtplugin MODULE ${app_SRCS})
set_target_properties(qt6ct-qtplugin PROPERTIES OUTPUT_NAME qt6ct)
-target_link_libraries(qt6ct-qtplugin PRIVATE Qt6::Widgets Qt6::GuiPrivate qt6ct-common)
+target_link_libraries(qt6ct-qtplugin PRIVATE Qt6::Widgets Qt6::GuiPrivate Qt6::QuickControls2 KF6::ConfigCore KF6::ColorScheme KF6::IconThemes qt6ct-common)
install(TARGETS qt6ct-qtplugin DESTINATION ${PLUGINDIR}/platformthemes)
diff --git a/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp b/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp
index 1d13faf..c6671b5 100644
--- a/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp
+++ b/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp
@@ -44,6 +44,7 @@
#endif
#include <QFile>
#include <QFileSystemWatcher>
+#include <QQuickStyle>
#include <private/qiconloader_p.h>
#include "qt6ct.h"
@@ -52,6 +53,11 @@
#include <QStringList>
#include <qpa/qplatformthemefactory_p.h>
+#include <KSharedConfig>
+#include <KColorScheme>
+#include <KIconEngine>
+#include <KIconLoader>
+
Q_LOGGING_CATEGORY(lqt6ct, "qt6ct", QtWarningMsg)
//QT_QPA_PLATFORMTHEME=qt6ct
@@ -67,12 +73,17 @@ Qt6CTPlatformTheme::Qt6CTPlatformTheme()
QMetaObject::invokeMethod(this, "createFSWatcher", Qt::QueuedConnection);
#endif
QGuiApplication::setFont(m_generalFont);
+ //don't override the value explicitly set by the user
+ if (QQuickStyle::name().isEmpty() || QQuickStyle::name() == QLatin1String("Fusion")) {
+ QQuickStyle::setStyle(QLatin1String("org.kde.desktop"));
+ }
}
qCDebug(lqt6ct) << "using qt6ct plugin";
#ifdef QT_WIDGETS_LIB
if(!QStyleFactory::keys().contains("qt6ct-style"))
qCCritical(lqt6ct) << "unable to find qt6ct proxy style";
#endif
+ QCoreApplication::instance()->installEventFilter(this);
}
Qt6CTPlatformTheme::~Qt6CTPlatformTheme()
@@ -146,6 +157,11 @@ QIcon Qt6CTPlatformTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::Ic
return QIcon::fromTheme(type.iconName());
}
+QIconEngine *Qt6CTPlatformTheme::createIconEngine(const QString &iconName) const
+{
+ return new KIconEngine(iconName, KIconLoader::global());
+}
+
void Qt6CTPlatformTheme::applySettings()
{
if(!QGuiApplication::desktopSettingsAware() || m_isIgnored)
@@ -258,7 +274,15 @@ void Qt6CTPlatformTheme::readSettings()
if(!schemePath.isEmpty() && settings.value("custom_palette", false).toBool())
{
schemePath = Qt6CT::resolvePath(schemePath); //replace environment variables
- m_palette = std::make_unique<QPalette>(Qt6CT::loadColorScheme(schemePath, *QPlatformTheme::palette(SystemPalette)));
+ if(schemePath.endsWith(".colors"))
+ {
+ m_palette = std::make_unique<QPalette>(KColorScheme::createApplicationPalette(KSharedConfig::openConfig(schemePath)));
+ qApp->setProperty("KDE_COLOR_SCHEME_PATH", schemePath);
+ }
+ else
+ {
+ m_palette = std::make_unique<QPalette>(Qt6CT::loadColorScheme(schemePath, *QPlatformTheme::palette(SystemPalette)));
+ }
}
m_iconTheme = settings.value("icon_theme").toString();
//load dialogs
@@ -367,3 +391,33 @@ QString Qt6CTPlatformTheme::loadStyleSheets(const QStringList &paths)
content.replace(regExp, "\n");
return content;
}
+
+//There's such a thing as KColorSchemeManager that lets the user to change the color scheme
+//application-wide and we should re-apply the color scheme if KCSM resets it to the default
+//which leads KColorScheme to get the color scheme from kdeglobals which won't help us.
+bool Qt6CTPlatformTheme::eventFilter(QObject *obj, QEvent *e)
+{
+ if(obj == qApp && e->type() == QEvent::DynamicPropertyChange)
+ {
+ QDynamicPropertyChangeEvent *ee = static_cast<QDynamicPropertyChangeEvent*>(e);
+ if(ee->propertyName() == "KDE_COLOR_SCHEME_PATH")
+ {
+ if(qApp->property("KDE_COLOR_SCHEME_PATH").toString().isEmpty())
+ {
+ QSettings settings(Qt6CT::configFile(), QSettings::IniFormat);
+ settings.beginGroup("Appearance");
+ QString schemePath = settings.value("color_scheme_path").toString();
+ if(!schemePath.isEmpty() && settings.value("custom_palette", false).toBool())
+ {
+ schemePath = Qt6CT::resolvePath(schemePath); //replace environment variables
+ if(schemePath.endsWith(".colors"))
+ {
+ qApp->setProperty("KDE_COLOR_SCHEME_PATH", schemePath);
+ applySettings();
+ }
+ }
+ }
+ }
+ }
+ return QObject::eventFilter(obj, e);
+}
diff --git a/src/qt6ct-qtplugin/qt6ctplatformtheme.h b/src/qt6ct-qtplugin/qt6ctplatformtheme.h
index 6ad245b..1ebede2 100644
--- a/src/qt6ct-qtplugin/qt6ctplatformtheme.h
+++ b/src/qt6ct-qtplugin/qt6ctplatformtheme.h
@@ -62,10 +62,13 @@ public:
//virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size,
// QPlatformTheme::IconOptions iconOptions = 0) const;
- //virtual QIconEngine *createIconEngine(const QString &iconName) const;
+ virtual QIconEngine *createIconEngine(const QString &iconName) const;
//virtual QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const;
//virtual QString standardButtonText(int button) const;
+protected:
+ bool eventFilter(QObject *obj, QEvent *e) override;
+
private slots:
void applySettings();
#ifdef QT_WIDGETS_LIB
diff --git a/src/qt6ct/CMakeLists.txt b/src/qt6ct/CMakeLists.txt
index fb0e1f7..acd8313 100644
--- a/src/qt6ct/CMakeLists.txt
+++ b/src/qt6ct/CMakeLists.txt
@@ -31,6 +31,6 @@ if(Qt6LinguistTools_FOUND)
endif()
add_executable(qt6ct ${app_SRCS})
-target_link_libraries(qt6ct PRIVATE Qt6::Widgets Qt6::WidgetsPrivate qt6ct-common)
+target_link_libraries(qt6ct PRIVATE Qt6::Widgets Qt6::WidgetsPrivate KF6::ConfigCore qt6ct-common)
install(TARGETS qt6ct DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES qt6ct.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/src/qt6ct/appearancepage.cpp b/src/qt6ct/appearancepage.cpp
index fc154c2..c5213c1 100644
--- a/src/qt6ct/appearancepage.cpp
+++ b/src/qt6ct/appearancepage.cpp
@@ -35,6 +35,8 @@
#include <QMenu>
#include <QIcon>
#include <QStringList>
+#include <KSharedConfig>
+#include <KConfigGroup>
#include <qpa/qplatformthemefactory_p.h>
#include "qt6ct.h"
#include "appearancepage.h"
@@ -381,11 +383,22 @@ void AppearancePage::findColorSchemes(const QString &path)
{
QDir dir(path);
dir.setFilter(QDir::Files);
- dir.setNameFilters(QStringList() << "*.conf");
+ dir.setNameFilters(QStringList() << "*.conf" << "*.colors");
for(const QFileInfo &info : dir.entryInfoList())
{
- m_ui->colorSchemeComboBox->addItem(info.baseName(), info.filePath());
+ QString name;
+ QString path = info.filePath();
+ if(info.suffix() == "colors") {
+ KSharedConfigPtr config = KSharedConfig::openConfig(path, KConfig::SimpleConfig);
+ KConfigGroup group(config, "General");
+ name = group.readEntry("Name", info.baseName()) + " (KColorScheme)";
+ }
+ else
+ {
+ name = info.baseName();
+ }
+ m_ui->colorSchemeComboBox->addItem(name, path);
}
}

11
gui-apps/qt6ct-kde/metadata.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>pierre.saundersps@gmail.com</email>
<name>Pierre Saunders</name>
</maintainer>
<upstream>
<remote-id type="github">trialuser02/qt6ct</remote-id>
</upstream>
</pkgmetadata>

47
gui-apps/qt6ct-kde/qt6ct-kde-0.9.ebuild Normal file
View File

@ -0,0 +1,47 @@
# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="Qt6 Configuration Tool (for DE/WM without Qt integration) 'KDE Fixes'"
HOMEPAGE='https://aur.archlinux.org/packages/qt6ct-kde'
SRC_URI="https://github.com/trialuser02/qt6ct/releases/download/${PV}/${P/-kde/}.tar.xz"
S="${WORKDIR}/${P/-kde/}"
LICENSE='BSD-2'
SLOT='0'
KEYWORDS='amd64'
# uses Qt private APIs wrt :=
# dlopen: qtsvg
DEPEND='
dev-qt/qtbase:6=[gui,widgets]
'
RDEPEND="
${DEPEND}
dev-qt/qtsvg:6
"
BDEPEND='
dev-qt/qtbase:6
dev-qt/qttools:6[linguist]
'
PATCHES="${FILESDIR}/qt6ct-shenanigans.patch"
pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
elog 'Note need to export QT_QPA_PLATFORMTHEME=qt6ct in the used environment'
elog 'for theming to take effect (not done automatically, may want to set in'
elog "the HOME's shell initialization scripts, or use /etc/env.d followed by"
elog 'running env-update then re-login).'
elog
elog 'If also using x11-misc/qt5ct, =qt5ct is alternatively recognized so it'
elog 'can be activated for both Qt5 and Qt6 at once.'
elog
elog 'Try disabling if experience startup crashes for some applications,'
elog 'may still be unstable (especially with newly released Qt versions).'
fi
}

14
metadata/md5-cache/gui-apps/qt6ct-kde-0.9 Normal file
View File

@ -0,0 +1,14 @@
BDEPEND=dev-qt/qtbase:6 dev-qt/qttools:6[linguist] app-alternatives/ninja >=dev-build/cmake-3.20.5
DEFINED_PHASES=compile configure install postinst prepare test
DEPEND=dev-qt/qtbase:6=[gui,widgets]
DESCRIPTION=Qt6 Configuration Tool (for DE/WM without Qt integration) 'KDE Fixes'
EAPI=8
HOMEPAGE=https://aur.archlinux.org/packages/qt6ct-kde
INHERIT=cmake
KEYWORDS=amd64
LICENSE=BSD-2
RDEPEND=dev-qt/qtbase:6=[gui,widgets] dev-qt/qtsvg:6
SLOT=0
SRC_URI=https://github.com/trialuser02/qt6ct/releases/download/0.9/qt6ct-0.9.tar.xz
_eclasses_=toolchain-funcs 6afdb6107430c1832ca7e16aacbf8fa1 multilib b2a329026f2e404e9e371097dda47f96 flag-o-matic 357f1a896fbedcd06e5ce55419c49eb9 multiprocessing 1e32df7deee68372153dca65f4a7c21f ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 xdg-utils 42869b3c8d86a70ef3cf75165a395e09 cmake 10a50dfaf728b802fcfd37f8d0da9056
_md5_=db8d950a7a79812c14c8e7a2d45b98fd