<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6b1fe110a0a558d323ebc8b62ca8fb9938d824c1">https://github.com/macports/macports-ports/commit/6b1fe110a0a558d323ebc8b62ca8fb9938d824c1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6b1fe11 qtcurve: update to 1.9.0
</span>6b1fe11 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6b1fe110a0a558d323ebc8b62ca8fb9938d824c1
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Mon Apr 30 11:06:22 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> qtcurve: update to 1.9.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Submitted by maintainer (RJVB)
</span><span style='display:block; white-space:pre;color:#404040;'> Also fixes QtCurve-qt5
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56039
</span>---
kde/qtcurve/Portfile | 75 ++++-----
.../files/patch-deactivate-config-page.diff | 10 +-
.../files/patch-qt5-dbus-fixes-by-debian.diff | 184 ---------------------
.../files/patch-simpler-translucent-menus.diff | 89 ++++++++++
kde/qtcurve/files/patch-systemconfig-support.diff | 69 ++++----
kde/qtcurve/files/stylerc | 102 +++++++++++-
6 files changed, 252 insertions(+), 277 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/Portfile b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 35aef0d..ca0134d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,17 +5,16 @@ PortSystem 1.0
</span> fetch.type git
git.url git://anongit.kde.org/qtcurve.git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name qtcurve
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set qtc_version 1.8.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name QtCurve
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qtc_version 1.9.0
</span> if {${subport} eq "${name}-gtk2"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the GTk2 branch barely evolves at all so qtcurve-gtk2 doesn't need to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # be updated every time the Qt version is updated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 438553dfa702c43240257fe61935c9ab10563cc2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${qtc_version}.263
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the GTk2 branch barely evolves at all so QtCurve-gtk2 doesn't need to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # be updated every time the Qt version evolves.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 9cd0f0eb740f26b7e03244be64491da2c3f56569
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${qtc_version}.8
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 16eef6f91c3fe73ea7287e6dc66e87aaf91220d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${qtc_version}.270
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 2bb3e383c12f46f0ad599386edc51972effc5930
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${qtc_version}.27
</span> }
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +22,9 @@ epoch 2
</span> description A set of widget styles for Qt4/KDE4, Qt5/KF5 and/or GTk2 based apps.
categories kde
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin linux
</span> license LGPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {gmail.com:rjvbertin @RJVB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers gmail.com:rjvbertin
</span>
homepage http://kde-look.org/content/show.php?content=40492
master_sites http://quickgit.kde.org/?p=qtcurve.git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,39 +37,20 @@ PortGroup muniversal 1.0
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is a guard against installing a port variant for the still uncommitted KF5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-qt5 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Safeguard against installing a port variant for the still uncommitted KF5 ports
</span> if {${subport} eq "${name}-qt5"} {
if {![variant_isset qtonly]} {
default_variants +qtonly
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-qt5 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset qtonly]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description A highly configurable widget style for Qt5/KF5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description A highly configurable widget style for Qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant libcxx description {build against libc++ (untested)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroup cxx11 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_exists libcxx] || ![variant_isset libcxx]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:clang-3.4 port:clang-3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "This port only builds with configure.compiler=macports-gcc-4.7 (from port:gcc47) or newer on OS X 10.6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport ${name}-gtk2 {
PortGroup cmake 1.1
long_description The GTk2 version of the highly configurable QtCurve widget style for Qt
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # qtcurve-gtk2 has pure and optional runtime dependencies on KDE4 (and KF5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # QtCurve-gtk2 has pure and optional runtime dependencies on KDE4 (and KF5)
</span> reinplace "s|kde4-config|${prefix}/bin/kde4-config|g" \
${worksrcpath}/gtk2/style/qt_settings.cpp
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,11 +61,11 @@ subport ${name}-gtk2 {
</span> default build.dir {${workpath}/build}
variant LTO description {Build with Link-Time Optimisation (LTO)} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcflags-append -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.objcxxflags-append -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -flto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -flto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -flto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags-append -flto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags-append -flto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -flto
</span> # assume any compiler not clang will be gcc
if {![string match "*clang*" ${configure.compiler}]} {
configure.cflags-append -fuse-linker-plugin -ffat-lto-objects
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +93,6 @@ subport ${name}-extra {
</span> long_description Installs the Mac-specific default configuration plus additional \
configuration presets and colour palettes for QtCurve
version ${qtc_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span> use_configure no
installs_libs no
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +113,7 @@ subport ${name}-extra {
</span> xinstall -m 644 ${filespath}/OxygenOSXGraphite.colors ${destroot}/${prefix}/share/apps/color-schemes/
}
pre-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # qtcurve-extra installs files that previously belonged to qtcurve
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # QtCurve-extra installs files that previously belonged to QtCurve
</span> if {![catch {set installed [lindex [registry_active qtcurve] 0]}]} {
set _epoch [lindex $installed 5]
if {${_epoch} < 2} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,6 +126,7 @@ subport ${name}-extra {
</span>
if {${subport} ne "${name}-extra"} {
depends_run-append port:${name}-extra
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append patch-systemconfig-support.diff
# deactivate config page(s) that don't make sense on OS X and/or don't work properly anywhere
patchfiles-append patch-deactivate-config-page.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,8 +139,10 @@ if {${subport} ne "${name}-extra"} {
</span> }
if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtc-no-qtc-activewin-events.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qt5-dbus-fixes-by-debian.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtc-no-qtc-activewin-events.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugs.kde.org/show_bug.cgi?id=374224
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-simpler-translucent-menus.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${subport} eq "${name}-qt5"} {
categories kde kf5 qt5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,7 +154,8 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> ${kf5::pythondep}
kf5.depends_frameworks karchive kconfig kconfigwidgets \
ki18n kdelibs4support kguiaddons kio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kiconthemes kwidgetsaddons kxmlgui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kiconthemes kwidgetsaddons kwindowsystem \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kxmlgui frameworkintegration
</span>
configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${kf5::pyversion} \
-DQTC_QT5_ENABLE_KDE:BOOL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,8 +182,8 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> cmake.install_rpath-prepend \
${qt_libs_dir}
configure.args-append -DQTC_QT5_ENABLE_KDE:BOOL=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtsvg
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtsvg
</span>
# CMake will look for automoc4, but will of course not use it.
configure.args-append -DENABLE_QT4:BOOL=OFF -DENABLE_QT5:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -229,7 +212,7 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> }
configure.args-append -DQTC_QT4_STYLE_SUPPORT:BOOL=OFF -DQTC_QT4_ENABLE_KWIN:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DQTC_ENABLE_PO:BOOL=ON -DENABLE_GTK2:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DQTC_INSTALL_PO:BOOL=ON -DENABLE_GTK2:BOOL=OFF
</span> if {${os.platform} eq "darwin"} {
configure.args-append -DQTC_ENABLE_X11:BOOL=OFF
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,7 +240,7 @@ if {(${subport} ne "${name}-gtk2") && (${subport} ne "${name}-extra")} {
</span> # never strip binaries for more useful backtraces
configure.args-append -DCMAKE_STRIP:FILEPATH=/bin/echo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 10 && ${subport} ne "${name}-extra"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 13 && ${subport} ne "${name}-extra"} {
</span> long_description-append \n\
This port requires the libc++ conversion but should also build with GCC 4.7 or later (configure.compiler=macports-gcc-4.7).
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/files/patch-deactivate-config-page.diff b/kde/qtcurve/files/patch-deactivate-config-page.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f156c8..20faba0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/files/patch-deactivate-config-page.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/files/patch-deactivate-config-page.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> diff --git qt5/config/qtcurveconfig.cpp qt5/config/qtcurveconfig.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index df8ce89..41b9c86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1afdfbfe..9cb621ef 100644
</span> --- qt5/config/qtcurveconfig.cpp
+++ qt5/config/qtcurveconfig.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1697,10 +1697,12 @@ void QtCurveConfig::setupStack()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1688,10 +1688,12 @@ void QtCurveConfig::setupStack()
</span> kwin->setNote(i18n("<p><b>NOTE:</b><i>The settings here affect the borders drawn around application windows and dialogs - and "
"not internal (or MDI) windows. Therefore, these settings will <b>not</b> be reflected in the Preview "
"page.</i></p>"));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef Q_OS_MACOSX
</span> connect(qtcSlot(kwin, changed), qtcSlot(this, updateChanged));
+#endif
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,11 +16,11 @@ index df8ce89..41b9c86 100644
</span>
new CStackItem(stackList, i18n("Window buttons"), i++);
new CStackItem(stackList, i18n("Window button colors"), i++);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1718,6 +1720,9 @@ void QtCurveConfig::setupStack()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1709,6 +1711,9 @@ void QtCurveConfig::setupStack()
</span> stackList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
stackList->setSelectionMode(QAbstractItemView::SingleSelection);
first->setSelected(true);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef Q_OS_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef Q_OS_MACOS
</span> + winManager->setDisabled(true);
+#endif
connect(qtcSlot(stackList, itemSelectionChanged),
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/files/patch-qt5-dbus-fixes-by-debian.diff b/kde/qtcurve/files/patch-qt5-dbus-fixes-by-debian.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 68c082f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/files/patch-qt5-dbus-fixes-by-debian.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,184 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git qt5/style/qtcurve.cpp qt5/style/qtcurve.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ce15754..bba2c3d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qt5/style/qtcurve.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qt5/style/qtcurve.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *****************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "qtcurve_p.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "qtcurve_plugin.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qtcurve-utils/qtprops.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QDBusConnection>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,7 +346,7 @@ Style::Style() :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_windowManager(new WindowManager(this)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_blurHelper(new BlurHelper(this)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_shortcutHandler(new ShortcutHandler(this)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_dbusConnected(nullptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_dbusConnected(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *env = getenv(QTCURVE_PREVIEW_CONFIG);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef QTC_QT5_ENABLE_KDE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -666,9 +665,7 @@ void Style::connectDBus()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_dbusConnected)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_dbusConnected = registerCleanup([] (void *data) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- reinterpret_cast<Style*>(data)->disconnectDBus();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }, this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_dbusConnected = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto bus = QDBusConnection::sessionBus();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bus.connect(QString(), "/KGlobalSettings", "org.kde.KGlobalSettings",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "notifyChange", this, SLOT(kdeGlobalSettingsChange(int, int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -695,23 +692,28 @@ void Style::disconnectDBus()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!m_dbusConnected)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void *cb = m_dbusConnected;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_dbusConnected = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unregisterCleanup(cb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_dbusConnected = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto bus = QDBusConnection::sessionBus();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bus.disconnect(QString(), "/KGlobalSettings", "org.kde.KGlobalSettings",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "notifyChange",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this, SLOT(kdeGlobalSettingsChange(int, int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bus.disconnect("org.kde.kwin", "/KWin", "org.kde.KWin", "compositingToggled",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this, SLOT(compositingToggled()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bus.disconnect("org.kde.kwin", "/QtCurve", "org.kde.QtCurve",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "borderSizesChanged", this, SLOT(borderSizesChanged()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bus.disconnect("org.kde.kwin", "/QtCurve", "org.kde.QtCurve",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "toggleMenuBar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this, SLOT(toggleMenuBar(unsigned int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bus.disconnect("org.kde.kwin", "/QtCurve", "org.kde.QtCurve",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "toggleStatusBar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this, SLOT(toggleStatusBar(unsigned int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!qApp || qApp->arguments()[0] != "kwin") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bus.disconnect("org.kde.kwin", "/QtCurve", "org.kde.QtCurve",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "borderSizesChanged", this, SLOT(borderSizesChanged()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (opts.menubarHiding & HIDE_KWIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bus.disconnect("org.kde.kwin", "/QtCurve", "org.kde.QtCurve",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "toggleMenuBar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this, SLOT(toggleMenuBar(unsigned int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (opts.statusbarHiding & HIDE_KWIN) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bus.disconnect("org.kde.kwin", "/QtCurve", "org.kde.QtCurve",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "toggleStatusBar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this, SLOT(toggleStatusBar(unsigned int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Style::~Style()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git qt5/style/qtcurve.h qt5/style/qtcurve.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f4d5b0a..fb6d15c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qt5/style/qtcurve.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qt5/style/qtcurve.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -515,7 +515,6 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const QStyleOption *option,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QPainter *painter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const QWidget *widget) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static void dbusCleanupCallback(void*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mutable Options opts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -566,7 +565,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WindowManager *m_windowManager;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BlurHelper *m_blurHelper;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ShortcutHandler *m_shortcutHandler;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void *m_dbusConnected;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool m_dbusConnected;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef QTC_QT5_ENABLE_KDE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KSharedConfigPtr m_configFile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KSharedConfigPtr m_kdeGlobals;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git qt5/style/qtcurve_plugin.cpp qt5/style/qtcurve_plugin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b8c76ce..500a3ff 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qt5/style/qtcurve_plugin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qt5/style/qtcurve_plugin.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qtcurve-utils/qtprops.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qtcurve-utils/x11shadow.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <qtcurve-utils/x11blur.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <qtcurve-utils/log.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QApplication>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,49 +43,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace QtCurve {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Using a `std::set` somehow result in a segfault in glibc (maybe realated to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// this function being called in the exit handler?) so use a home made solution
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// instead...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--struct CleanupCallback {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void (*func)(void*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void *data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CleanupCallback *next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CleanupCallback **prev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static CleanupCallback *cleanup_callbacks = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--registerCleanup(void (*func)(void*), void *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto cb = new CleanupCallback{func, data, cleanup_callbacks,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &cleanup_callbacks};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (cleanup_callbacks)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cleanup_callbacks->prev = &cb->next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cleanup_callbacks = cb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return cb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--unregisterCleanup(void *_cb)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto cb = (CleanupCallback*)_cb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (cb->next)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cb->next->prev = cb->prev;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *cb->prev = cb->next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete cb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--runAllCleanups()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (cleanup_callbacks) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto func = cleanup_callbacks->func;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto data = cleanup_callbacks->data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- func(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __attribute__((hot)) static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- polishQuickControl(QObject *obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,7 +120,6 @@ StylePlugin::create(const QString &key)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StylePlugin::~StylePlugin()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- runAllCleanups();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QInternal::unregisterCallback(QInternal::EventNotifyCallback,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtcEventCallback);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,5 +140,4 @@ StylePlugin::init()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- });
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git qt5/style/qtcurve_plugin.h qt5/style/qtcurve_plugin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fc81107..95bbfed 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qt5/style/qtcurve_plugin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qt5/style/qtcurve_plugin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,10 +36,6 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::once_flag m_ref_flag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void *registerCleanup(void (*func)(void*), void *data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void unregisterCleanup(void *handle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/files/patch-simpler-translucent-menus.diff b/kde/qtcurve/files/patch-simpler-translucent-menus.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c84f443
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/files/patch-simpler-translucent-menus.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,89 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib/utils/qtprops.h lib/utils/qtprops.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6589c779..2c52fdef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/utils/qtprops.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/utils/qtprops.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,7 @@ struct _QtcQWidgetProps {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opacity(100),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prePolishing(false),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ensuringPolish(false),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prePolished(false),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prePolishStarted(false),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +46,7 @@ struct _QtcQWidgetProps {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int opacity;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool prePolishing: 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool ensuringPolish: 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool prePolished: 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool prePolishStarted: 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git qt5/style/argbhelper.cpp qt5/style/argbhelper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ccf17777..42838e54 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qt5/style/argbhelper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qt5/style/argbhelper.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,33 +21,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "argbhelper.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qtcurve-utils/qtutils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <qtcurve-utils/qtprops.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QWindow>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QMenu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "private/qwidget_p.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace QtCurve {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __attribute__((hot)) void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addAlphaChannel(QWidget *widget)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QTC_RET_IF_FAIL(!qtcGetWid(widget));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Set this for better efficiency for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- widget->setAutoFillBackground(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QWindow *window = widget->windowHandle();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QWidgetPrivate *widgetPrivate =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static_cast<QWidgetPrivate*>(QObjectPrivate::get(widget));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- widgetPrivate->updateIsOpaque();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!window) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- widgetPrivate->createTLExtra();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- widgetPrivate->createTLSysExtra();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- window = widget->windowHandle();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (window) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Maybe we can register event filters and/or listen for signals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // like parent change or screen change on the QWidgetWindow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // so that we have a better change to update the alpha info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QSurfaceFormat format = window->format();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- format.setAlphaBufferSize(8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- window->setFormat(format);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (qobject_cast<QMenu*>(widget)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QtcQWidgetProps props(widget);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ widget->setAttribute(Qt::WA_TranslucentBackground);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!props->ensuringPolish) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props->ensuringPolish = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ widget->ensurePolished();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props->ensuringPolish = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QTC_RET_IF_FAIL(!qtcGetWid(widget));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Set this for better efficiency for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ widget->setAutoFillBackground(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QWindow *window = widget->windowHandle();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QWidgetPrivate *widgetPrivate =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_cast<QWidgetPrivate*>(QObjectPrivate::get(widget));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ widgetPrivate->updateIsOpaque();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!window) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ widgetPrivate->createTLExtra();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ widgetPrivate->createTLSysExtra();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ window = widget->windowHandle();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (window) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Maybe we can register event filters and/or listen for signals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // like parent change or screen change on the QWidgetWindow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // so that we have a better change to update the alpha info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QSurfaceFormat format = window->format();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ format.setAlphaBufferSize(8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ window->setFormat(format);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/files/patch-systemconfig-support.diff b/kde/qtcurve/files/patch-systemconfig-support.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 50fdb57..85f89d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/files/patch-systemconfig-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/files/patch-systemconfig-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git qt5/common/config_file.cpp qt5/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7630f4e..afbc82b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qt5/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qt5/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1432,10 +1432,8 @@ bool qtcReadConfig(const QString &file, Options *opts, Options *defOpts, bool ch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char * getSystemConfigFile()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char * constFiles[]={
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*"/etc/qt4/" OLD_CONFIG_FILE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "/etc/qt/" OLD_CONFIG_FILE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gtk2/common/config_file.cpp gtk2/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d54c1b58..85963936 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gtk2/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gtk2/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1577,6 +1577,7 @@ static const char * getSystemConfigFile()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/etc/qt3/"OLD_CONFIG_FILE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/etc/qt/"OLD_CONFIG_FILE, */
</span> "/etc/" OLD_CONFIG_FILE,
+ "@@PREFIX@@/etc/xdg/qtcurve/" CONFIG_FILE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1640,7 +1638,7 @@ void qtcDefaultSettings(Options *opts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- systemFilename=getSystemConfigFile();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(systemFilename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qtcReadConfig(systemFilename, opts, opts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qtcReadConfig(QFile::decodeName(systemFilename), opts, opts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nullptr};
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0;constFiles[i];i++) {
</span> diff --git qt4/common/config_file.cpp qt4/common/config_file.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7a0a6bc..c6992d8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d51ad2f3..8793bdcc 100644
</span> --- qt4/common/config_file.cpp
+++ qt4/common/config_file.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1436,7 +1436,11 @@ bool qtcReadConfig(const QString &file, Options *opts, Options *defOpts, bool ch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1427,7 +1427,11 @@ bool qtcReadConfig(const QString &file, Options *opts, Options *defOpts, bool ch
</span>
static const char * getSystemConfigFile()
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +27,7 @@ index 7a0a6bc..c6992d8 100644
</span>
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1639,7 +1643,7 @@ void qtcDefaultSettings(Options *opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1626,7 +1630,7 @@ void qtcDefaultSettings(Options *opts)
</span> systemFilename=getSystemConfigFile();
if(systemFilename)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,15 +36,28 @@ index 7a0a6bc..c6992d8 100644
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gtk2/common/config_file.cpp gtk2/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ce83b07..8c453cf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gtk2/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gtk2/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1577,6 +1577,7 @@ static const char * getSystemConfigFile()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "/etc/qt3/"OLD_CONFIG_FILE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "/etc/qt/"OLD_CONFIG_FILE, */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git qt5/common/config_file.cpp qt5/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e5c6541a..5ec9d08d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qt5/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qt5/common/config_file.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1437,10 +1437,8 @@ bool qtcReadConfig(const QString &file, Options *opts, Options *defOpts, bool ch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char * getSystemConfigFile()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char * constFiles[]={
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*"/etc/qt4/" OLD_CONFIG_FILE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/etc/qt/" OLD_CONFIG_FILE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span> "/etc/" OLD_CONFIG_FILE,
+ "@@PREFIX@@/etc/xdg/qtcurve/" CONFIG_FILE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nullptr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1641,7 +1639,7 @@ void qtcDefaultSettings(Options *opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ systemFilename=getSystemConfigFile();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(systemFilename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qtcReadConfig(systemFilename, opts, opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qtcReadConfig(QFile::decodeName(systemFilename), opts, opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0;constFiles[i];i++) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/files/stylerc b/kde/qtcurve/files/stylerc
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c5020c..2a29e1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/files/stylerc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/files/stylerc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,35 @@
</span> [Settings]
activeTabAppearance=gradient
<span style='display:block; white-space:pre;background:#e0ffe0;'>+animatedProgress=false
</span> appearance=customgradient4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+bgndAppearance=flat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bgndGrad=horiz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bgndImage=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bgndOpacity=100
</span> boldProgress=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+borderInactiveTab=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+borderMenuitems=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+borderProgress=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+borderSbarGroove=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+borderSelection=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+borderTab=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+buttonEffect=shadow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+centerTabText=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+colorMenubarMouseOver=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+colorSelTab=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+colorSliderMouseOver=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+coloredMouseOver=glow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+coloredTbarMo=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+comboBtn=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+comboSplitter=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crButton=true
</span> crColor=#D2D6E1
crHighlight=3
crSize=13
customAlphas=0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+customMenuNormTextColor=#000000
</span> customMenuSelTextColor=#FFFFFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+customMenuTextColor=false
</span> customShades=0
customgradient1=light,0,1.2,0.45,1,1,1
customgradient2=3d,0,0.75,0.3,0.9,1,1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,59 +37,124 @@ customgradient3=none,0,1.1,0.99,0.94,1,0.75
</span> customgradient4=3d,0,1.3,0.4,1.2,0.9,0.97,1,1
darkerBorders=true
defBtnIndicator=darken
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dlgOpacity=100
</span> doubleGtkComboArrow=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+drawStatusBarFrames=false
</span> dwtAppearance=customgradient3
dwtSettings=122
<span style='display:block; white-space:pre;background:#e0ffe0;'>+embolden=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+etchEntry=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+expanderHighlight=3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fadeLines=true
</span> fillProgress=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+fillSlider=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+flatSbarButtons=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+focus=glow
</span> forceAlternateLvCols=true
gbFactor=-4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+gbLabel=9
</span> glowProgress=end
<span style='display:block; white-space:pre;background:#e0ffe0;'>+grooveAppearance=inverted
</span> groupBox=shaded
<span style='display:block; white-space:pre;background:#e0ffe0;'>+gtkButtonOrder=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gtkComboMenus=false
</span> gtkScrollViews=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+handles=1dot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+hideShortcutUnderline=false
</span> highlightFactor=-8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+highlightScrollViews=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+highlightTab=false
</span> inactiveTitlebarAppearance=customgradient3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+invertBotTab=true
</span> lighterPopupMenuBgnd=100
lvAppearance=agua
<span style='display:block; white-space:pre;background:#e0ffe0;'>+lvButton=false
</span> lvLines=true
<span style='display:block; white-space:pre;background:#e0ffe0;'>+mapKdeIcons=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menuBgndAppearance=flat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menuBgndGrad=horiz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menuBgndImage=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menuBgndOpacity=100
</span> menuDelay=150
menuIcons=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>-menubarApps=kdevelop,kate,kdevelop.bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menuStripe=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menuStripeAppearance=darkinverted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menubarAppearance=flat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+menubarApps=kcmshell4,kdevelop,kmail,kontact,kdevelop.bin,kcmshell5,kate
</span> menubarHiding=1
menubarMouseOver=false
menuitemAppearance=flat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-noBgndOpacityApps=dragon,smplayer,vmplayer,vmware,inkscape,totem,kaffeine,kscreenlocker,sonata
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-noMenuBgndOpacityApps=vmplayer,vmware,inkscape,gtk,totem,sonata
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-nonnativeMenubarApps=kdevelop,kate,kdevelop.bin,khelpcenter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+noBgndGradientApps=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+noBgndImageApps=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+noBgndOpacityApps=smplayer,vmware,dragon,kscreenlocker,totem,sonata,inkscape,kaffeine,vmplayer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+noMenuBgndOpacityApps=gtk,vmware,totem,sonata,inkscape,vmplayer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+noMenuStripeApps=gtk,soffice.bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+nonnativeMenubarApps=kcmshell4,kdevelop,kmail,kontact,kdevelop.bin,khelpcenter,kcmshell5,kate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+onlyTicksInMenu=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+passwordChar=9679
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+popupBorder=true
</span> progressAppearance=agua
progressColor=#D0D3DE
<span style='display:block; white-space:pre;background:#e0ffe0;'>+progressGrooveAppearance=inverted
</span> progressGrooveColor=background
<span style='display:block; white-space:pre;background:#ffe0e0;'>-reorderGtkButtons=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+reorderGtkButtons=false
</span> round=slight
<span style='display:block; white-space:pre;background:#e0ffe0;'>+roundAllTabs=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+roundMbTopOnly=true
</span> sbarBgndAppearance=bevelled
<span style='display:block; white-space:pre;background:#e0ffe0;'>+scrollbarType=kde
</span> selectionAppearance=flat
<span style='display:block; white-space:pre;background:#e0ffe0;'>+shadeCheckRadio=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+shadeMenubarOnlyWhenActive=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+shadeMenubars=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+shadePopupMenu=false
</span> shadeSliders=#BFBFBF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+shading=hsl
</span> sliderAppearance=dullglass
<span style='display:block; white-space:pre;background:#e0ffe0;'>+sliderFill=true
</span> sliderStyle=triangular
sliderThumbs=none
sliderWidth=11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+smallRadio=true
</span> sortedLv=#D2D6E1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+splitterHighlight=3
</span> splitters=dots
square=13
<span style='display:block; white-space:pre;background:#e0ffe0;'>+statusbarApps=kde
</span> statusbarHiding=2
stdBtnSizes=true
stdSidebarButtons=true
stripedProgress=fade
<span style='display:block; white-space:pre;background:#e0ffe0;'>+stripedSbar=false
</span> sunkenAppearance=agua
<span style='display:block; white-space:pre;background:#e0ffe0;'>+tabAppearance=soft
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tabBgnd=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tabMouseOver=glow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tbarBtnAppearance=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tbarBtnEffect=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tbarBtns=standard
</span> thin=4
thinSbarGroove=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+titlebarAlignment=center-full
</span> titlebarAppearance=customgradient3
titlebarButtonAppearance=agua
<span style='display:block; white-space:pre;background:#ffe0e0;'>-titlebarButtonColors=#D2D6E1,#D2D6E1,#D2D6E1,#D2D6E1,#D2D6E1,#D6D5D1,#D6D5D1,#D6D5D1,#D6D5D1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-titlebarButtons=3092
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+titlebarButtonColors=#D2D6E1,#D2D6E1,#D2D6E1,#D2D6E1,#D2D6E1,#D6D5D1,#D6D5D1,#D6D5D1,#D6D5D1,#010101,#010101,#010101,#010101,#010101,#010101,#010101,#010101,#010101,#8D9191,#8D9191,#8D9191,#8D9191,#8D9191,#8D9191,#8D9191,#8D9191,#8D9191
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+titlebarButtons=3696
</span> titlebarEffect=none
titlebarIcon=menu
<span style='display:block; white-space:pre;background:#e0ffe0;'>+toolbarAppearance=flat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+toolbarBorders=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+toolbarSeparators=sunken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+toolbarTabs=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tooltipAppearance=gradient
</span> unifyCombo=false
<span style='display:block; white-space:pre;background:#e0ffe0;'>+unifySpin=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unifySpinBtns=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+useHighlightForMenu=false
</span> useQtFileDialogApps=googleearth-bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+vArrows=true
</span> version=1.8.18
windowBorder=32
windowDrag=3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+xCheck=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xbar=false
</span></pre><pre style='margin:0'>
</pre>