Upload to Plucky

debian/changelog

@@ -1,8 +1,25 @@
-lxqt-config (1.4.0-0ubuntu2~ppa22.04.1) jammy; urgency=medium
+lxqt-config (2.1.0-0ubuntu1) plucky; urgency=medium
 
-  * Backport to Jammy.
+  * New upstream release.
+    - Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:32 -0600
+
+lxqt-config (2.0.0-0ubuntu2) oracular; urgency=medium
+
+  * Fix libkscreen build dep package name.
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 27 Aug 2024 11:33:02 +0100
+
+lxqt-config (2.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Remove obsolete patches.
+  * Adjust build dependencies.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 22 Dec 2023 16:16:22 -0600
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:41:23 -0500
 
 lxqt-config (1.4.0-0ubuntu2) noble; urgency=medium
 

debian/control

@@ -1,29 +1,28 @@
 Source: lxqt-config
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               libkf5screen-dev,
+               libkf6windowsystem-dev (>= 6.0.0),
-               libkf5windowsystem-dev,
+               libkscreen-dev (>= 6.0.0),
-               liblxqt1-dev (>= 1.4.0),
+               liblxqt2-dev (>= 2.1.0),
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
                libxcb-randr0-dev,
                libxcursor-dev,
                libxfixes-dev,
                libxi-dev,
-               lxqt-menu-data (>= 1.4.0),
+               lxqt-menu-data (>= 2.1.0),
-               qtbase5-private-dev,
+               qt6-base-private-dev (>= 6.6.0),
+               qt6-svg-dev (>= 6.6.0),
                xserver-xorg-input-libinput-dev,
                zlib1g-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 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
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-config
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-config.git
 Rules-Requires-Root: no
 Homepage: https://github.com/lxqt/lxqt-config
 
@@ -45,7 +44,6 @@ Suggests: adwaita-qt,
           lxappearance,
           lxqt | lxqt-core,
           obconf-qt,
-          qt5-style-plugins,
           synaptic
 Description: LXQt system settings center
  The LXQt system settings center
@@ -56,6 +54,8 @@ Package: lxqt-config-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-l10n, ${misc:Depends}
 Description: Language package for lxqt-config
+ The LXQt system settings center
+ .
  This package contains the l10n files needed by lxqt-config.

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-config
 Source: https://github.com/lxqt/lxqt-config
 
 Files: *
-Copyright: 2012-2023, LXQt team
+Copyright: 2012-2024, LXQt team
            2010-2012, Razor team
            2013, Christian Surlykke
            2014, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
@@ -123,7 +123,7 @@ License: LGPL-2.0+
 Files: debian/*
 Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
            2015      Andrew Lee (李健秋) <ajqlee@debian.org>
-           2023      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2023-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 License: LGPL-2.1+
 
 License: LGPL-2.0+

debian/lxqt-config.lintian-overrides

@@ -0,0 +1,4 @@
+# This is expected
+lxqt-config: desktop-entry-lacks-keywords-entry [usr/share/applications/*.desktop]
+lxqt-config: desktop-entry-invalid-category LXQt [usr/share/applications/*.desktop]
+lxqt-config: no-manual-page [usr/bin/*]

debian/patches/0001-revert-kscreen-fix.patch

@@ -1,73 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d2f842c..77f98c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,7 @@ set(CMAKE_AUTOUIC ON)
- set(CMAKE_AUTORCC ON)
- 
- set(KF5_MINIMUM_VERSION "5.36.0")
--set(KF5SCREEN_MINIMUM_VERSION "5.27.0")
-+set(KF5SCREEN_MINIMUM_VERSION "5.2.0")
- set(LXQT_MINIMUM_VERSION "1.4.0")
- set(QT_MINIMUM_VERSION "5.15.0")
- 
-diff --git a/lxqt-config-monitor/kscreenutils.cpp b/lxqt-config-monitor/kscreenutils.cpp
-index 6deee2a..be2634d 100644
---- a/lxqt-config-monitor/kscreenutils.cpp
-+++ b/lxqt-config-monitor/kscreenutils.cpp
-@@ -63,9 +63,9 @@ void KScreenUtils::extended(KScreen::ConfigPtr &config)
-         output->setPos(pos);
-         output->setEnabled(true);
-         //first left one as primary
--        output->setPriority(width == 0 ? 1 : 0);
-+        output->setPrimary(width == 0);
-         KScreen::ModePtr mode(output->currentMode());
--        //if (!mode)
-+        //if (!mode) 
-         {
-             // Set the biggest mode between preferred modes and the first mode.
-             mode = output->modes().first();
-@@ -83,7 +83,7 @@ void KScreenUtils::extended(KScreen::ConfigPtr &config)
-             if (mode)
-                 output->setCurrentModeId(mode->id());
-         }
--        if (mode)
-+        if (mode) 
-             width += mode->size().width();
-     }
- }
-diff --git a/lxqt-config-monitor/loadsettings.cpp b/lxqt-config-monitor/loadsettings.cpp
-index 26d669a..284cad0 100644
---- a/lxqt-config-monitor/loadsettings.cpp
-+++ b/lxqt-config-monitor/loadsettings.cpp
-@@ -133,7 +133,7 @@ bool applySettings(KScreen::ConfigPtr config, QList<MonitorSettings> monitors)
-                 if( !output->isConnected() )
-                     continue;
-                 output->setEnabled( monitor.enabled );
--                output->setPriority( monitor.primary ? 1 : 0 );
-+                output->setPrimary( monitor.primary );
-                 output->setPos( QPoint(monitor.xPos, monitor.yPos) );
-                 output->setRotation( (KScreen::Output::Rotation)(monitor.rotation) );
-                 // output->setCurrentModeId could fail. KScreen sometimes changes mode Id.
-diff --git a/lxqt-config-monitor/monitorwidget.cpp b/lxqt-config-monitor/monitorwidget.cpp
-index b4b7fb9..41883c2 100644
---- a/lxqt-config-monitor/monitorwidget.cpp
-+++ b/lxqt-config-monitor/monitorwidget.cpp
-@@ -138,7 +138,7 @@ MonitorWidget::MonitorWidget(KScreen::OutputPtr output, KScreen::ConfigPtr confi
-     if (config->connectedOutputs().count() == 1) {
-         setOnlyMonitor(true);
-         // There isn't always a primary output. Gross.
--        output->setPriority(1);
-+        output->setPrimary(true);
-     }
- 
-     ui.xPosSpinBox->setValue(output->pos().x());
-@@ -208,7 +208,7 @@ void MonitorWidget::onBehaviorChanged(int idx)
-     ui.xPosSpinBox->setVisible(idx == ExtendDisplay);
-     ui.yPosSpinBox->setVisible(idx == ExtendDisplay);
- 
--    output->setPriority(idx == PrimaryDisplay ? 1 : 0);
-+    output->setPrimary(idx == PrimaryDisplay);
-     if(idx == PrimaryDisplay)
-         emit primaryOutputChanged(this);
- }

debian/patches/improve-ui-lxqt-config-monitor.patch

@@ -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();
-+        }
-+    });
- }

debian/patches/reorder-xml-ui-files.patch

@@ -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>

debian/patches/series

@@ -1,3 +0,0 @@
-0001-revert-kscreen-fix.patch
-improve-ui-lxqt-config-monitor.patch
-reorder-xml-ui-files.patch

debian/source/lintian-overrides

@@ -0,0 +1,2 @@
+# Translation files may be long
+lxqt-config source: very-long-line-length-in-source-file * > 512 [*.ts:*]