From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- lxqt-base/lxqt-config/Manifest | 3 - .../lxqt-config-0.15.0-window-colour-option.patch | 333 --------------------- lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild | 76 ----- 3 files changed, 412 deletions(-) delete mode 100644 lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch delete mode 100644 lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild (limited to 'lxqt-base/lxqt-config') diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest index 4f19dac2b4fd..2c91f807970f 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1,6 +1,3 @@ -AUX lxqt-config-0.15.0-window-colour-option.patch 12529 BLAKE2B 5abfe6c0ca54878cbeb9258c39347ed8453ef5479d34bc3befec3294a98fc3a3f02a178110e8ae57c84a5bfbf0dac9841dc637cff8d2ddc9c1d5e9961ae16964 SHA512 40542b2b0a5594799f123ccba30d1a133e2a94b23ed0610fceb72049d4b9e55ca831f43a63f62bebc04461db651f097efbdcde3c099dda0e28a9f7783e936b52 -DIST lxqt-config-0.15.0.tar.xz 312468 BLAKE2B 2b3eb43141f3b46996b785b7cd19b709028c8cecc455a63578c93a9ae580148bc35df1192591bf0fdb5584d2cf66f589dbdde0d43c6848dda263d1f0b80e8c59 SHA512 68dc8ecc38033a7a93167fb0afbe45b3e14eb1132c3faf3395ebed1fc96b5836e8db003ecffde0417dfaf9e73b70fcc69a06523319f1f858cd2020eb61113a0d DIST lxqt-config-0.16.1.tar.xz 327652 BLAKE2B b242aeea758b8dc2804c9ebd4abd9a0ab98d92e7e6620646c90a78ca60238ef0e62e823eac3e226fdd05ddc431e271551ecf34281467a9db03fe5195a2f3e293 SHA512 3322611b74a945b2c4aa60a179fc1edabd09e474502f44e7a0319478a09762ff7a11fbb7603aa26ec8ea593514bbcdfc98fb475009d0dfa4d387963fcdef7e03 -EBUILD lxqt-config-0.15.0-r1.ebuild 1536 BLAKE2B 59a72716f6514325c2cbb85942e9b27295bb430a725bcc3e7c78878f43f67a22a0f93a70447026acced323cff012b1622a6f886733c5da3d0e49d4ab1ed06bba SHA512 708a6102079ed65a3400913b437f4eedda67251579d8c5ad86282fb26065d1c8e746bd8b0072d3c768a34bf653a50b8ec3d6277291ccdbf1d975cf6ffad678ca EBUILD lxqt-config-0.16.1.ebuild 1469 BLAKE2B 6311864c7526ffaee49963abfc723178f96bf7621f155712a5505a6315061d6f4d941f81e15011906f97ad4049cc4d9ee7b9cf92f2ad17cd89d00da081cd7b08 SHA512 4377185b8fd44354f088f3d337208812647ab7b3045f27e6ddf685b748b2fdaf5222784c1450ede7b1d2af490c8c205d109b9a6c8003b74eeff6b26fd0e7ba45 MISC metadata.xml 450 BLAKE2B 6f59cf0984e8e6c625eef75e01275d3d9e0b09fdbc1fc82fffb8611b44654da27da256148350c632673352ebc397f07b4696efad6f1f0d35489468752a4293cb SHA512 9e74d2cdc46c1c7797ac91f141995fbab7e11f4f05bef094e2af89d3cfe7d47d209de3de5726eee2eb45926185803ff7c7f012aad994f1acbc43feca88e798fc diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch deleted file mode 100644 index 813cd7e4bca8..000000000000 --- a/lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch +++ /dev/null @@ -1,333 +0,0 @@ -From 0edcc373698189f27ac24fb0985570ef2ecd8b0d Mon Sep 17 00:00:00 2001 -From: Tsu Jan -Date: Sun, 31 May 2020 18:04:48 +0430 -Subject: [PATCH 1/4] Added an option to change window color -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It is in LXQt Appearance Configuration → Widget Style. - -Note: For the option to work, lxqt-qtplugin 0.15.1 should be installed; otherwise, it will have no effect. ---- - lxqt-config-appearance/CMakeLists.txt | 1 + - lxqt-config-appearance/colorLabel.cpp | 65 ++++++++++++++++++++++++++ - lxqt-config-appearance/colorLabel.h | 53 +++++++++++++++++++++ - lxqt-config-appearance/styleconfig.cpp | 16 ++++++- - lxqt-config-appearance/styleconfig.ui | 34 ++++++++++++++ - 5 files changed, 168 insertions(+), 1 deletion(-) - create mode 100644 lxqt-config-appearance/colorLabel.cpp - create mode 100644 lxqt-config-appearance/colorLabel.h - -diff --git a/lxqt-config-appearance/CMakeLists.txt b/lxqt-config-appearance/CMakeLists.txt -index 184a8309..1ec118b7 100644 ---- a/lxqt-config-appearance/CMakeLists.txt -+++ b/lxqt-config-appearance/CMakeLists.txt -@@ -27,6 +27,7 @@ set(CPP_FILES - styleconfig.cpp - fontconfigfile.cpp - configothertoolkits.cpp -+ colorLabel.cpp - ) - - set(UI_FILES -diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp -new file mode 100644 -index 00000000..a3e22df0 ---- /dev/null -+++ b/lxqt-config-appearance/colorLabel.cpp -@@ -0,0 +1,65 @@ -+/* BEGIN_COMMON_COPYRIGHT_HEADER -+ * (c)LGPL2+ -+ * -+ * LXQt - a lightweight, Qt based, desktop toolset -+ * https://lxqt.org/ -+ * -+ * Copyright: 2020 LXQt team -+ * -+ * This program or library is free software; you can redistribute it -+ * and/or modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ -+ * You should have received a copy of the GNU Lesser General -+ * Public License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301 USA -+ * -+ * END_COMMON_COPYRIGHT_HEADER */ -+ -+#include "colorLabel.h" -+#include -+ -+ColorLabel::ColorLabel(QWidget* parent, Qt::WindowFlags f) -+ : QLabel(parent, f) -+{ -+ setFrameStyle(QFrame::Panel | QFrame::Sunken); -+ setFixedWidth(100); -+ setToolTip(tr("Click to change color.")); -+} -+ -+ColorLabel::~ColorLabel() {} -+ -+void ColorLabel::setColor(const QColor& color) -+{ -+ if (!color.isValid()) -+ return; -+ stylesheetColor_ = color; -+ // ignore translucency -+ stylesheetColor_.setAlpha(255); -+ setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3);}") -+ .arg(color.red()).arg(color.green()).arg(color.blue())); -+} -+ -+QColor ColorLabel::getColor() const -+{ -+ if (stylesheetColor_.isValid()) -+ return stylesheetColor_; // the window color may be different from the stylesheet color -+ return palette().color(QPalette::Window); -+} -+ -+void ColorLabel::mousePressEvent(QMouseEvent* /*event*/) { -+ QColor prevColor = getColor(); -+ QColor color = QColorDialog::getColor(prevColor, window(), tr("Select Color")); -+ if (color.isValid() && color != prevColor) -+ { -+ emit colorChanged(); -+ setColor(color); -+ } -+} -diff --git a/lxqt-config-appearance/colorLabel.h b/lxqt-config-appearance/colorLabel.h -new file mode 100644 -index 00000000..1ea1b62c ---- /dev/null -+++ b/lxqt-config-appearance/colorLabel.h -@@ -0,0 +1,53 @@ -+/* BEGIN_COMMON_COPYRIGHT_HEADER -+ * (c)LGPL2+ -+ * -+ * LXQt - a lightweight, Qt based, desktop toolset -+ * https://lxqt.org/ -+ * -+ * Copyright: 2020 LXQt team -+ * -+ * This program or library is free software; you can redistribute it -+ * and/or modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ -+ * You should have received a copy of the GNU Lesser General -+ * Public License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301 USA -+ * -+ * END_COMMON_COPYRIGHT_HEADER */ -+ -+#ifndef COLORLABEL_H -+#define COLORLABEL_H -+ -+#include -+#include -+#include -+ -+class ColorLabel : public QLabel { -+ Q_OBJECT -+ -+public: -+ explicit ColorLabel(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); -+ ~ColorLabel(); -+ -+ void setColor(const QColor& color); -+ QColor getColor() const; -+ -+signals: -+ void colorChanged(); -+ -+protected: -+ void mousePressEvent(QMouseEvent* event); -+ -+private: -+ QColor stylesheetColor_; -+}; -+ -+#endif // COLORLABEL_H -diff --git a/lxqt-config-appearance/styleconfig.cpp b/lxqt-config-appearance/styleconfig.cpp -index 73f336e7..ce10aff1 100644 ---- a/lxqt-config-appearance/styleconfig.cpp -+++ b/lxqt-config-appearance/styleconfig.cpp -@@ -61,6 +61,7 @@ StyleConfig::StyleConfig(LXQt::Settings* settings, QSettings* qtSettings, LXQt:: - connect(ui->gtk3ComboBox, QOverload::of(&QComboBox::activated), this, &StyleConfig::settingsChanged); - connect(ui->toolButtonStyle, QOverload::of(&QComboBox::activated), this, &StyleConfig::settingsChanged); - connect(ui->singleClickActivate, &QAbstractButton::clicked, this, &StyleConfig::settingsChanged); -+ connect(ui->winColorLabel, &ColorLabel::colorChanged, this, &StyleConfig::settingsChanged); - } - - -@@ -97,7 +98,6 @@ void StyleConfig::initControls() - // activate item views with single click - ui->singleClickActivate->setChecked( mSettings->value(QStringLiteral("single_click_activate"), false).toBool()); - -- - // Fill Qt themes - ui->qtComboBox->clear(); - ui->qtComboBox->addItems(qtThemes); -@@ -108,8 +108,16 @@ void StyleConfig::initControls() - - ui->gtk2ComboBox->setCurrentText(mConfigOtherToolKits->getGTKThemeFromRCFile(QStringLiteral("2.0"))); - ui->gtk3ComboBox->setCurrentText(mConfigOtherToolKits->getGTKThemeFromRCFile(QStringLiteral("3.0"))); -+ - mSettings->beginGroup(QLatin1String("Qt")); -+ // Qt style - ui->qtComboBox->setCurrentText(mSettings->value(QStringLiteral("style")).toString()); -+ // Qt window color -+ QColor color; -+ color.setNamedColor(mSettings->value(QStringLiteral("window_color")).toString()); -+ if (!color.isValid()) -+ color = QGuiApplication::palette().color(QPalette::Active,QPalette::Window); -+ ui->winColorLabel->setColor(color); - mSettings->endGroup(); - - update(); -@@ -122,6 +130,12 @@ void StyleConfig::applyStyle() - mQtSettings->beginGroup(QLatin1String("Qt")); - if(mQtSettings->value(QStringLiteral("style")).toString() != themeName) - mQtSettings->setValue(QStringLiteral("style"), themeName); -+ // Qt window color -+ QColor winColor = ui->winColorLabel->getColor(); -+ QColor oldWinColor; -+ oldWinColor.setNamedColor(mQtSettings->value(QStringLiteral("window_color")).toString()); -+ if (winColor != oldWinColor) -+ mQtSettings->setValue(QStringLiteral("window_color"), winColor.name()); - mQtSettings->endGroup(); - - // single click setting -diff --git a/lxqt-config-appearance/styleconfig.ui b/lxqt-config-appearance/styleconfig.ui -index 15394024..6edbe470 100644 ---- a/lxqt-config-appearance/styleconfig.ui -+++ b/lxqt-config-appearance/styleconfig.ui -@@ -146,8 +146,42 @@ Make sure 'xsettingsd' is installed to help GTK applications apply themes on the - - - -+ -+ -+ -+ 5 -+ -+ -+ 10 -+ -+ -+ 10 -+ -+ -+ -+ -+ Window Color: -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -+ -+ -+ ColorLabel -+ QLabel -+
colorLabel.h
-+ -+ - - - - -From 99ecfabccceb827256b7ef32c75c6aa6434d2d9f Mon Sep 17 00:00:00 2001 -From: Tsu Jan -Date: Mon, 1 Jun 2020 23:46:49 +0430 -Subject: [PATCH 2/4] Added a distinguishable border to the color label - ---- - lxqt-config-appearance/colorLabel.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp -index a3e22df0..c3b69d8d 100644 ---- a/lxqt-config-appearance/colorLabel.cpp -+++ b/lxqt-config-appearance/colorLabel.cpp -@@ -43,8 +43,10 @@ void ColorLabel::setColor(const QColor& color) - stylesheetColor_ = color; - // ignore translucency - stylesheetColor_.setAlpha(255); -- setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3);}") -- .arg(color.red()).arg(color.green()).arg(color.blue())); -+ QString borderColor = qGray(stylesheetColor_.rgb()) < 255 / 2 -+ ? QStringLiteral("white") : QStringLiteral("black"); -+ setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}}") -+ .arg(color.red()).arg(color.green()).arg(color.blue()).arg(borderColor)); - } - - QColor ColorLabel::getColor() const - -From 37f55579da91bfd78310a0e2c28c8551ad484414 Mon Sep 17 00:00:00 2001 -From: Tsu Jan -Date: Thu, 4 Jun 2020 15:47:22 +0430 -Subject: [PATCH 3/4] Removed an extra curly bracket in stylesheet - ---- - lxqt-config-appearance/colorLabel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp -index c3b69d8d..de730baf 100644 ---- a/lxqt-config-appearance/colorLabel.cpp -+++ b/lxqt-config-appearance/colorLabel.cpp -@@ -45,7 +45,7 @@ void ColorLabel::setColor(const QColor& color) - stylesheetColor_.setAlpha(255); - QString borderColor = qGray(stylesheetColor_.rgb()) < 255 / 2 - ? QStringLiteral("white") : QStringLiteral("black"); -- setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}}") -+ setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}") - .arg(color.red()).arg(color.green()).arg(color.blue()).arg(borderColor)); - } - - -From 30cf8267ce4af08f9953b169f9d8109fb9437f7d Mon Sep 17 00:00:00 2001 -From: Tsu Jan -Date: Sat, 6 Jun 2020 14:15:53 +0430 -Subject: [PATCH 4/4] A small improvement - ---- - lxqt-config-appearance/colorLabel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp -index de730baf..98d01729 100644 ---- a/lxqt-config-appearance/colorLabel.cpp -+++ b/lxqt-config-appearance/colorLabel.cpp -@@ -46,7 +46,7 @@ void ColorLabel::setColor(const QColor& color) - QString borderColor = qGray(stylesheetColor_.rgb()) < 255 / 2 - ? QStringLiteral("white") : QStringLiteral("black"); - setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}") -- .arg(color.red()).arg(color.green()).arg(color.blue()).arg(borderColor)); -+ .arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue()), borderColor)); - } - - QColor ColorLabel::getColor() const diff --git a/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild deleted file mode 100644 index 84f03be2dab7..000000000000 --- a/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="LXQt system configuration control center" -HOMEPAGE="https://lxqt.github.io/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -fi - -LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" -SLOT="0" -IUSE="+monitor +touchpad" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.7.0 -" -DEPEND=" - >=dev-libs/libqtxdg-3.3.1 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - kde-frameworks/kwindowsystem:5 - =lxqt-base/liblxqt-$(ver_cut 1-2)* - sys-libs/zlib:= - x11-apps/setxkbmap - x11-libs/libxcb:= - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - monitor? ( kde-plasma/libkscreen:5= ) - touchpad? ( - virtual/libudev - x11-drivers/xf86-input-libinput - x11-libs/libXext - x11-libs/libXi - ) -" -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" - -PATCHES=( "${FILESDIR}/${PN}-0.15.0-window-colour-option.patch" ) - -src_configure() { - local mycmakeargs=( - -DWITH_MONITOR=$(usex monitor) - -DWITH_TOUCHPAD=$(usex touchpad) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1 -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} -- cgit v1.2.3