14 changed files with 9 additions and 134 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,69 +1,3 @@
-lubuntu-default-settings (25.04.12) plucky; urgency=medium
-
-  * Change menu file to -compact to improve preferences display. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Sun, 23 Mar 2025 01:11:36 +0000
-
-lubuntu-default-settings (25.04.11) plucky; urgency=medium
-
-  * Rename LXQt Modules to match those being superceded (LP: #2103824) 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 21 Mar 2025 18:42:31 +0000
-
-lubuntu-default-settings (25.04.10) plucky; urgency=medium
-
-  * Added Comment to Picom LXQt module so executable shown in tooltip. 
-  * Added LXQt Modules for the following (LP: #2059346):
-    * Bluetooth Manager (blueman)
-    * Lubuntu Update
-    * Clipboard Manager (qlipper)
-    * Screensaver (xscreensaver)
-    * Network Manager (nm-tray)
-    * Print Manager (print-applet)
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Sun, 16 Mar 2025 20:45:11 +0000
-
-lubuntu-default-settings (25.04.9) plucky; urgency=medium
-
-  * Create a LXQt module for Picom. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Tue, 11 Mar 2025 02:35:31 +0000
-
-lubuntu-default-settings (25.04.8) plucky; urgency=medium
-
-  * Add explicit configuration for SDDM. 
-  * Prohibit virtual keyboard on SDDM. (LP: #2091958)
-  * Add explicit configuration for Picom. (LP: #2100464)
-  * Remove Firefox from quicklaunch. 
-  * Add more sane defaults for fancymenu. 
-  * Populate favorites in fancymenu.
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Wed, 05 Mar 2025 02:54:39 +0000
-
-lubuntu-default-settings (25.04.7) plucky; urgency=medium
-
-  * Add a default Neochat configuration file, for future switching.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 17 Feb 2025 00:52:10 -0600
-
-lubuntu-default-settings (25.04.6) plucky; urgency=medium
-
-  * Update shortcuts for fancymenu change. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 14 Feb 2025 07:41:54 +0000
-
-lubuntu-default-settings (25.04.5) plucky; urgency=medium
-
-  * Replace mainmenu with fancymenu in panel.
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Wed, 12 Feb 2025 07:19:00 +0000
-
-lubuntu-default-settings (25.04.4) plucky; urgency=medium
-
-  * Tone down the foreground a bit. 
-
- -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 07 Feb 2025 09:17:45 +0000
-
 lubuntu-default-settings (25.04.3) plucky; urgency=medium

  * Spin off the Ubuntu color scheme into a Lubuntu color scheme and default
--- a/debian/install
+++ b/debian/install
@ -1,3 +1,3 @@
-src/etc/* /etc/
+src/etc/xdg /etc/
 src/usr/lib /usr
 src/usr/share /usr/
--- a/src/etc/sddm.conf.d/lubuntu_settings.conf
+++ b/src/etc/sddm.conf.d/lubuntu_settings.conf
@ -1,5 +0,0 @@
-[General]
-InputMethod=
-
-[Theme]
-Current=lubuntu
--- a/src/etc/xdg/xdg-Lubuntu/autostart/blueman.desktop
+++ b/src/etc/xdg/xdg-Lubuntu/autostart/blueman.desktop
@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Bluetooth Manager
-Comment=blueman-applet
-Exec=blueman-applet
-Type=Application
-X-LXQt-Module=true
--- a/src/etc/xdg/xdg-Lubuntu/autostart/lubuntu-update-autostart.desktop
+++ b/src/etc/xdg/xdg-Lubuntu/autostart/lubuntu-update-autostart.desktop
@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Lubuntu Update
-Comment=lubuntu-update
-Exec=/usr/bin/lubuntu-update
-Type=Application
-X-LXQt-Module=true
--- a/src/etc/xdg/xdg-Lubuntu/autostart/lxqt-qlipper-autostart.desktop
+++ b/src/etc/xdg/xdg-Lubuntu/autostart/lxqt-qlipper-autostart.desktop
@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Clipboard Manager
-Comment=qlipper
-Exec=qlipper
-Type=Application
-X-LXQt-Need-Tray=true
-X-LXQt-Module=true
--- a/src/etc/xdg/xdg-Lubuntu/autostart/lxqt-xscreensaver-autostart.desktop
+++ b/src/etc/xdg/xdg-Lubuntu/autostart/lxqt-xscreensaver-autostart.desktop
@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Screensaver
-Comment=xscreensaver
-Exec=xscreensaver -no-splash
-Type=Application
-X-LXQt-X11-Only=true
-X-LXQt-Module=true
--- a/src/etc/xdg/xdg-Lubuntu/autostart/nm-tray-autostart.desktop
+++ b/src/etc/xdg/xdg-Lubuntu/autostart/nm-tray-autostart.desktop
@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Network Manager
-Comment=nm-tray
-Exec=nm-tray
-Type=Application
-X-LXQt-Need-Tray=true
-X-LXQt-Module=true
--- a/src/etc/xdg/xdg-Lubuntu/autostart/picom.desktop
+++ b/src/etc/xdg/xdg-Lubuntu/autostart/picom.desktop
@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=X Compositor
-Comment=picom
-Exec=picom
-Type=Application
-X-LXQt-Module=true
--- a/src/etc/xdg/xdg-Lubuntu/autostart/print-applet.desktop
+++ b/src/etc/xdg/xdg-Lubuntu/autostart/print-applet.desktop
@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Print Manager
-Comment=system-config-printer-applet
-Exec=system-config-printer-applet
-Type=Application
-X-LXQt-Module=true
--- a/src/etc/xdg/xdg-Lubuntu/lxqt/globalkeyshortcuts.conf
+++ b/src/etc/xdg/xdg-Lubuntu/lxqt/globalkeyshortcuts.conf
@ -169,7 +169,7 @@ Exec=lxqt-config-brightness, -i
 [Super_L.32]
 Comment=Show/hide main menu
 Enabled=true
-path=/panel/fancymenu/show_hide
+path=/panel/mainmenu/show_hide

 [XF86AudioLowerVolume.33]
 Comment=Decrease sound volume
--- a/src/etc/xdg/xdg-Lubuntu/lxqt/panel.conf
+++ b/src/etc/xdg/xdg-Lubuntu/lxqt/panel.conf
@ -1,22 +1,13 @@
 panels=panel1

 [panel1]
-plugins=fancymenu, desktopswitch, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock
+plugins=mainmenu, desktopswitch, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock
 position=Bottom
 desktop=0

-[fancymenu]
-buttonsAtTop=false
-categoriesAtRight=false
-favorites\1\desktopFile=/usr/share/applications/featherpad.desktop
-favorites\2\desktopFile=/usr/share/applications/lubuntu-update.desktop
-favorites\3\desktopFile=/usr/share/applications/pcmanfm-qt.desktop
-favorites\4\desktopFile=/usr/share/applications/qterminal.desktop
-favorites\size=4
+[mainmenu]
+type=mainmenu
 filterClear=true
-menu_file=/etc/xdg/menus/lxqt-applications-compact.menu
-showText=false
-type=fancymenu

 [desktopswitch]
 type=desktopswitch
@ -24,7 +15,8 @@ type=desktopswitch
 [quicklaunch]
 type=quicklaunch
 apps\1\desktop=/usr/share/applications/pcmanfm-qt.desktop
-apps\size=1
+apps\2\desktop=/var/lib/snapd/desktop/applications/firefox_firefox.desktop
+apps\size=2
 alignment=Left

 [taskbar]
--- a/src/etc/xdg/xdg-Lubuntu/picom.conf
+++ b/src/etc/xdg/xdg-Lubuntu/picom.conf
@ -1 +0,0 @@
-backend = "xrender";
--- a/src/usr/share/qtermwidget6/color-schemes/Lubuntu.colorscheme
+++ b/src/usr/share/qtermwidget6/color-schemes/Lubuntu.colorscheme
@ -61,7 +61,7 @@ Color=211,215,207
 Color=238,238,236

 [Foreground]
-Color=195,195,195
+Color=238,238,236

 [ForegroundIntense]
-Color=255,255,255
+Color=238,238,236