From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- lxqt-base/lxqt-config/Manifest | 2 + .../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, 411 insertions(+) create mode 100644 lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch create 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 467afa94efc8..0a90b928af4a 100644 --- a/lxqt-base/lxqt-config/Manifest +++ b/lxqt-base/lxqt-config/Manifest @@ -1,6 +1,8 @@ AUX lxqt-config-0.14.1-qt-5.14-build.patch 648 BLAKE2B 181699115b64c6ae5d0d4269a932d14ba13842af2adcddcd0287fb1d2343512a2c0100d920fc2f6acef9797405ff6a51f2cecb3245bef025f2062ecbe4855cf5 SHA512 e4f02a01c6f857b2f9c9402baa8779e902e0df3ca92d364e55395f19691d8f4399e0b9337126609b4b2c6a342b389658eeb79a9cd69781f71432f9bffe0d3b53 +AUX lxqt-config-0.15.0-window-colour-option.patch 12529 BLAKE2B 5abfe6c0ca54878cbeb9258c39347ed8453ef5479d34bc3befec3294a98fc3a3f02a178110e8ae57c84a5bfbf0dac9841dc637cff8d2ddc9c1d5e9961ae16964 SHA512 40542b2b0a5594799f123ccba30d1a133e2a94b23ed0610fceb72049d4b9e55ca831f43a63f62bebc04461db651f097efbdcde3c099dda0e28a9f7783e936b52 DIST lxqt-config-0.14.1.tar.xz 293304 BLAKE2B f090d7878815edc4f3f0078301a099ffc8ff57865516a9097db75faa1627af33c60d76b75cef8a7da5e9e790869e6768f54c3b17c59b038578f22d645c3c22fd SHA512 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f DIST lxqt-config-0.15.0.tar.xz 312468 BLAKE2B 2b3eb43141f3b46996b785b7cd19b709028c8cecc455a63578c93a9ae580148bc35df1192591bf0fdb5584d2cf66f589dbdde0d43c6848dda263d1f0b80e8c59 SHA512 68dc8ecc38033a7a93167fb0afbe45b3e14eb1132c3faf3395ebed1fc96b5836e8db003ecffde0417dfaf9e73b70fcc69a06523319f1f858cd2020eb61113a0d EBUILD lxqt-config-0.14.1-r1.ebuild 1520 BLAKE2B 01d067c42d6a5b77b5b06c5c30204da8d3a79e1a9d35f488a5bbe1ea0ce0d29d1498721f93962ec7968bb193d22f94d1750af83987a3ff9c42492e5884025630 SHA512 b3c7ab4fe6ce89b2dd9238d164d792aa3367c6937ed23125c302ab1b732055a23d7d706e2045175bb3dd85d02bc32b14a2c0f0d782e67c81c82435e2ef179011 +EBUILD lxqt-config-0.15.0-r1.ebuild 1538 BLAKE2B 942ff5c18fca343b61abd53c0608f4cd20cd4b18f7111b7b3ffdddf55bcd1780c2b49395198ffa70e581cfa751113bb2c4f1fb2c1cc086f660fa5d4eb87a5758 SHA512 e5cbb728b68411e170a03ab774d5b3d675265e63a3537b932549460fd9bb0842e7205dd35c857c8fbb6c77ef086a6385dca7f67701ddd8ac773c14d48c031523 EBUILD lxqt-config-0.15.0.ebuild 1471 BLAKE2B 5a10e760e5964c7b1059de314e036ab5ab697605721d7e8d9f05c99cc43de7236539e8cb55dd384d1a91e954530bd0c272f699018a9a993146f6658371f67835 SHA512 87a9d073b092c1b2069ba78a384e1ec2d18bca7da648172f9d6fea1eeec241e983ffdf06d32ebc484cb264812e396061826a6e14c527781862e10fcd48aba884 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 new file mode 100644 index 000000000000..813cd7e4bca8 --- /dev/null +++ b/lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch @@ -0,0 +1,333 @@ +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 new file mode 100644 index 000000000000..af99f9d0116e --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild @@ -0,0 +1,76 @@ +# 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