Compare commits

...

23 Commits

Author SHA1 Message Date
9e967e1044 change to -compact menu file 2025-03-23 01:13:46 +00:00
eed680a9ed update changelog 2025-03-21 18:44:09 +00:00
51b1a806c6 renamed LXQt modules to match those being superceded 2025-03-21 18:41:44 +00:00
00097cfb6f update changelog 2025-03-18 19:29:53 +00:00
5fa93a8309 add first run of LXQt modules (fixes Lubuntu/lubuntu#4) 2025-03-18 19:26:39 +00:00
f150c37d2e added Comment for Picom LXQt Module 2025-03-16 20:46:28 +00:00
cdbe9260fe add a LXQt module for Picom 2025-03-11 02:38:40 +00:00
c7debcb771 fixing version number 2025-03-06 00:38:29 +00:00
2494b6a11a prohbit virtual keyboard in sddm 2025-03-05 21:00:14 +00:00
fd04a6f29c populate favorites in fancymenu 2025-03-05 03:59:20 +00:00
fda7ff19db sane defaults for fancymenu 2025-03-05 03:14:31 +00:00
b7d3e4db4e remove Firefox from quicklaunch 2025-03-05 03:09:24 +00:00
82523675a9 Add Picom configuration 2025-03-05 03:00:17 +00:00
aba3bb2286 Add explicit SDDM configuration 2025-03-05 02:55:38 +00:00
403c4f691c Add a default Neochat configuration file, for future switching. 2025-02-17 00:52:14 -06:00
ebd67e9abc update shortcuts for fancymenu 2025-02-17 00:42:03 -06:00
38586aa720 now with more fancy 2025-02-13 08:13:17 +00:00
ba9e3b691f tone down foreground 2025-02-07 09:19:24 +00:00
Aaron Rainbolt
130f1a9820
Add Lubuntu terminal color scheme and set it as QTerminal default 2025-01-31 11:14:55 -06:00
8e83520d1a Upload to Plucky 2024-12-11 02:03:15 -06:00
ad24c0b1a5 Default to the Ubuntu color scheme for QTerminal. 2024-12-11 02:03:06 -06:00
81c743105d Release to Plucky 2024-10-22 19:47:38 -05:00
837a81b876 Remove snap-installation-monitor (LP: #2061318). 2024-10-22 19:47:18 -05:00
26 changed files with 227 additions and 152 deletions

View File

@ -1,16 +1,5 @@
#!/usr/bin/make -f
all: build install
build:
all:
make -C src/usr/share/xsessions/po/
rm -rf src/usr/share/xsessions/po/ src/usr/share/xsessions/*.in
cd snap-installation-monitor && cmake -DCMAKE_BUILD_TYPE=Release . && make
install:
mkdir -pv $(DESTDIR)/lubuntu-snap-installation-monitor/usr/libexec
mkdir -pv $(DESTDIR)/lubuntu-snap-installation-monitor/etc/xdg/autostart
mkdir -pv $(DESTDIR)/lubuntu-default-settings/
cp -a src/etc src/usr $(DESTDIR)/lubuntu-default-settings/.
cp -a snap-installation-monitor/snap-installation-monitor $(DESTDIR)/lubuntu-snap-installation-monitor/usr/libexec/.
cp -a snap-installation-monitor/snap-installation-monitor.desktop $(DESTDIR)/lubuntu-snap-installation-monitor/etc/xdg/autostart/.

86
debian/changelog vendored
View File

@ -1,3 +1,89 @@
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
to that.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Fri, 31 Jan 2025 11:13:15 -0600
lubuntu-default-settings (25.04.2) plucky; urgency=medium
* Default to the Ubuntu color scheme for QTerminal.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 11 Dec 2024 02:03:08 -0600
lubuntu-default-settings (25.04.1) plucky; urgency=medium
* Welcome to Plucky Puffin!
* Remove snap-installation-monitor (LP: #2061318).
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 22 Oct 2024 19:47:26 -0500
lubuntu-default-settings (24.10.1) oracular; urgency=medium
[ Aaron Rainbolt ]

9
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
Build-Depends: cmake, debhelper-compat (= 13), intltool, qt6-base-dev
Build-Depends: debhelper-compat (= 13), intltool
Standards-Version: 4.7.0
Homepage: https://lubuntu.me
Vcs-Browser: https://git.launchpad.net/lubuntu-default-settings?h=master
@ -26,10 +26,3 @@ Recommends: breeze-gtk-theme,
Description: default settings for Lubuntu
Various system settings tailored for Lubuntu's default session. This includes
default settings, applications, and themes.
Package: lubuntu-snap-installation-monitor
Architecture: amd64
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Simple notifier for snap installation
Let the user know if snaps are still being installed in the background when
booting up their desktop environment.

19
debian/copyright vendored
View File

@ -21,22 +21,3 @@ License: GPL-2+
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: snap-installation-monitor/*
Copyright: Copyright 2024 Simon Quigley <tsimonq2@ubuntu.com>
License: GPL-3+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

3
debian/install vendored Normal file
View File

@ -0,0 +1,3 @@
src/etc/* /etc/
src/usr/lib /usr
src/usr/share /usr/

3
debian/lintian-overrides vendored Normal file
View File

@ -0,0 +1,3 @@
# These desktop files are not meant to be user-visible; ignore these flags
lubuntu-default-settings: desktop-entry-lacks-icon-entry [usr/share/xsessions/Lubuntu.desktop]
lubuntu-default-settings: desktop-entry-lacks-keywords-entry [usr/share/xsessions/Lubuntu.desktop]

View File

@ -1,3 +0,0 @@
lubuntu-default-settings/etc/xdg etc/
lubuntu-default-settings/usr/lib usr/
lubuntu-default-settings/usr/share usr/

View File

@ -1,3 +0,0 @@
# These desktop files are not meant to be user-visible; ignore these flags
lubuntu-default-settings: desktop-entry-lacks-icon-entry usr/share/xsessions/Lubuntu.desktop
lubuntu-default-settings: desktop-entry-lacks-keywords-entry usr/share/xsessions/Lubuntu.desktop

View File

@ -1,2 +0,0 @@
lubuntu-snap-installation-monitor/etc/xdg/autostart/snap-installation-monitor.desktop etc/xdg/autostart/
lubuntu-snap-installation-monitor/usr/libexec/snap-installation-monitor usr/libexec/

3
debian/rules vendored
View File

@ -1,6 +1,3 @@
#!/usr/bin/make -f
%:
dh $@
override_dh_auto_build:
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp

View File

@ -1,12 +0,0 @@
cmake_minimum_required(VERSION 3.5.0)
project(snap-installation-monitor)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
find_package(Qt6 COMPONENTS Widgets DBus REQUIRED)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_executable(snap-installation-monitor main.cpp)
target_link_libraries(snap-installation-monitor Qt6::Widgets Qt6::DBus)

View File

@ -1,76 +0,0 @@
// Copyright (C) 2024 Simon Quigley <tsimonq2@ubuntu.com>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
#include <QApplication>
#include <QSystemTrayIcon>
#include <QtDBus/QtDBus>
#include <QTimer>
int main(int argc, char *argv[]) {
QApplication app(argc, argv);
// Create and set application icon
QIcon appIcon = QIcon::fromTheme("dialog-information");
QApplication::setWindowIcon(appIcon);
// DBus interface to systemd
QDBusInterface systemd("org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager",
QDBusConnection::systemBus());
// Retrieve current status of snapd.seeded.service, which tracks the preseed process
QDBusMessage methodCall = systemd.call("GetUnit", "snapd.seeded.service");
QDBusObjectPath unitPath = methodCall.arguments().at(0).value<QDBusObjectPath>();
QDBusInterface unit("org.freedesktop.systemd1",
unitPath.path(),
"org.freedesktop.systemd1.Unit",
QDBusConnection::systemBus());
QVariant activeState = unit.property("ActiveState");
QVariant subState = unit.property("SubState");
// System tray icon setup
QSystemTrayIcon trayIcon(appIcon);
trayIcon.setToolTip("Snap Installation Monitor");
// Initial message displayed in the system tray
auto showMessage = [&trayIcon]() {
trayIcon.showMessage("Installation Notice", "Finalizing installation of snaps, please wait...",
QSystemTrayIcon::Information, 15000);
};
// If the user clicks the system tray icon, display the notification again
QObject::connect(&trayIcon, &QSystemTrayIcon::activated, [&](QSystemTrayIcon::ActivationReason reason) {
if (reason == QSystemTrayIcon::Trigger) {
showMessage();
}
});
// Exit immediately if the service is "active (exited)", launch the GUI parts otherwise
if (activeState.toString() == "active" && subState.toString() == "exited") { return 0; }
trayIcon.show();
showMessage();
QTimer timer;
QObject::connect(&timer, &QTimer::timeout, [&unit, &trayIcon]() {
QVariant newState = unit.property("ActiveState");
QVariant newSubState = unit.property("SubState");
if (newState.toString() == "active" && newSubState.toString() == "exited") {
trayIcon.hide();
QApplication::quit();
}
});
timer.start(5000); // Check every 5 seconds
return app.exec();
}

View File

@ -1,8 +0,0 @@
[Desktop Entry]
Type=Application
Name=Snap Installation Monitor
Exec=/usr/libexec/snap-installation-monitor
Icon=dialog-information
Comment=Monitor snapd seeding at startup
X-LXQt-Need-Tray=true
NoDisplay=true

View File

@ -0,0 +1,5 @@
[General]
InputMethod=
[Theme]
Current=lubuntu

View File

@ -0,0 +1,6 @@
[Desktop Entry]
Name=Bluetooth Manager
Comment=blueman-applet
Exec=blueman-applet
Type=Application
X-LXQt-Module=true

View File

@ -0,0 +1,6 @@
[Desktop Entry]
Name=Lubuntu Update
Comment=lubuntu-update
Exec=/usr/bin/lubuntu-update
Type=Application
X-LXQt-Module=true

View File

@ -0,0 +1,7 @@
[Desktop Entry]
Name=Clipboard Manager
Comment=qlipper
Exec=qlipper
Type=Application
X-LXQt-Need-Tray=true
X-LXQt-Module=true

View File

@ -0,0 +1,7 @@
[Desktop Entry]
Name=Screensaver
Comment=xscreensaver
Exec=xscreensaver -no-splash
Type=Application
X-LXQt-X11-Only=true
X-LXQt-Module=true

View File

@ -0,0 +1,7 @@
[Desktop Entry]
Name=Network Manager
Comment=nm-tray
Exec=nm-tray
Type=Application
X-LXQt-Need-Tray=true
X-LXQt-Module=true

View File

@ -0,0 +1,6 @@
[Desktop Entry]
Name=X Compositor
Comment=picom
Exec=picom
Type=Application
X-LXQt-Module=true

View File

@ -0,0 +1,6 @@
[Desktop Entry]
Name=Print Manager
Comment=system-config-printer-applet
Exec=system-config-printer-applet
Type=Application
X-LXQt-Module=true

View File

@ -169,7 +169,7 @@ Exec=lxqt-config-brightness, -i
[Super_L.32]
Comment=Show/hide main menu
Enabled=true
path=/panel/mainmenu/show_hide
path=/panel/fancymenu/show_hide
[XF86AudioLowerVolume.33]
Comment=Decrease sound volume

View File

@ -1,13 +1,22 @@
panels=panel1
[panel1]
plugins=mainmenu, desktopswitch, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock
plugins=fancymenu, desktopswitch, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock
position=Bottom
desktop=0
[mainmenu]
type=mainmenu
[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
filterClear=true
menu_file=/etc/xdg/menus/lxqt-applications-compact.menu
showText=false
type=fancymenu
[desktopswitch]
type=desktopswitch
@ -15,8 +24,7 @@ type=desktopswitch
[quicklaunch]
type=quicklaunch
apps\1\desktop=/usr/share/applications/pcmanfm-qt.desktop
apps\2\desktop=/var/lib/snapd/desktop/applications/firefox_firefox.desktop
apps\size=2
apps\size=1
alignment=Left
[taskbar]

View File

@ -0,0 +1 @@
backend = "xrender";

View File

@ -4,6 +4,7 @@ FixedTabWidth=false
HideTabBarWithOnlyOneTab=true
fontFamily=Ubuntu Mono
fontSize=14
colorScheme=Lubuntu
[MainWindow]
size=@Size(800 600)

View File

@ -0,0 +1,67 @@
[General]
Description=Lubuntu
Opacity=1
Wallpaper=
[Background]
Color=00,00,44
MaxRandomHue=0
MaxRandomSaturation=0
MaxRandomValue=0
[BackgroundIntense]
Color=48,10,36
[Color0]
Color=46,52,54
[Color0Intense]
Color=85,87,83
[Color1]
Color=204,0,0
[Color1Intense]
Color=239,41,41
[Color2]
Color=78,154,6
[Color2Intense]
Color=138,226,52
[Color3]
Color=196,160,0
[Color3Intense]
Color=252,233,79
[Color4]
Color=52,101,164
[Color4Intense]
Color=114,159,207
[Color5]
Color=117,80,123
[Color5Intense]
Color=173,127,168
[Color6]
Color=6,152,154
[Color6Intense]
Color=52,226,226
[Color7]
Color=211,215,207
[Color7Intense]
Color=238,238,236
[Foreground]
Color=195,195,195
[ForegroundIntense]
Color=255,255,255