diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/lxqt-panel/APKBUILD | 12 | ||||
| -rw-r--r-- | user/lxqt-panel/revert-kwindowsystem-bump.patch | 643 |
2 files changed, 650 insertions, 5 deletions
diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index efd730b6c..74ee38bc0 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=lxqt-panel -pkgver=1.3.0 +pkgver=1.4.0 _lxqt=0.13.0 pkgrel=0 pkgdesc="Panel for LXQt desktop" @@ -9,15 +9,16 @@ url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" -depends="" +depends="lxqt-menu-data" makedepends="cmake extra-cmake-modules lxqt-build-tools>=$_lxqt kguiaddons-dev libdbusmenu-qt-dev kwindowsystem-dev solid-dev - menu-cache-dev lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev + menu-cache-dev liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev pulseaudio-dev lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev libstatgrab-dev libsysstat-dev qt5-qttools-dev libxkbcommon-dev xcb-util-image-dev libxcomposite-dev libxtst-dev" subpackages="$pkgname-doc" -source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz" +source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz + revert-kwindowsystem-bump.patch" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -42,4 +43,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="1bf66db90e4fbd1ec38688b3a27c9dc5ab2e0a71ace74555580c379e9e12211ded61d01fa46484e8a600bb9b30cb3203ec38697ade0a9cb81cb2cd8043af8b97 lxqt-panel-1.3.0.tar.xz" +sha512sums="87d5c89cfc4f5253dbb4048da89a531a99f664fd424eebb535a688934bdb63856edf07276a5ccba826a4658228801ed4cc036aea6664e67c57599990d7e4b997 lxqt-panel-1.4.0.tar.xz +da7ff18e64da3e90e1909f41ae58f0a6f52ca6947ff394fe4c6a68a8d8f1223fdce2fd7b665c89cdaa442053776d2e1c503fab1be5d43f22dacbc338ea78aaf7 revert-kwindowsystem-bump.patch" diff --git a/user/lxqt-panel/revert-kwindowsystem-bump.patch b/user/lxqt-panel/revert-kwindowsystem-bump.patch new file mode 100644 index 000000000..10c8bbdac --- /dev/null +++ b/user/lxqt-panel/revert-kwindowsystem-bump.patch @@ -0,0 +1,643 @@ +diff '--color=auto' -Nurd lxqt-panel-1.4.0/CMakeLists.txt lxqt-panel-1.4.0.new/CMakeLists.txt +--- lxqt-panel-1.4.0/CMakeLists.txt 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/CMakeLists.txt 2023-11-26 05:23:20.352039450 -0800 +@@ -30,7 +30,7 @@ + set(CMAKE_AUTORCC ON) + + set(REQUIRED_QT_VERSION "5.15.0") +-set(KF5_MINIMUM_VERSION "5.101.0") ++set(KF5_MINIMUM_VERSION "5.36.0") + set(LXQT_GLOBALKEYS_MINIMUM_VERSION "1.4.0") + set(LXQT_MINIMUM_VERSION "1.4.0") + +diff '--color=auto' -Nurd lxqt-panel-1.4.0/panel/lxqtpanel.cpp lxqt-panel-1.4.0.new/panel/lxqtpanel.cpp +--- lxqt-panel-1.4.0/panel/lxqtpanel.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/panel/lxqtpanel.cpp 2023-11-26 05:24:38.571414168 -0800 +@@ -50,7 +50,6 @@ + #include <XdgDirs> + + #include <KWindowSystem/KWindowSystem> +-#include <KWindowSystem/KX11Extras> + #include <KWindowSystem/NETWM> + + // Turn on this to show the time required to load each plugin during startup +@@ -242,18 +241,18 @@ + QTimer::singleShot(PANEL_HIDE_FIRST_TIME, this, SLOT(hidePanel())); + } + +- connect(KX11Extras::self(), &KX11Extras::windowAdded, this, [this] { ++ connect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, [this] { + if (mHidable && mHideOnOverlap && !mHidden) + { + mShowDelayTimer.stop(); + hidePanel(); + } + }); +- connect(KX11Extras::self(), &KX11Extras::windowRemoved, this, [this] { ++ connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, this, [this] { + if (mHidable && mHideOnOverlap && mHidden && !isPanelOverlapped()) + mShowDelayTimer.start(); + }); +- connect(KX11Extras::self(), &KX11Extras::currentDesktopChanged, this, [this] { ++ connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, [this] { + if (mHidable && mHideOnOverlap) + { + if (!mHidden) +@@ -265,8 +264,8 @@ + mShowDelayTimer.start(); + } + }); +- connect(KX11Extras::self(), +- static_cast<void (KX11Extras::*)(WId, NET::Properties, NET::Properties2)>(&KX11Extras::windowChanged), ++ connect(KWindowSystem::self(), ++ static_cast<void (KWindowSystem::*)(WId, NET::Properties, NET::Properties2)>(&KWindowSystem::windowChanged), + this, [this] (WId /* id */, NET::Properties prop, NET::Properties2) { + if (mHidable && mHideOnOverlap + // when a window is moved, resized, shaded, or minimized +@@ -419,7 +418,7 @@ + void LXQtPanel::show() + { + QWidget::show(); +- KX11Extras::setOnDesktop(effectiveWinId(), NET::OnAllDesktops); ++ KWindowSystem::setOnDesktop(effectiveWinId(), NET::OnAllDesktops); + } + + +@@ -676,7 +675,7 @@ + switch (mPosition) + { + case LXQtPanel::PositionTop: +- KX11Extras::setExtendedStrut(wid, ++ KWindowSystem::setExtendedStrut(wid, + /* Left */ 0, 0, 0, + /* Right */ 0, 0, 0, + /* Top */ rect.top() + getReserveDimension(), rect.left(), rect.right(), +@@ -685,7 +684,7 @@ + break; + + case LXQtPanel::PositionBottom: +- KX11Extras::setExtendedStrut(wid, ++ KWindowSystem::setExtendedStrut(wid, + /* Left */ 0, 0, 0, + /* Right */ 0, 0, 0, + /* Top */ 0, 0, 0, +@@ -694,7 +693,7 @@ + break; + + case LXQtPanel::PositionLeft: +- KX11Extras::setExtendedStrut(wid, ++ KWindowSystem::setExtendedStrut(wid, + /* Left */ rect.left() + getReserveDimension(), rect.top(), rect.bottom(), + /* Right */ 0, 0, 0, + /* Top */ 0, 0, 0, +@@ -704,7 +703,7 @@ + break; + + case LXQtPanel::PositionRight: +- KX11Extras::setExtendedStrut(wid, ++ KWindowSystem::setExtendedStrut(wid, + /* Left */ 0, 0, 0, + /* Right */ wholeScreen.right() - rect.right() + getReserveDimension(), rect.top(), rect.bottom(), + /* Top */ 0, 0, 0, +@@ -714,7 +713,7 @@ + } + } else + { +- KX11Extras::setExtendedStrut(wid, ++ KWindowSystem::setExtendedStrut(wid, + /* Left */ 0, 0, 0, + /* Right */ 0, 0, 0, + /* Top */ 0, 0, 0, +@@ -826,8 +825,8 @@ + mConfigDialog->activateWindow(); + WId wid = mConfigDialog->windowHandle()->winId(); + +- KX11Extras::activateWindow(wid); +- KX11Extras::setOnDesktop(wid, KX11Extras::currentDesktop()); ++ KWindowSystem::activateWindow(wid); ++ KWindowSystem::setOnDesktop(wid, KWindowSystem::currentDesktop()); + } + + +@@ -846,8 +845,8 @@ + mConfigDialog->activateWindow(); + WId wid = mConfigDialog->windowHandle()->winId(); + +- KX11Extras::activateWindow(wid); +- KX11Extras::setOnDesktop(wid, KX11Extras::currentDesktop()); ++ KWindowSystem::activateWindow(wid); ++ KWindowSystem::setOnDesktop(wid, KWindowSystem::currentDesktop()); + } + + +@@ -1130,7 +1129,7 @@ + KWindowSystem::setType(effectiveWinId(), NET::Dock); + + updateWmStrut(); // reserve screen space for the panel +- KX11Extras::setOnAllDesktops(effectiveWinId(), true); ++ KWindowSystem::setOnAllDesktops(effectiveWinId(), true); + break; + } + case QEvent::DragEnter: +@@ -1414,7 +1413,7 @@ + ignoreList |= NET::TopMenuMask; + ignoreList |= NET::NotificationMask; + +- const auto wIds = KX11Extras::stackingOrder(); ++ const auto wIds = KWindowSystem::stackingOrder(); + for (auto const wId : wIds) + { + KWindowInfo info(wId, NET::WMWindowType | NET::WMState | NET::WMFrameExtents | NET::WMDesktop); +diff '--color=auto' -Nurd lxqt-panel-1.4.0/panel/plugin.cpp lxqt-panel-1.4.0.new/panel/plugin.cpp +--- lxqt-panel-1.4.0/panel/plugin.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/panel/plugin.cpp 2023-11-26 05:25:18.501095739 -0800 +@@ -31,7 +31,7 @@ + #include "pluginsettings_p.h" + #include "lxqtpanel.h" + +-#include <KWindowSystem/KX11Extras> ++#include <KWindowSystem> + + #include <QDebug> + #include <QProcessEnvironment> +@@ -523,8 +523,8 @@ + mConfigDialog->activateWindow(); + + WId wid = mConfigDialog->windowHandle()->winId(); +- KX11Extras::activateWindow(wid); +- KX11Extras::setOnDesktop(wid, KX11Extras::currentDesktop()); ++ KWindowSystem::activateWindow(wid); ++ KWindowSystem::setOnDesktop(wid, KWindowSystem::currentDesktop()); + } + + +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-desktopswitch/desktopswitch.cpp lxqt-panel-1.4.0.new/plugin-desktopswitch/desktopswitch.cpp +--- lxqt-panel-1.4.0/plugin-desktopswitch/desktopswitch.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-desktopswitch/desktopswitch.cpp 2023-11-26 05:26:07.690703464 -0800 +@@ -33,7 +33,6 @@ + #include <lxqt-globalkeys.h> + #include <LXQt/GridLayout> + #include <KWindowSystem/KWindowSystem> +-#include <KWindowSystem/KX11Extras> + #include <QX11Info> + #include <cmath> + +@@ -47,7 +46,7 @@ + QObject(), + ILXQtPanelPlugin(startupInfo), + m_pSignalMapper(new QSignalMapper(this)), +- m_desktopCount(KX11Extras::numberOfDesktops()), ++ m_desktopCount(KWindowSystem::numberOfDesktops()), + mRows(-1), + mShowOnlyActive(false), + mDesktops(new NETRootInfo(QX11Info::connection(), NET::NumberOfDesktops | NET::CurrentDesktop | NET::DesktopNames, NET::WM2DesktopLayout)), +@@ -63,16 +62,16 @@ + + settingsChanged(); + +- onCurrentDesktopChanged(KX11Extras::currentDesktop()); ++ onCurrentDesktopChanged(KWindowSystem::currentDesktop()); + QTimer::singleShot(0, this, SLOT(registerShortcuts())); + + connect(m_buttons, &QButtonGroup::idClicked, this, &DesktopSwitch::setDesktop); + +- connect(KX11Extras::self(), &KX11Extras::numberOfDesktopsChanged, this, &DesktopSwitch::onNumberOfDesktopsChanged); +- connect(KX11Extras::self(), &KX11Extras::currentDesktopChanged, this, &DesktopSwitch::onCurrentDesktopChanged); +- connect(KX11Extras::self(), &KX11Extras::desktopNamesChanged, this, &DesktopSwitch::onDesktopNamesChanged); ++ connect(KWindowSystem::self(), &KWindowSystem::numberOfDesktopsChanged, this, &DesktopSwitch::onNumberOfDesktopsChanged); ++ connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &DesktopSwitch::onCurrentDesktopChanged); ++ connect(KWindowSystem::self(), &KWindowSystem::desktopNamesChanged, this, &DesktopSwitch::onDesktopNamesChanged); + +- connect(KX11Extras::self(), static_cast<void (KX11Extras::*)(WId, NET::Properties, NET::Properties2)>(&KX11Extras::windowChanged), ++ connect(KWindowSystem::self(), static_cast<void (KWindowSystem::*)(WId, NET::Properties, NET::Properties2)>(&KWindowSystem::windowChanged), + this, &DesktopSwitch::onWindowChanged); + } + +@@ -137,7 +136,7 @@ + const QList<QAbstractButton*> btns = m_buttons->buttons(); + + int i = 0; +- const int current_desktop = KX11Extras::currentDesktop(); ++ const int current_desktop = KWindowSystem::currentDesktop(); + const int current_cnt = btns.count(); + const int border = qMin(btns.count(), m_desktopCount); + //update existing buttons +@@ -145,9 +144,9 @@ + { + DesktopSwitchButton * button = qobject_cast<DesktopSwitchButton*>(btns[i]); + button->update(i, mLabelType, +- KX11Extras::desktopName(i + 1).isEmpty() ? ++ KWindowSystem::desktopName(i + 1).isEmpty() ? + tr("Desktop %1").arg(i + 1) : +- KX11Extras::desktopName(i + 1)); ++ KWindowSystem::desktopName(i + 1)); + button->setVisible(!mShowOnlyActive || i + 1 == current_desktop); + } + +@@ -156,9 +155,9 @@ + for ( ; i < m_desktopCount; ++i) + { + b = new DesktopSwitchButton(&mWidget, i, mLabelType, +- KX11Extras::desktopName(i+1).isEmpty() ? ++ KWindowSystem::desktopName(i+1).isEmpty() ? + tr("Desktop %1").arg(i+1) : +- KX11Extras::desktopName(i+1)); ++ KWindowSystem::desktopName(i+1)); + mWidget.layout()->addWidget(b); + m_buttons->addButton(b, i); + b->setVisible(!mShowOnlyActive || i + 1 == current_desktop); +@@ -215,7 +214,7 @@ + + void DesktopSwitch::setDesktop(int desktop) + { +- KX11Extras::setCurrentDesktop(desktop + 1); ++ KWindowSystem::setCurrentDesktop(desktop + 1); + } + + void DesktopSwitch::onNumberOfDesktopsChanged(int count) +@@ -330,9 +329,9 @@ + if(abs(m_mouseWheelThresholdCounter) < 100) + return; + +- int max = KX11Extras::numberOfDesktops(); ++ int max = KWindowSystem::numberOfDesktops(); + int delta = rotationSteps < 0 ? 1 : -1; +- int current = KX11Extras::currentDesktop() + delta; ++ int current = KWindowSystem::currentDesktop() + delta; + + if (current > max){ + current = 1; +@@ -341,5 +340,5 @@ + current = max; + + m_mouseWheelThresholdCounter = 0; +- KX11Extras::setCurrentDesktop(current); ++ KWindowSystem::setCurrentDesktop(current); + } +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-desktopswitch/desktopswitchconfiguration.cpp lxqt-panel-1.4.0.new/plugin-desktopswitch/desktopswitchconfiguration.cpp +--- lxqt-panel-1.4.0/plugin-desktopswitch/desktopswitchconfiguration.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-desktopswitch/desktopswitchconfiguration.cpp 2023-11-26 05:26:31.370514624 -0800 +@@ -26,7 +26,7 @@ + + #include "desktopswitchconfiguration.h" + #include "ui_desktopswitchconfiguration.h" +-#include <KWindowSystem/KX11Extras> ++#include <KWindowSystem> + #include <QTimer> + + DesktopSwitchConfiguration::DesktopSwitchConfiguration(PluginSettings *settings, QWidget *parent) : +@@ -64,17 +64,17 @@ + + void DesktopSwitchConfiguration::loadDesktopsNames() + { +- int n = KX11Extras::numberOfDesktops(); ++ int n = KWindowSystem::numberOfDesktops(); + for (int i = 1; i <= n; i++) + { +- QLineEdit *edit = new QLineEdit(KX11Extras::desktopName(i), this); ++ QLineEdit *edit = new QLineEdit(KWindowSystem::desktopName(i), this); + ((QFormLayout *) ui->namesGroupBox->layout())->addRow(tr("Desktop %1:").arg(i), edit); + + // C++11 rocks! + QTimer *timer = new QTimer(this); + timer->setInterval(400); + timer->setSingleShot(true); +- connect(timer, &QTimer::timeout, this, [=] { KX11Extras::setDesktopName(i, edit->text()); }); ++ connect(timer, &QTimer::timeout, this, [=] { KWindowSystem::setDesktopName(i, edit->text()); }); + connect(edit, &QLineEdit::textEdited, this, [=] { timer->start(); }); + } + } +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-kbindicator/src/kbdkeeper.cpp lxqt-panel-1.4.0.new/plugin-kbindicator/src/kbdkeeper.cpp +--- lxqt-panel-1.4.0/plugin-kbindicator/src/kbdkeeper.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-kbindicator/src/kbdkeeper.cpp 2023-11-26 05:27:03.870255446 -0800 +@@ -25,7 +25,7 @@ + * END_COMMON_COPYRIGHT_HEADER */ + + #include <QDebug> +-#include <KWindowSystem/KX11Extras> ++#include <KWindowSystem/KWindowSystem> + #include <KWindowSystem/KWindowInfo> + #include <KWindowSystem/netwm_def.h> + #include "kbdkeeper.h" +@@ -91,7 +91,7 @@ + + void WinKbdKeeper::layoutChanged(uint group) + { +- WId win = KX11Extras::activeWindow(); ++ WId win = KWindowSystem::activeWindow(); + + if (m_active == win){ + m_mapping[win] = group; +@@ -108,7 +108,7 @@ + + void WinKbdKeeper::checkState() + { +- WId win = KX11Extras::activeWindow(); ++ WId win = KWindowSystem::activeWindow(); + + if (!m_mapping.contains(win)) + m_mapping.insert(win, 0); +@@ -120,7 +120,7 @@ + + void WinKbdKeeper::switchToGroup(uint group) + { +- WId win = KX11Extras::activeWindow(); ++ WId win = KWindowSystem::activeWindow(); + m_mapping[win] = group; + m_layout.lockGroup(group); + m_info.setCurrentGroup(group); +@@ -138,7 +138,7 @@ + + void AppKbdKeeper::layoutChanged(uint group) + { +- KWindowInfo info = KWindowInfo(KX11Extras::activeWindow(), NET::Properties(), NET::WM2WindowClass); ++ KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), NET::Properties(), NET::WM2WindowClass); + QString app = QString::fromUtf8(info.windowClassName()); + + if (m_active == app){ +@@ -157,7 +157,7 @@ + + void AppKbdKeeper::checkState() + { +- KWindowInfo info = KWindowInfo(KX11Extras::activeWindow(), NET::Properties(), NET::WM2WindowClass); ++ KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), NET::Properties(), NET::WM2WindowClass); + QString app = QString::fromUtf8(info.windowClassName()); + + if (!m_mapping.contains(app)) +@@ -172,7 +172,7 @@ + + void AppKbdKeeper::switchToGroup(uint group) + { +- KWindowInfo info = KWindowInfo(KX11Extras::activeWindow(), NET::Properties(), NET::WM2WindowClass); ++ KWindowInfo info = KWindowInfo(KWindowSystem::activeWindow(), NET::Properties(), NET::WM2WindowClass); + QString app = QString::fromUtf8(info.windowClassName()); + + m_mapping[app] = group; +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbar.cpp lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbar.cpp +--- lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbar.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbar.cpp 2023-11-26 05:27:36.719993478 -0800 +@@ -93,10 +93,10 @@ + connect(mSignalMapper, &QSignalMapper::mappedInt, this, &LXQtTaskBar::activateTask); + QTimer::singleShot(0, this, &LXQtTaskBar::registerShortcuts); + +- connect(KX11Extras::self(), static_cast<void (KX11Extras::*)(WId, NET::Properties, NET::Properties2)>(&KX11Extras::windowChanged) ++ connect(KWindowSystem::self(), static_cast<void (KWindowSystem::*)(WId, NET::Properties, NET::Properties2)>(&KWindowSystem::windowChanged) + , this, &LXQtTaskBar::onWindowChanged); +- connect(KX11Extras::self(), &KX11Extras::windowAdded, this, &LXQtTaskBar::onWindowAdded); +- connect(KX11Extras::self(), &KX11Extras::windowRemoved, this, &LXQtTaskBar::onWindowRemoved); ++ connect(KWindowSystem::self(), &KWindowSystem::windowAdded, this, &LXQtTaskBar::onWindowAdded); ++ connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, this, &LXQtTaskBar::onWindowRemoved); + } + + /************************************************ +@@ -356,7 +356,7 @@ + { + QList<WId> new_list; + // Just add new windows to groups, deleting is up to the groups +- const auto wnds = KX11Extras::stackingOrder(); ++ const auto wnds = KWindowSystem::stackingOrder(); + for (auto const wnd: wnds) + { + if (acceptWindow(wnd)) +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbar.h lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbar.h +--- lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbar.h 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbar.h 2023-11-26 05:27:47.189909983 -0800 +@@ -43,7 +43,7 @@ + #include <QMap> + #include <lxqt-globalkeys.h> + #include "../panel/ilxqtpanel.h" +-#include <KWindowSystem/KX11Extras> ++#include <KWindowSystem/KWindowSystem> + #include <KWindowSystem/KWindowInfo> + #include <KWindowSystem/NETWM> + +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbarconfiguration.cpp lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbarconfiguration.cpp +--- lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbarconfiguration.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbarconfiguration.cpp 2023-11-26 05:28:07.459748336 -0800 +@@ -29,7 +29,7 @@ + + #include "lxqttaskbarconfiguration.h" + #include "ui_lxqttaskbarconfiguration.h" +-#include <KWindowSystem/KX11Extras> ++#include <KWindowSystem/KWindowSystem> + + LXQtTaskbarConfiguration::LXQtTaskbarConfiguration(PluginSettings *settings, QWidget *parent): + LXQtPanelPluginConfigDialog(settings, parent), +@@ -54,9 +54,9 @@ + + ui->showDesktopNumCB->addItem(tr("Current"), 0); + //Note: in KWindowSystem desktops are numbered from 1..N +- const int desk_cnt = KX11Extras::numberOfDesktops(); ++ const int desk_cnt = KWindowSystem::numberOfDesktops(); + for (int i = 1; desk_cnt >= i; ++i) +- ui->showDesktopNumCB->addItem(QString(QStringLiteral("%1 - %2")).arg(i).arg(KX11Extras::desktopName(i)), i); ++ ui->showDesktopNumCB->addItem(QString(QStringLiteral("%1 - %2")).arg(i).arg(KWindowSystem::desktopName(i)), i); + + loadSettings(); + ui->ungroupedNextToExistingCB->setEnabled(!(ui->groupingGB->isChecked())); +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbutton.cpp lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbutton.cpp +--- lxqt-panel-1.4.0/plugin-taskbar/lxqttaskbutton.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskbutton.cpp 2023-11-26 05:29:18.849179024 -0800 +@@ -54,7 +54,7 @@ + #include "lxqttaskgroup.h" + #include "lxqttaskbar.h" + +-#include <KWindowSystem/KX11Extras> ++#include <KWindowSystem/KWindowSystem> + // Necessary for closeApplication() + #include <KWindowSystem/NETWM> + #include <QX11Info> +@@ -151,7 +151,7 @@ + if (ico.isNull()) + { + int devicePixels = mIconSize * devicePixelRatioF(); +- ico = KX11Extras::icon(mWindow, devicePixels, devicePixels); ++ ico = KWindowSystem::icon(mWindow, devicePixels, devicePixels); + } + setIcon(ico.isNull() ? XdgIcon::defaultApplicationIcon() : ico); + } +@@ -415,7 +415,7 @@ + ************************************************/ + bool LXQtTaskButton::isApplicationActive() const + { +- return KX11Extras::activeWindow() == mWindow; ++ return KWindowSystem::activeWindow() == mWindow; + } + + /************************************************ +@@ -426,16 +426,16 @@ + KWindowInfo info(mWindow, NET::WMDesktop | NET::WMState | NET::XAWMState); + if (parentTaskBar()->raiseOnCurrentDesktop() && info.isMinimized()) + { +- KX11Extras::setOnDesktop(mWindow, KX11Extras::currentDesktop()); ++ KWindowSystem::setOnDesktop(mWindow, KWindowSystem::currentDesktop()); + } + else + { + int winDesktop = info.desktop(); +- if (KX11Extras::currentDesktop() != winDesktop) +- KX11Extras::setCurrentDesktop(winDesktop); ++ if (KWindowSystem::currentDesktop() != winDesktop) ++ KWindowSystem::setCurrentDesktop(winDesktop); + } + // bypass focus stealing prevention +- KX11Extras::forceActiveWindow(mWindow); ++ KWindowSystem::forceActiveWindow(mWindow); + + setUrgencyHint(false); + } +@@ -445,7 +445,7 @@ + ************************************************/ + void LXQtTaskButton::minimizeApplication() + { +- KX11Extras::minimizeWindow(mWindow); ++ KWindowSystem::minimizeWindow(mWindow); + } + + /************************************************ +@@ -557,7 +557,7 @@ + if (!ok) + return; + +- KX11Extras::setOnDesktop(mWindow, desk); ++ KWindowSystem::setOnDesktop(mWindow, desk); + } + + /************************************************ +@@ -565,7 +565,7 @@ + ************************************************/ + void LXQtTaskButton::moveApplicationToPrevNextDesktop(bool next) + { +- int deskNum = KX11Extras::numberOfDesktops(); ++ int deskNum = KWindowSystem::numberOfDesktops(); + if (deskNum <= 1) + return; + int targetDesk = KWindowInfo(mWindow, NET::WMDesktop).desktop() + (next ? 1 : -1); +@@ -575,7 +575,7 @@ + else if (targetDesk < 1) + targetDesk = deskNum; + +- KX11Extras::setOnDesktop(mWindow, targetDesk); ++ KWindowSystem::setOnDesktop(mWindow, targetDesk); + } + + /************************************************ +@@ -585,10 +585,10 @@ + { + KWindowInfo info(mWindow, NET::WMDesktop); + if (!info.isOnCurrentDesktop()) +- KX11Extras::setCurrentDesktop(info.desktop()); ++ KWindowSystem::setCurrentDesktop(info.desktop()); + if (isMinimized()) +- KX11Extras::unminimizeWindow(mWindow); +- KX11Extras::forceActiveWindow(mWindow); ++ KWindowSystem::unminimizeWindow(mWindow); ++ KWindowSystem::forceActiveWindow(mWindow); + const QRect& windowGeometry = KWindowInfo(mWindow, NET::WMFrameExtents).frameGeometry(); + QList<QScreen *> screens = QGuiApplication::screens(); + if (screens.size() > 1){ +@@ -628,10 +628,10 @@ + { + KWindowInfo info(mWindow, NET::WMDesktop); + if (!info.isOnCurrentDesktop()) +- KX11Extras::setCurrentDesktop(info.desktop()); ++ KWindowSystem::setCurrentDesktop(info.desktop()); + if (isMinimized()) +- KX11Extras::unminimizeWindow(mWindow); +- KX11Extras::forceActiveWindow(mWindow); ++ KWindowSystem::unminimizeWindow(mWindow); ++ KWindowSystem::forceActiveWindow(mWindow); + const QRect& g = KWindowInfo(mWindow, NET::WMGeometry).geometry(); + int X = g.center().x(); + int Y = g.center().y(); +@@ -646,10 +646,10 @@ + { + KWindowInfo info(mWindow, NET::WMDesktop); + if (!info.isOnCurrentDesktop()) +- KX11Extras::setCurrentDesktop(info.desktop()); ++ KWindowSystem::setCurrentDesktop(info.desktop()); + if (isMinimized()) +- KX11Extras::unminimizeWindow(mWindow); +- KX11Extras::forceActiveWindow(mWindow); ++ KWindowSystem::unminimizeWindow(mWindow); ++ KWindowSystem::forceActiveWindow(mWindow); + const QRect& g = KWindowInfo(mWindow, NET::WMGeometry).geometry(); + int X = g.bottomRight().x(); + int Y = g.bottomRight().y(); +@@ -701,7 +701,7 @@ + */ + + /********** Desktop menu **********/ +- int deskNum = KX11Extras::numberOfDesktops(); ++ int deskNum = KWindowSystem::numberOfDesktops(); + if (deskNum > 1) + { + int winDesk = KWindowInfo(mWindow, NET::WMDesktop).desktop(); +@@ -715,7 +715,7 @@ + + for (int i = 1; i <= deskNum; ++i) + { +- auto deskName = KX11Extras::desktopName(i).trimmed(); ++ auto deskName = KWindowSystem::desktopName(i).trimmed(); + if (deskName.isEmpty()) + a = deskMenu->addAction(tr("Desktop &%1").arg(i)); + else +@@ -726,7 +726,7 @@ + connect(a, &QAction::triggered, this, &LXQtTaskButton::moveApplicationToDesktop); + } + +- int curDesk = KX11Extras::currentDesktop(); ++ int curDesk = KWindowSystem::currentDesktop(); + a = menu->addAction(tr("&To Current Desktop")); + a->setData(curDesk); + a->setEnabled(curDesk != winDesk); +diff '--color=auto' -Nurd lxqt-panel-1.4.0/plugin-taskbar/lxqttaskgroup.cpp lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskgroup.cpp +--- lxqt-panel-1.4.0/plugin-taskbar/lxqttaskgroup.cpp 2023-11-05 03:56:26.000000000 -0800 ++++ lxqt-panel-1.4.0.new/plugin-taskbar/lxqttaskgroup.cpp 2023-11-26 05:29:48.118945605 -0800 +@@ -38,7 +38,7 @@ + #include <QStringBuilder> + #include <QMenu> + #include <XdgIcon> +-#include <KWindowSystem/KX11Extras> ++#include <KWindowSystem/KWindowSystem> + #include <QX11Info> + #include <functional> + +@@ -58,8 +58,8 @@ + setText(groupName); + + connect(this, &LXQtTaskGroup::clicked, this, &LXQtTaskGroup::onClicked); +- connect(KX11Extras::self(), &KX11Extras::currentDesktopChanged, this, &LXQtTaskGroup::onDesktopChanged); +- connect(KX11Extras::self(), &KX11Extras::activeWindowChanged, this, &LXQtTaskGroup::onActiveWindowChanged); ++ connect(KWindowSystem::self(), &KWindowSystem::currentDesktopChanged, this, &LXQtTaskGroup::onDesktopChanged); ++ connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &LXQtTaskGroup::onActiveWindowChanged); + connect(parent, &LXQtTaskBar::buttonRotationRefreshed, this, &LXQtTaskGroup::setAutoRotation); + connect(parent, &LXQtTaskBar::refreshIconGeometry, this, &LXQtTaskGroup::refreshIconsGeometry); + connect(parent, &LXQtTaskBar::buttonStyleRefreshed, this, &LXQtTaskGroup::setToolButtonsStyle); +@@ -97,7 +97,7 @@ + void LXQtTaskGroup::closeGroup() + { + for (LXQtTaskButton *button : qAsConst(mButtonHash) ) +- if (button->isOnDesktop(KX11Extras::currentDesktop())) ++ if (button->isOnDesktop(KWindowSystem::currentDesktop())) + button->closeApplication(); + } + +@@ -305,7 +305,7 @@ + { + if (visibleButtonsCount() > 1) + { +- setChecked(mButtonHash.contains(KX11Extras::activeWindow())); ++ setChecked(mButtonHash.contains(KWindowSystem::activeWindow())); + setPopupVisible(true); + } + } +@@ -384,7 +384,7 @@ + const int showDesktop = taskbar->showDesktopNum(); + for(LXQtTaskButton * btn : qAsConst(mButtonHash)) + { +- bool visible = taskbar->isShowOnlyOneDesktopTasks() ? btn->isOnDesktop(0 == showDesktop ? KX11Extras::currentDesktop() : showDesktop) : true; ++ bool visible = taskbar->isShowOnlyOneDesktopTasks() ? btn->isOnDesktop(0 == showDesktop ? KWindowSystem::currentDesktop() : showDesktop) : true; + visible &= taskbar->isShowOnlyCurrentScreenTasks() ? btn->isOnCurrentScreen() : true; + visible &= taskbar->isShowOnlyMinimizedTasks() ? btn->isMinimized() : true; + btn->setVisible(visible); |