Compare commits

..

No commits in common. 'ubuntu/oracular' and 'ubuntu/kinetic' have entirely different histories.

@ -1,14 +0,0 @@
LXQt-config
-----------
Software Licences
=================
This software contains GPL v2+, GPL v3+ and LGPL v2+.
This document
(http://www.gnu.org/licenses/gpl-faq.html#v3HowToUpgrade)
tells us GPL v2+ can upgrade GPL v3+. You can upgrade LGPL v3+
see also http://gplv3.fsf.org/dd3-faq
-- Yukiharu YABUKI <yyabuki@debian.org> 2015-08-21 18:42:35+09:00

168
debian/changelog vendored

@ -1,78 +1,14 @@
lxqt-config (1.4.0-0ubuntu2) noble; urgency=medium
lxqt-config (1.1.0-1) experimental; urgency=medium
* Add two upstream patches to improve the user experience, especially around
monitor handling.
* Add debian/salsa-ci.yml file.
* Update debian/upstream/signing-key.asc.
* New upstream version 1.0.0
* New upstream version 1.1.0
* Build-deps on liblxqt1-dev (>= 1.1.0~).
* Drop lxqt-config (<< 0.11.0) from Breaks and Replaces.
* lxqt-config.install: ship lxqt-settings-other.directory file.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 22 Dec 2023 16:05:33 -0600
lxqt-config (1.4.0-0ubuntu1) noble; urgency=medium
* New upstream release.
* Bumped build dependency versions.
* Added lxqt-menu-data as a build dependency.
* Removee no-longer-existing files from lxqt-config.install.
* Updated lintian-overrides syntax.
* Removed obsolete '-Wl,--as-needed' linker flag.
* Created upstream/metadata file.
-- Aaron Rainbolt <arraybolt3@gmail.com> Sun, 12 Nov 2023 18:12:05 -0600
lxqt-config (1.3.0-0ubuntu1) mantic; urgency=medium
* New upstream release.
* Bump build dependencies.
* I guess we don't require root to build, do we?
* Bump Standards-version to 4.6.2, no changes needed.
* Fix the copyright years.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 11 Aug 2023 09:49:54 -0500
lxqt-config (1.2.0-0ubuntu1) lunar; urgency=medium
* New upstream version.
* Fix the watch file, for real this time.
* Lubuntuify the package slightly, to make debhelper happy.
* Bump Standards-version, no changes needed.
* Bump build dependencies in debian/control.
* Drop reverse-applicable patch.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 18 Nov 2022 17:09:36 -0600
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.
* Updated recommends.
* Bumped debhelper-compat requirement to 13.
* Fixed manpage errors about files existing in debian/tmp but not installed anywhere.
-- Raman Sarda <theloudspeaker@disroot.org> Sun, 21 Feb 2021 22:44:21 +0530
-- Andrew Lee (李健秋) <ajqlee@debian.org> Wed, 13 Jul 2022 23:17:48 +0800
lxqt-config (0.16.1-1) unstable; urgency=medium
@ -84,17 +20,6 @@ lxqt-config (0.16.1-1) unstable; urgency=medium
-- Andrew Lee (李健秋) <ajqlee@debian.org> Wed, 06 Jan 2021 16:09:45 +0800
lxqt-config (0.15.0-0ubuntu1) groovy; urgency=medium
* New upstream release.
- Update upstream signing key.
- Bump LXQt build dependencies.
- Add build dependency on libxcb-randr0-dev (Closes: #952266).
* Bump Standards-version to 4.5.0, no changes needed.
* debhelper -> debhelper-compat.
-- Simon Quigley <tsimonq2@ubuntu.com> Thu, 04 Jun 2020 00:42:32 -0500
lxqt-config (0.14.1-4) unstable; urgency=medium
* Added build dependency libxcb-randr0-dev to fix FTBFS in testing and sid.
@ -126,13 +51,6 @@ lxqt-config (0.14.1-1) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Sun, 24 Feb 2019 20:35:48 +0100
lxqt-config (0.14.1-0ubuntu1) disco; urgency=medium
* New upstream release.
* Run wrap-and-sort.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 09 Mar 2019 12:54:59 -0600
lxqt-config (0.14.0-1) unstable; urgency=medium
* Cherry-picking new upstream version 0.14.0.
@ -150,38 +68,6 @@ lxqt-config (0.14.0-1) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Sun, 27 Jan 2019 17:15:29 +0100
lxqt-config (0.14.0-0ubuntu1) disco; urgency=medium
* New upstream release.
- Bump build dependencies.
- Remove unneeded patches.
* Bump debhelper compat to 12, no changes needed.
* Add new lxqt-config-l10n package.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 26 Jan 2019 00:07:14 -0600
lxqt-config (0.13.0+git20181226-0ubuntu3) disco; urgency=medium
* Don't recommend lxqt-config-l10n and conflict it at the same time.
-- Simon Quigley <tsimonq2@ubuntu.com> Sat, 05 Jan 2019 15:08:01 -0600
lxqt-config (0.13.0+git20181226-0ubuntu2) disco; urgency=medium
* Add Conflicts/Replaces for lxqt-config-l10n.
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 30 Dec 2018 17:42:43 -0600
lxqt-config (0.13.0+git20181226-0ubuntu1) disco; urgency=medium
* New upstream Git snapshot.
- Remove reverse-applicable patches.
- Add a patch lowering the LXQt version required.
- Add missing build dependencies.
* Bump Standards-version to 4.3.0, no changes needed.
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 30 Dec 2018 17:21:31 -0600
lxqt-config (0.13.0-1) unstable; urgency=medium
* Cherry-picking new upstream version 0.13.0.
@ -190,42 +76,6 @@ lxqt-config (0.13.0-1) unstable; urgency=medium
-- Alf Gaida <agaida@siduction.org> Thu, 24 May 2018 20:43:08 +0200
lxqt-config (0.13.0-0ubuntu5) cosmic; urgency=medium
* Set default GTK theme if rc file doesn't exists.
-- Hans P. Möller <hmoller@gmail.com> Thu, 04 Oct 2018 14:44:03 -0300
lxqt-config (0.13.0-0ubuntu4) cosmic; urgency=medium
* Make a path for GTK settings if it does not exist.
-- Walter Lapchynski <wxl@ubuntu.com> Mon, 03 Sep 2018 00:43:25 -7000
lxqt-config (0.13.0-0ubuntu3) cosmic; urgency=medium
* Run wrap-and-sort.
* Demote qt5-style-plugins to a Suggests, because some of the themes are not
working (LP: #1785401).
-- Simon Quigley <tsimonq2@ubuntu.com> Thu, 09 Aug 2018 14:24:44 -0500
lxqt-config (0.13.0-0ubuntu2) cosmic; urgency=medium
* Bump Standards-version to 4.1.5, no changes needed.
* Change Uploaders to Ubuntu uploaders.
* Add support for modifying GTK themes.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 30 Jul 2018 16:35:02 -0500
lxqt-config (0.13.0-0ubuntu1) cosmic; urgency=medium
* New upstream release.
* Update Vcs-* and Maintainer to Lubuntu values.
* Update build dependencies.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 22 May 2018 23:25:36 -0500
lxqt-config (0.12.0-4) unstable; urgency=medium
* Bumped compat to 11

45
debian/control vendored

@ -1,13 +1,15 @@
Source: lxqt-config
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
Uploaders: Alf Gaida <agaida@siduction.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>,
Yukiharu YABUKI <yyabuki@debian.org>
Section: x11
Priority: optional
Build-Depends: debhelper-compat (= 13),
Build-Depends: debhelper-compat (= 12),
libkf5screen-dev,
libkf5windowsystem-dev,
liblxqt1-dev (>= 1.4.0),
liblxqt1-dev (>= 1.1.0~),
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
@ -15,40 +17,39 @@ Build-Depends: debhelper-compat (= 13),
libxcursor-dev,
libxfixes-dev,
libxi-dev,
lxqt-menu-data (>= 1.4.0),
qtbase5-private-dev,
xserver-xorg-input-libinput-dev,
zlib1g-dev
Standards-Version: 4.6.2
Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-config-packaging
Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-config-packaging.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
Rules-Requires-Root: no
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
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,
lxqt-powermanagement,
lxqt-qtplugin,
lxqt-session,
system-config-printer
qt5-style-plugins,
system-config-printer,
xsettingsd
Suggests: adwaita-qt,
cmst [linux-any] | network-manager-gnome [linux-any],
faenza-icon-theme,
gnome-themes-standard,
gparted | partitionmanager [linux-any],
lxappearance,
cmst [linux-any] | network-manager-gnome [linux-any],
lxqt | lxqt-core,
lxappearance,
obconf-qt,
qt5-style-plugins,
synaptic
Description: LXQt system settings center
The LXQt system settings center
The LXQt system settings center which summarizes all configuration tools as
well as counterparts of other LXQt components or third-party applications.
.
This package contain the LXQt configuration ui.
@ -56,6 +57,10 @@ Package: lxqt-config-l10n
Architecture: all
Multi-Arch: foreign
Section: localization
Depends: qttranslations5-l10n, ${misc:Depends}
Depends: ${misc:Depends},
qttranslations5-l10n
Description: Language package for lxqt-config
This package contains the l10n files needed by lxqt-config.
The LXQt system settings center which summarizes all configuration tools as
well as counterparts of other LXQt components or third-party applications.
.
This package contains the l10n files needed by the lxqt-config.

54
debian/copyright vendored

@ -3,11 +3,10 @@ Upstream-Name: lxqt-config
Source: https://github.com/lxqt/lxqt-config
Files: *
Copyright: 2012-2023, 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>
Copyright: 2012-2019 LXQt team
2010-2012 Razor team
2013 Christian Surlykke
2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
License: LGPL-2.1+
Files: lxqt-config-appearance/iconthemeinfo.cpp
@ -20,8 +19,7 @@ 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.cpp
liblxqt-config-cursor/cfgfile.h
Files: liblxqt-config-cursor/cfgfile.h
liblxqt-config-cursor/main.cpp
liblxqt-config-cursor/main.h
liblxqt-config-cursor/selectwnd.cpp
@ -61,31 +59,7 @@ Files: lxqt-config-input/keyboardconfig.cpp
Copyright: 2013-2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
License: GPL-2.0+
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
Files: lxqt-config-monitor/main.cpp
lxqt-config-monitor/monitor.cpp
lxqt-config-monitor/monitor.h
lxqt-config-monitor/monitorwidget.cpp
@ -94,36 +68,24 @@ Files: lxqt-config-monitor/fastmenu.cpp
lxqt-config-monitor/monitorsettingsdialog.cpp
lxqt-config-monitor/monitorsettingsdialog.h
lxqt-config-monitor/savesettings.cpp
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>
Copyright: 2014 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>
License: LGPL-2.0+
Files: debian/*
Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
Copyright: 2014-2020 Alf Gaida <agaida@siduction.org>
2015 Andrew Lee (李健秋) <ajqlee@debian.org>
2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
License: LGPL-2.1+
License: LGPL-2.0+

6
debian/gbp.conf vendored

@ -0,0 +1,6 @@
[DEFAULT]
debian-branch = debian/sid
upstream-branch = upstream/latest
pristine-tar = True
compression = xz

@ -1,15 +1,15 @@
# there will be no man-pages in a foreseeable future
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]
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
# not a bug, LXQt has not reached free-desktop yet
lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-appearance.desktop]
lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-brightness.desktop]
lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-file-associations.desktop]
lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-input.desktop]
lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-locale.desktop]
lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-monitor.desktop]
lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config.desktop]
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-appearance.desktop
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-brightness.desktop
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-file-associations.desktop
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-input.desktop
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-locale.desktop
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-monitor.desktop
lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config.desktop

@ -1,17 +1,21 @@
usr/bin/lxqt-config
usr/bin/lxqt-config-appearance
usr/bin/lxqt-config-brightness
usr/bin/lxqt-config-file-associations
usr/bin/lxqt-config-input
usr/bin/lxqt-config-locale
usr/bin/lxqt-config-monitor
usr/lib/*/lxqt-config/liblxqt-config-cursor.so
etc/xdg/menus/lxqt-config.menu
usr/share/applications/lxqt-config-locale.desktop
usr/share/applications/lxqt-config-file-associations.desktop
usr/share/applications/lxqt-config-appearance.desktop
usr/share/applications/lxqt-config-brightness.desktop
usr/share/applications/lxqt-config-file-associations.desktop
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-input.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-system.directory
usr/share/desktop-directories/lxqt-settings-other.directory
usr/share/lxqt/icons/monitor.svg
usr/share/icons/hicolor/48x48/apps/brightnesssettings.svg
usr/bin/lxqt-config-input
usr/bin/lxqt-config-monitor
usr/bin/lxqt-config-appearance
usr/bin/lxqt-config-brightness
usr/bin/lxqt-config-file-associations
usr/bin/lxqt-config-locale
usr/bin/lxqt-config
usr/lib/*/lxqt-config/liblxqt-config-cursor.so

2
debian/manpages vendored

@ -1,3 +1,3 @@
usr/share/man/man1/lxqt-config.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,149 +0,0 @@
Description: lxqt-config-monitor: Improve UI behind Apply button in Advanced
settings dlg
.
This patch implements four UI changes explained elaborately below:
.
1) Activate existing Apply button in Advanced settings dialog
.
The Apply button now applies settings from the Saved Settings
(LXQt::ConfigDialog) page.
.
It had no active connections before.
.
2) Show saved settings on select
.
Details for saved settings was shown on 'activation' signal which
is on most platforms generated on mouse double-click or by
pressing the Enter key. It is more natural to expect the details
page to update on single mouse click or by selecting the
next/previous item by down/up arrow keys.
.
On mouse double-click one would expect to actually _activate_ the
setting, not merely show the details.
.
This also ensures, the selected settings is always displayed
before applying.
.
3) Remove Apply button from Saved settings page
.
The button did its job applying only the local configuration from
the Saved Settings (LXQt::ConfigDialog) page, but until there are
more configuration pages in the dialog its purpose is hidden and
confusing, appearing as a duplicate for the dialog's own Apply
button.
.
The button may find its way back once it makes sense to have it
there again.
.
4) Apply selected settings on mouse double-click
.
It is expected intuitively activating the selected saved settings
on mouse double-click. Enable this behavior.
Author: vc-01 <vlado.chren@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt-config/issues/577
Applied-Upstream: 3005400ce273b117833a8043f03af39f7596101d
Last-Update: 2023-12-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/lxqt-config-monitor/managesavedsettings.cpp
+++ b/lxqt-config-monitor/managesavedsettings.cpp
@@ -23,6 +23,7 @@
#include "monitor.h"
#include <QDebug>
#include <QInputDialog>
+#include <QMessageBox>
#include <QDateTime>
Q_DECLARE_METATYPE(MonitorSavedSettings)
@@ -37,18 +38,21 @@ ManageSavedSettings::ManageSavedSettings
ui.setupUi(this);
- connect(ui.allConfigs, &QListWidget::itemActivated, this, &ManageSavedSettings::showSelectedConfig);
- connect(ui.deletePushButton, &QPushButton::clicked, this, &ManageSavedSettings::onDeleteItem);
- connect(ui.renamePushButton, &QPushButton::clicked, this, &ManageSavedSettings::onRenameItem);
- connect(ui.applyPushButton, &QPushButton::clicked, this, &ManageSavedSettings::onApplyItem);
+ connect(ui.allConfigs, &QListWidget::itemSelectionChanged, this, &ManageSavedSettings::showSelectedConfig);
+ connect(ui.allConfigs, &QListWidget::itemDoubleClicked, this, &ManageSavedSettings::onApplyItem);
+ connect(ui.deletePushButton, &QPushButton::clicked, this, &ManageSavedSettings::onDeleteItem);
+ connect(ui.renamePushButton, &QPushButton::clicked, this, &ManageSavedSettings::onRenameItem);
loadSettings();
}
-void ManageSavedSettings::showSelectedConfig(QListWidgetItem * item)
+void ManageSavedSettings::showSelectedConfig()
{
- MonitorSavedSettings o = item->data(Qt::UserRole).value<MonitorSavedSettings>();
+ QListWidgetItem * currItem = ui.allConfigs->currentItem();
+ if (currItem == nullptr)
+ return;
+ MonitorSavedSettings o = currItem->data(Qt::UserRole).value<MonitorSavedSettings>();
QString text;
for(int i=0; i < o.monitors.size(); i++) {
MonitorSettings setting = o.monitors[i];
@@ -77,7 +81,6 @@ void ManageSavedSettings::showSelectedCo
}
text += QLatin1String("<br/>");
ui.selectedSettingsTextEdit->setText(text);
- ui.applyPushButton->setEnabled(isHardwareCompatible(o));
}
@@ -164,6 +167,14 @@ void ManageSavedSettings::onApplyItem()
if (ui.allConfigs->currentItem() == nullptr)
return;
MonitorSavedSettings settings = ui.allConfigs->currentItem()->data(Qt::UserRole).value<MonitorSavedSettings>();
+
+ if (!isHardwareCompatible(settings)) {
+ QMessageBox::information(this, tr("Settings Activation Failed"),
+ tr("Selected settings cannot be applied with currently active monitors.\n\n"
+ "Please choose from the highlighted configurations."));
+ return;
+ }
+
applySettings(config, settings.monitors);
}
--- a/lxqt-config-monitor/managesavedsettings.h
+++ b/lxqt-config-monitor/managesavedsettings.h
@@ -41,7 +41,7 @@ public slots:
*/
void loadSettings();
- void showSelectedConfig(QListWidgetItem * item);
+ void showSelectedConfig();
void onDeleteItem();
--- a/lxqt-config-monitor/managesavedsettings.ui
+++ b/lxqt-config-monitor/managesavedsettings.ui
@@ -46,13 +46,6 @@
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="applyPushButton">
- <property name="text">
- <string>Apply</string>
- </property>
- </widget>
- </item>
</layout>
</item>
<item row="0" column="1">
--- a/lxqt-config-monitor/settingsdialog.cpp
+++ b/lxqt-config-monitor/settingsdialog.cpp
@@ -31,4 +31,10 @@ SettingsDialog::SettingsDialog(const QSt
ManageSavedSettings * savedSettings = new ManageSavedSettings(settings, config, this);
addPage(savedSettings, QObject::tr("Manage Saved Settings"), QStringLiteral("system-run"));
+
+ connect(this, &LXQt::ConfigDialog::clicked, [=] (QDialogButtonBox::StandardButton button) {
+ if(button == QDialogButtonBox::Apply) {
+ savedSettings->onApplyItem();
+ }
+ });
}

@ -1,803 +0,0 @@
Description: Reorder XML .ui files to correct tab orders
Author: isf63 <121320947+isf63@users.noreply.github.com>
Origin: upstream, https://github.com/lxqt/lxqt-config/pull/950
Applied-Upstream: b386674a2ab8fac75b5e0aed2bd2923de1ad16d2
Last-Update: 2023-12-22
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/liblxqt-config-cursor/selectwnd.ui
+++ b/liblxqt-config-cursor/selectwnd.ui
@@ -14,16 +14,19 @@
<string>LXQt Mouse Theme Configuration</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="5" column="3">
- <widget class="QPushButton" name="btInstall">
- <property name="enabled">
- <bool>false</bool>
- </property>
+ <item row="0" column="0" colspan="6">
+ <widget class="QLabel" name="infoLabel">
<property name="text">
- <string>&amp;Install New Theme...</string>
+ <string>Select the cursor theme you want to use (hover preview to test cursor). &lt;b&gt;LXQt session needs restart after this change&lt;/b&gt;:</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
</widget>
</item>
+ <item row="1" column="0" colspan="6">
+ <widget class="WarningLabel" name="warningLabel" native="true"/>
+ </item>
<item row="2" column="0" colspan="6">
<widget class="PreviewWidget" name="preview" native="true">
<property name="sizePolicy">
@@ -40,16 +43,6 @@
</property>
</widget>
</item>
- <item row="0" column="0" colspan="6">
- <widget class="QLabel" name="infoLabel">
- <property name="text">
- <string>Select the cursor theme you want to use (hover preview to test cursor). &lt;b&gt;LXQt session needs restart after this change&lt;/b&gt;:</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
<item row="3" column="0" colspan="6">
<widget class="QListView" name="lbThemes">
<property name="editTriggers">
@@ -66,6 +59,13 @@
</property>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="sizeLabel">
+ <property name="text">
+ <string>Size</string>
+ </property>
+ </widget>
+ </item>
<item row="5" column="1">
<widget class="QSpinBox" name="cursorSizeSpinBox">
<property name="toolTip">
@@ -82,16 +82,6 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="6">
- <widget class="WarningLabel" name="warningLabel" native="true"/>
- </item>
- <item row="5" column="4">
- <widget class="QPushButton" name="btRemove">
- <property name="text">
- <string>&amp;Remove Theme</string>
- </property>
- </widget>
- </item>
<item row="5" column="2">
<spacer>
<property name="orientation">
@@ -105,10 +95,20 @@
</property>
</spacer>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="sizeLabel">
+ <item row="5" column="3">
+ <widget class="QPushButton" name="btInstall">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
- <string>Size</string>
+ <string>&amp;Install New Theme...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="4">
+ <widget class="QPushButton" name="btRemove">
+ <property name="text">
+ <string>&amp;Remove Theme</string>
</property>
</widget>
</item>
@@ -127,11 +127,6 @@
<container>1</container>
</customwidget>
</customwidgets>
- <tabstops>
- <tabstop>lbThemes</tabstop>
- <tabstop>btInstall</tabstop>
- <tabstop>btRemove</tabstop>
- </tabstops>
<resources/>
<connections/>
</ui>
--- a/lxqt-config-appearance/fontsconfig.ui
+++ b/lxqt-config-appearance/fontsconfig.ui
@@ -47,20 +47,6 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Point size:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="fontSize">
- <property name="minimum">
- <number>4</number>
- </property>
- </widget>
- </item>
<item row="1" column="1">
<widget class="QComboBox" name="fontStyle">
<item>
@@ -85,6 +71,20 @@
</item>
</widget>
</item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Point size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="fontSize">
+ <property name="minimum">
+ <number>4</number>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -101,15 +101,15 @@
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_3">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_4">
<property name="text">
- <string>Font hinting style:</string>
+ <string>Subpixel antialiasing:</string>
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QComboBox" name="hintStyle">
+ <item row="1" column="1">
+ <widget class="QComboBox" name="subpixel">
<property name="enabled">
<bool>false</bool>
</property>
@@ -120,17 +120,22 @@
</item>
<item>
<property name="text">
- <string>Slight</string>
+ <string>RGB</string>
</property>
</item>
<item>
<property name="text">
- <string>Medium</string>
+ <string>BGR</string>
</property>
</item>
<item>
<property name="text">
- <string>Full</string>
+ <string>VRGB</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>VBGR</string>
</property>
</item>
</widget>
@@ -142,39 +147,15 @@
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Resolution (DPI):</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0" colspan="2">
- <widget class="QCheckBox" name="autohint">
- <property name="text">
- <string>Autohint</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QSpinBox" name="dpi">
- <property name="minimum">
- <number>-1</number>
- </property>
- <property name="maximum">
- <number>1048576</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_4">
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_3">
<property name="text">
- <string>Subpixel antialiasing:</string>
+ <string>Font hinting style:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QComboBox" name="subpixel">
+ <item row="3" column="1">
+ <widget class="QComboBox" name="hintStyle">
<property name="enabled">
<bool>false</bool>
</property>
@@ -185,26 +166,45 @@
</item>
<item>
<property name="text">
- <string>RGB</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>BGR</string>
+ <string>Slight</string>
</property>
</item>
<item>
<property name="text">
- <string>VRGB</string>
+ <string>Medium</string>
</property>
</item>
<item>
<property name="text">
- <string>VBGR</string>
+ <string>Full</string>
</property>
</item>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Resolution (DPI):</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QSpinBox" name="dpi">
+ <property name="minimum">
+ <number>-1</number>
+ </property>
+ <property name="maximum">
+ <number>1048576</number>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="2">
+ <widget class="QCheckBox" name="autohint">
+ <property name="text">
+ <string>Autohint</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
--- a/lxqt-config-appearance/gtkconfig.ui
+++ b/lxqt-config-appearance/gtkconfig.ui
@@ -71,6 +71,16 @@
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QFormLayout" name="formLayout_2">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>GTK 2 Theme</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="gtk2ComboBox"/>
+ </item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
@@ -87,16 +97,6 @@
<item row="2" column="1">
<widget class="QComboBox" name="gtk3ComboBox"/>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>GTK 2 Theme</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="gtk2ComboBox"/>
- </item>
<item row="3" column="1">
<widget class="QLabel" name="uniformThemeLabel">
<property name="text">
--- a/lxqt-config-input/keyboardconfig.ui
+++ b/lxqt-config-input/keyboardconfig.ui
@@ -14,13 +14,6 @@
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
- <item row="2" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Cursor flash time:</string>
- </property>
- </widget>
- </item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
@@ -28,55 +21,23 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
- <widget class="QCheckBox" name="keyboardBeep">
- <property name="text">
- <string>Beep when there is an error of keyboard input</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="cursorFlashTime">
- <property name="suffix">
- <string> ms</string>
- </property>
- <property name="maximum">
- <number>10000</number>
- </property>
- </widget>
- </item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Character Repeat</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="6" column="0" colspan="4">
- <widget class="QLineEdit" name="lineEdit"/>
- </item>
- <item row="2" column="2">
- <widget class="QSlider" name="keyboardInterval">
- <property name="minimum">
- <number>10</number>
- </property>
- <property name="maximum">
- <number>210</number>
- </property>
- <property name="singleStep">
- <number>10</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::TicksAbove</enum>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Repeat delay:</string>
</property>
</widget>
</item>
- <item row="0" column="3">
- <widget class="QLabel" name="label_12">
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_10">
<property name="text">
- <string>Long</string>
+ <string>Short</string>
</property>
</widget>
</item>
@@ -102,17 +63,17 @@
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_7">
+ <item row="0" column="3">
+ <widget class="QLabel" name="label_12">
<property name="text">
- <string>Repeat delay:</string>
+ <string>Long</string>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLabel" name="label_10">
+ <item row="0" column="4">
+ <widget class="QLabel" name="label_16">
<property name="text">
- <string>Short</string>
+ <string>0</string>
</property>
</widget>
</item>
@@ -123,13 +84,6 @@
</property>
</widget>
</item>
- <item row="5" column="0" colspan="4">
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>Type in the following box to test your keyboard settings</string>
- </property>
- </widget>
- </item>
<item row="2" column="1">
<widget class="QLabel" name="label_11">
<property name="text">
@@ -137,6 +91,25 @@
</property>
</widget>
</item>
+ <item row="2" column="2">
+ <widget class="QSlider" name="keyboardInterval">
+ <property name="minimum">
+ <number>10</number>
+ </property>
+ <property name="maximum">
+ <number>210</number>
+ </property>
+ <property name="singleStep">
+ <number>10</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ </widget>
+ </item>
<item row="2" column="3">
<widget class="QLabel" name="label_13">
<property name="text">
@@ -144,23 +117,50 @@
</property>
</widget>
</item>
- <item row="0" column="4">
- <widget class="QLabel" name="label_16">
+ <item row="2" column="4">
+ <widget class="QLabel" name="label_17">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
- <item row="2" column="4">
- <widget class="QLabel" name="label_17">
+ <item row="3" column="0" colspan="4">
+ <widget class="QLabel" name="label_9">
<property name="text">
- <string>0</string>
+ <string>Type in the following box to test your keyboard settings</string>
</property>
</widget>
</item>
+ <item row="4" column="0" colspan="4">
+ <widget class="QLineEdit" name="lineEdit"/>
+ </item>
</layout>
</widget>
</item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Cursor flash time:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="cursorFlashTime">
+ <property name="suffix">
+ <string> ms</string>
+ </property>
+ <property name="maximum">
+ <number>10000</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2">
+ <widget class="QCheckBox" name="keyboardBeep">
+ <property name="text">
+ <string>Beep when there is an error of keyboard input</string>
+ </property>
+ </widget>
+ </item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="keyboardNumLock">
<property name="text">
--- a/lxqt-config-input/touchpadconfig.ui
+++ b/lxqt-config-input/touchpadconfig.ui
@@ -24,6 +24,13 @@
<item row="0" column="1">
<widget class="QComboBox" name="devicesComboBox"/>
</item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="deviceInfoLabel">
+ <property name="text">
+ <string>DeviceInfoLabel</string>
+ </property>
+ </widget>
+ </item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@@ -31,6 +38,22 @@
</property>
</widget>
</item>
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="accelSpeedDoubleSpinBox">
+ <property name="decimals">
+ <number>2</number>
+ </property>
+ <property name="minimum">
+ <double>-1.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
+ </item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="tappingEnabledCheckBox">
<property name="text">
@@ -52,22 +75,6 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QDoubleSpinBox" name="accelSpeedDoubleSpinBox">
- <property name="decimals">
- <number>2</number>
- </property>
- <property name="minimum">
- <double>-1.000000000000000</double>
- </property>
- <property name="maximum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
- </property>
- </widget>
- </item>
<item row="9" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
@@ -139,13 +146,6 @@
</item>
</layout>
</item>
- <item row="1" column="1">
- <widget class="QLabel" name="deviceInfoLabel">
- <property name="text">
- <string>DeviceInfoLabel</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<resources/>
--- a/lxqt-config-monitor/managesavedsettings.ui
+++ b/lxqt-config-monitor/managesavedsettings.ui
@@ -30,7 +30,14 @@
<item row="0" column="0">
<widget class="QListWidget" name="allConfigs"/>
</item>
- <item row="3" column="0">
+ <item row="0" column="1">
+ <widget class="QTextEdit" name="selectedSettingsTextEdit">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="renamePushButton">
@@ -48,13 +55,6 @@
</item>
</layout>
</item>
- <item row="0" column="1">
- <widget class="QTextEdit" name="selectedSettingsTextEdit">
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
--- a/lxqt-config-monitor/monitorwidget.ui
+++ b/lxqt-config-monitor/monitorwidget.ui
@@ -21,7 +21,42 @@
<string>Setup</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
- <item row="7" column="0" colspan="2">
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="enabledCheckbox">
+ <property name="text">
+ <string>Enable this display</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="resolutionLabel">
+ <property name="text">
+ <string>Resolution:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="resolutionCombo"/>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QComboBox" name="behaviorCombo">
+ <item>
+ <property name="text">
+ <string>This is my primary display</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>This screen extends another display</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="xyPosLayout">
<item>
<widget class="QSpinBox" name="xPosSpinBox">
@@ -70,42 +105,7 @@
</item>
</layout>
</item>
- <item row="1" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="resolutionLabel">
- <property name="text">
- <string>Resolution:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="resolutionCombo"/>
- </item>
- </layout>
- </item>
- <item row="0" column="0" colspan="2">
- <widget class="QCheckBox" name="enabledCheckbox">
- <property name="text">
- <string>Enable this display</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QComboBox" name="behaviorCombo">
- <item>
- <property name="text">
- <string>This is my primary display</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>This screen extends another display</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="8" column="0" colspan="2">
+ <item row="4" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -127,26 +127,6 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_2">
- <item row="3" column="0" colspan="2">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="rateLabel">
- <property name="text">
- <string>Refresh rate:</string>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="orientationLabel">
<property name="text">
@@ -157,6 +137,13 @@
<item row="0" column="1">
<widget class="QComboBox" name="orientationCombo"/>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="rateLabel">
+ <property name="text">
+ <string>Refresh rate:</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="1">
<widget class="QComboBox" name="rateCombo">
<property name="sizePolicy">
@@ -167,6 +154,19 @@
</property>
</widget>
</item>
+ <item row="3" column="0" colspan="2">
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
</layout>

@ -1,2 +0,0 @@
improve-ui-lxqt-config-monitor.patch
reorder-xml-ui-files.patch

25
debian/rules vendored

@ -2,16 +2,31 @@
# export DH_VERBOSE=1
export LC_ALL=C.UTF-8
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
include /usr/share/dpkg/architecture.mk
ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
CONF_FLAGS += -DWITH_TOUCHPAD=NO
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
CONF_FLAGS += -DWITH_TOUCHPAD=NO
endif
%:
dh ${@} --buildsystem cmake
override_dh_auto_configure:
dh_auto_configure -- \
-DPULL_TRANSLATIONS=OFF \
-DUPDATE_TRANSLATIONS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
override_dh_missing:
dh_missing --fail-missing
override_dh_makeshlibs:
dh_makeshlibs -Xlxqt-config
override_dh_auto_configure:
dh_auto_configure -- \
-DUPDATE_TRANSLATIONS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
$(CONF_FLAGS)

@ -0,0 +1,12 @@
# For more information on what jobs are run see:
# https://salsa.debian.org/salsa-ci-team/pipeline
#
# To enable the jobs, go to your repository (at salsa.debian.org)
# and click over Settings > CI/CD > Expand (in General pipelines).
# In "Custom CI config path" write debian/salsa-ci.yml and click
# in "Save Changes". The CI tests will run after the next commit.
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml

@ -1,5 +1,7 @@
Name: lxqt-config
Bug-Database: https://github.com/lxqt/lxqt-config/issues
Bug-Submit: https://github.com/lxqt/lxqt-config/issues/new
Changelog: https://github.com/lxqt/lxqt-config/blob/master/CHANGELOG
Repository: https://github.com/lxqt/lxqt-config.git
Repository-Browse: https://github.com/lxqt/lxqt-config
Repository: https://github.com/lxqt/lxqt-config
Repository-Browser: https://github.com/lxqt/lxqt-config

@ -1,52 +1,102 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
sw==
=gSIv
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy
ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E
C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95
zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1
d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8
Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6
Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L
o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP
6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed
8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC
xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB
tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4
wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf
41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf
Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr
luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ
L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d
2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq
nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7
96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t
jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p
qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH
Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW
e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0
omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94
sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE
T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp
uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB
vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy
qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx
q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl
TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt
Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX
asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201
Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA
CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ
zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ
ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06
d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd
6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK
m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f
3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS
waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL
ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY
WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91
1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk=
=h7ww
-----END PGP PUBLIC KEY BLOCK-----
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
sw==
=gSIv
-----END PGP PUBLIC KEY BLOCK-----

6
debian/watch vendored

@ -1,5 +1,3 @@
version=4
opts="searchmode=plain, \
pgpsigurlmangle=s/$/.asc/, \
uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
opts="pgpsigurlmangle=s/$/.asc/" \
https://github.com/lxqt/lxqt-config/releases .*/lxqt-config-([\d\.]+).tar.xz

Loading…
Cancel
Save