Lubuntu/lxqt-config-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with archive

Browse Source
This commit is contained in:
Aaron Rainbolt 2022-07-04 03:29:19 -05:00
parent e522e9d204
commit 95f656a080
8 changed files with 192 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
debian/changelog vendored
View File

@ -1,3 +1,30 @@
lxqt-config (1.1.0-0ubuntu2) kinetic; urgency=medium
* Enhancements to the theme list.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 11 Jun 2022 14:22:35 -0400
lxqt-config (1.1.0-0ubuntu1) kinetic; urgency=medium
* New upstream release.
* Bump build dependencies.
* Remove old Breaks/Replaces since we're past the LTS.
* Add a new entry to the install file.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 01 Jun 2022 15:00:38 -0500
lxqt-config (0.17.1-0ubuntu1) impish; urgency=medium
* New upstream release 0.17.1
* Update debian/control
- Bump Standards-Version to 4.5.1
- Use liblxqt0-dev 0.17.0
* Rename tag for lintian override
* Update debian/copyright
* Run wrap-and-sort
-- apt-ghetto <apt-ghetto@protonmail.com> Thu, 12 Aug 2021 17:03:12 +0200
lxqt-config (0.16.1-1ubuntu1) hirsute; urgency=medium
* New upstream version.

9
debian/control vendored
View File

@ -7,7 +7,7 @@ Priority: optional
Build-Depends: debhelper-compat (= 13),
libkf5screen-dev,
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.16.0~),
liblxqt1-dev (>= 1.1.0),
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
@ -18,7 +18,7 @@ Build-Depends: debhelper-compat (= 13),
qtbase5-private-dev,
xserver-xorg-input-libinput-dev,
zlib1g-dev
Standards-Version: 4.5.0
Standards-Version: 4.5.1
Vcs-Browser: https://phab.lubuntu.me/source/lxqt-config/
Vcs-Git: https://phab.lubuntu.me/source/lxqt-config.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
@ -27,8 +27,7 @@ Homepage: https://github.com/lxqt/lxqt-config
Package: lxqt-config
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: galternatives,
lxqt-config-l10n,
lxqt-policykit,
@ -56,7 +55,5 @@ Architecture: all
Multi-Arch: foreign
Section: localization
Depends: qttranslations5-l10n, ${misc:Depends}
Breaks: lxqt-config (<< 0.11.0)
Replaces: lxqt-config (<< 0.11.0)
Description: Language package for lxqt-config
This package contains the l10n files needed by lxqt-config.

51
debian/copyright vendored
View File

@ -3,10 +3,11 @@ Upstream-Name: lxqt-config
Source: https://github.com/lxqt/lxqt-config
Files: *
Copyright: 2012-2018 LXQt team
2010-2012 Razor team
2013 Christian Surlykke
2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
Copyright: 2012-2020, LXQt team
2010-2012, Razor team
2013, Christian Surlykke
2014, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2014, Luís Pereira <luis.artur.pereira@gmail.com>
License: LGPL-2.1+
Files: lxqt-config-appearance/iconthemeinfo.cpp
@ -19,7 +20,8 @@ Copyright: 2007, 2009 Rafael Fernández López <ereslibre@kde.org>
2007 John Tapsell <tapsell@kde.org>
License: LGPL-2.0+
Files: liblxqt-config-cursor/cfgfile.h
Files: liblxqt-config-cursor/cfgfile.cpp
liblxqt-config-cursor/cfgfile.h
liblxqt-config-cursor/main.cpp
liblxqt-config-cursor/main.h
liblxqt-config-cursor/selectwnd.cpp
@ -59,7 +61,31 @@ Files: lxqt-config-input/keyboardconfig.cpp
Copyright: 2013-2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
License: GPL-2.0+
Files: lxqt-config-monitor/main.cpp
Files: lxqt-config-input/touchpadconfig.cpp
lxqt-config-input/touchpadconfig.h
lxqt-config-input/touchpaddevice.cpp
lxqt-config-input/touchpaddevice.h
Copyright: 2016-2018, Chih-Hsuan Yen <yan12125@gmail.com>
License: GPL-2.0+
Files: lxqt-config-locale/combobox.h
Copyright: 2018, Pedram Pourang <tsujan2000@gmail.com>
License: GPL-2.0+
Files: lxqt-config-locale/localeconfig.cpp
lxqt-config-locale/localeconfig.h
Copyright: 2014, LXQt team
2014, Sebastian Kügler <sebas@kde.org>
License: GPL-2.0+
Files: lxqt-config-monitor/fastmenu.cpp
lxqt-config-monitor/fastmenu.h
lxqt-config-monitor/kscreenutils.h
lxqt-config-monitor/loadsettings.cpp
lxqt-config-monitor/loadsettings.h
lxqt-config-monitor/main.cpp
lxqt-config-monitor/managesavedsettings.cpp
lxqt-config-monitor/managesavedsettings.h
lxqt-config-monitor/monitor.cpp
lxqt-config-monitor/monitor.h
lxqt-config-monitor/monitorwidget.cpp
@ -68,16 +94,27 @@ Files: lxqt-config-monitor/main.cpp
lxqt-config-monitor/monitorsettingsdialog.cpp
lxqt-config-monitor/monitorsettingsdialog.h
lxqt-config-monitor/savesettings.cpp
Copyright: 2014 P.L. Lucas <selairi@gmail.com>
lxqt-config-monitor/settingsdialog.cpp
lxqt-config-monitor/settingsdialog.h
lxqt-config-monitor/timeoutdialog.cpp
lxqt-config-monitor/timeoutdialog.h
Copyright: 2014-2016, 2019, P.L. Lucas <selairi@gmail.com>
2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
License: GPL-2.0+
Files: lxqt-config-brightness/brightnesssettings.*
lxqt-config-brightness/main.cpp
lxqt-config-brightness/monitorinfo.*
lxqt-config-brightness/outputwidget.cpp
lxqt-config-brightness/outputwidget.h
Copyright: 2016 P.L. Lucas <selairi@gmail.com>
License: LGPL-2.1+
Files: lxqt-config-brightness/brightnesswatcher.cpp
lxqt-config-brightness/brightnesswatcher.h
Copyright: 2020, Luís Pereira <luis.artur.pereira@gmail.com>
License: GPL-2.0+
Files: lxqt-config-brightness/xrandrbrightness.*
Copyright: 2015 Kai Uwe Broulik <kde@privat.broulik.de>
2010 Lukas Tinkl <ltinkl@redhat.com>

10
debian/lintian-overrides vendored
View File

@ -1,9 +1,9 @@
# there will be no man-pages in a foreseeable future
lxqt-config: binary-without-manpage usr/bin/lxqt-config-brightness
lxqt-config: binary-without-manpage usr/bin/lxqt-config-file-associations
lxqt-config: binary-without-manpage usr/bin/lxqt-config-input
lxqt-config: binary-without-manpage usr/bin/lxqt-config-locale
lxqt-config: binary-without-manpage usr/bin/lxqt-config-monitor
lxqt-config: no-manual-page usr/bin/lxqt-config-brightness
lxqt-config: no-manual-page usr/bin/lxqt-config-file-associations
lxqt-config: no-manual-page usr/bin/lxqt-config-input
lxqt-config: no-manual-page usr/bin/lxqt-config-locale
lxqt-config: no-manual-page usr/bin/lxqt-config-monitor
# not a bug, LXQt has not reached free-desktop yet
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-appearance.desktop

3
debian/lxqt-config.install vendored
View File

@ -14,7 +14,8 @@ usr/share/applications/lxqt-config-input.desktop
usr/share/applications/lxqt-config-locale.desktop
usr/share/applications/lxqt-config-monitor.desktop
usr/share/applications/lxqt-config.desktop
usr/share/icons/hicolor/48x48/apps/brightnesssettings.svg
usr/share/desktop-directories/lxqt-settings-lxqt.directory
usr/share/desktop-directories/lxqt-settings-other.directory
usr/share/desktop-directories/lxqt-settings-system.directory
usr/share/icons/hicolor/48x48/apps/brightnesssettings.svg
usr/share/lxqt/icons/monitor.svg

2
debian/manpages vendored
View File

@ -1,3 +1,3 @@
usr/share/man/man1/lxqt-config-mouse.1
usr/share/man/man1/lxqt-config-appearance.1
usr/share/man/man1/lxqt-config-mouse.1
usr/share/man/man1/lxqt-config.1

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
theme-list-enhancements.patch

109
debian/patches/theme-list-enhancements.patch vendored Normal file
View File

@ -0,0 +1,109 @@
From ccc2ede1557523ed396e488f705132f187ab750f Mon Sep 17 00:00:00 2001
From: tsujan <tsujan2000@gmail.com>
Date: Mon, 16 May 2022 19:05:49 +0430
Subject: [PATCH] Small enhancement to theme list in appearance config dialog
(#854)
* Small enhancement to theme list in appearance config dialog
Themes are always sorted alphabetically, user themes are distinguished, and theme folders can be opened by double clicking or by using context menus.
Closes https://github.com/lxqt/lxqt-config/issues/852
* Don't use `WhatsThisRole` for theme path
`WhatsThisRole` might be needed later for another purpose, and finding the theme path directly has no real cost.
---
lxqt-config-appearance/lxqtthemeconfig.cpp | 40 ++++++++++++++++++++++
lxqt-config-appearance/lxqtthemeconfig.h | 4 +++
2 files changed, 44 insertions(+)
diff --git a/lxqt-config-appearance/lxqtthemeconfig.cpp b/lxqt-config-appearance/lxqtthemeconfig.cpp
index 49b65e8b..8bc903f8 100644
--- a/lxqt-config-appearance/lxqtthemeconfig.cpp
+++ b/lxqt-config-appearance/lxqtthemeconfig.cpp
@@ -32,6 +32,11 @@
#include <QProcess>
#include <QItemDelegate>
#include <QPainter>
+#include <QMenu>
+#include <QDesktopServices>
+#include <QUrl>
+
+#include <XdgDirs>
/*!
* \brief Simple delegate to draw system background color below decoration/icon
@@ -84,6 +89,10 @@ LXQtThemeConfig::LXQtThemeConfig(LXQt::Settings *settings, QWidget *parent) :
{
QString themeName = theme.name();
themeName[0] = themeName[0].toTitleCase();
+ if (theme.path().contains(XdgDirs::dataHome(false) + QStringLiteral("/")))
+ {
+ themeName += QStringLiteral(" ") + tr("(User Theme)");
+ }
QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(themeName));
if (!theme.previewImage().isEmpty())
{
@@ -93,11 +102,16 @@ LXQtThemeConfig::LXQtThemeConfig(LXQt::Settings *settings, QWidget *parent) :
item->setData(0, Qt::UserRole, theme.name());
ui->lxqtThemeList->addTopLevelItem(item);
}
+ ui->lxqtThemeList->sortItems(0, Qt::AscendingOrder);
+ ui->lxqtThemeList->setContextMenuPolicy(Qt::CustomContextMenu);
initControls();
connect(ui->lxqtThemeList, &QTreeWidget::currentItemChanged, this, &LXQtThemeConfig::settingsChanged);
connect(ui->wallpaperOverride, &QAbstractButton::clicked, this, &LXQtThemeConfig::settingsChanged);
+
+ connect(ui->lxqtThemeList, &QTreeWidget::itemDoubleClicked, this, &LXQtThemeConfig::doubleClicked);
+ connect(ui->lxqtThemeList, &QWidget::customContextMenuRequested, this, &LXQtThemeConfig::contextMenu);
}
@@ -145,3 +159,29 @@ void LXQtThemeConfig::applyLxqtTheme()
}
}
}
+
+void LXQtThemeConfig::doubleClicked(QTreeWidgetItem *item, int /*column*/)
+{
+ if (!item)
+ return;
+
+ LXQt::LXQtTheme theme{item->data(0, Qt::UserRole).toString()};
+ if (!theme.isValid())
+ return;
+
+ // first try "qtxdg-mat"; fall back to QDesktopServices if we are not inside an LXQt session
+ if (!QProcess::startDetached(QStringLiteral("qtxdg-mat"), QStringList() << QStringLiteral("open") << theme.path()))
+ {
+ QDesktopServices::openUrl(QUrl(theme.path()));
+ }
+}
+
+void LXQtThemeConfig::contextMenu(const QPoint& p)
+{
+ QMenu menu;
+ QAction *a = menu.addAction(tr("Open theme folder"));
+ connect(a, &QAction::triggered, [this, p] {
+ doubleClicked(ui->lxqtThemeList->itemAt(p), 0);
+ });
+ menu.exec(ui->lxqtThemeList->viewport()->mapToGlobal(p));
+}
diff --git a/lxqt-config-appearance/lxqtthemeconfig.h b/lxqt-config-appearance/lxqtthemeconfig.h
index 8846dbbe..1886738c 100644
--- a/lxqt-config-appearance/lxqtthemeconfig.h
+++ b/lxqt-config-appearance/lxqtthemeconfig.h
@@ -53,6 +53,10 @@ public slots:
signals:
void settingsChanged();
+private slots:
+ void doubleClicked(QTreeWidgetItem *item, int column);
+ void contextMenu(const QPoint& p);
+
private:
Ui::LXQtThemeConfig *ui;
LXQt::Settings *mSettings;