From de09a2a3e53f93775883250d487904d7dd568ab2 Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Thu, 11 Apr 2024 20:46:08 +0000 Subject: [PATCH] Limited desktops to 1 and removed switcher from panel --- CMakeLists.txt | 10 +- debian/changelog | 7 + panel.conf | 42 ++ rc.xml | 750 +++++++++++++++++++++++++++++++++ scripts/start-lubuntu-live-env | 2 +- 5 files changed, 806 insertions(+), 5 deletions(-) create mode 100644 panel.conf create mode 100644 rc.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 54a55bd..c9dd866 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_INSTALL_PREFIX "/usr") +set(CMAKE_INSTALL_PREFIX "/") find_package(ECM REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -62,9 +62,11 @@ install(TARGETS lubuntu-installer-prompt LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -install(PROGRAMS "scripts/change-system-language" DESTINATION libexec) -install(PROGRAMS "scripts/start-lubuntu-live-env" DESTINATION libexec) -install(FILES "lubuntu-live-environment.desktop" DESTINATION share/xsessions) +install(PROGRAMS "scripts/change-system-language" DESTINATION usr/libexec) +install(PROGRAMS "scripts/start-lubuntu-live-env" DESTINATION usr/libexec) +install(FILES "lubuntu-live-environment.desktop" DESTINATION usr/share/xsessions) +install(FILES "rc.xml" DESTINATION etc/xdg/xdg-lubuntu-live-environment/openbox) +install(FILES "panel.conf" DESTINATION etc/xdg/xdg-lubuntu-live-environment/lxqt) if(QT_VERSION_MAJOR EQUAL 6) qt_finalize_executable(lubuntu-installer-prompt) diff --git a/debian/changelog b/debian/changelog index 4060617..d8c7262 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lubuntu-installer-prompt (24.04.5) noble; urgency=medium + + * Reduce desktops to 1 to prevent accidental switching. (LP: #1469362) + * Remove desktop switcher from panel for a cleaner look. + + -- Walter Lapchynski Wed, 10 Apr 2024 23:08:27 +0000 + lubuntu-installer-prompt (24.04.4) noble; urgency=medium * Fix a race condition where a wired network connection could hang the diff --git a/panel.conf b/panel.conf new file mode 100644 index 0000000..191af63 --- /dev/null +++ b/panel.conf @@ -0,0 +1,42 @@ +panels=panel1 + +[panel1] +plugins=mainmenu, quicklaunch, showdesktop, taskbar, mount, volume, tray, statusnotifier, worldclock +position=Bottom +desktop=0 + +[mainmenu] +type=mainmenu +filterClear=true + +[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 +alignment=Left + +[taskbar] +type=taskbar +buttonWidth=200 + +[tray] +type=tray + +[mount] +type=mount + +[worldclock] +type=worldclock + +[volume] +device=0 +type=volume + +[showdesktop] +alignment=Right +type=showdesktop + +[statusnotifier] +alignment=Right +type=statusnotifier diff --git a/rc.xml b/rc.xml new file mode 100644 index 0000000..b6b0d0f --- /dev/null +++ b/rc.xml @@ -0,0 +1,750 @@ + + + + + + + + 10 + 20 + + + + yes + + no + + yes + + no + + 200 + + no + + + + + + Smart + +
yes
+ + Mouse + + Mouse + +
+ + + + Lubuntu Arc + NLIMC + + yes + yes + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu + 11 + + normal + + normal + + + + Ubuntu + 11 + + normal + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + + + + + 1 + 1 + + + + 875 + + + + + + no + Nonpixel + + Center + + + + + 10 + + 10 + + + + + + + 0 + 0 + 0 + 0 + + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + + C-g + + + + leftno + + + rightno + + + upno + + + downno + + + leftno + + + rightno + + + upno + + + downno + + + + + + + + + + + + + client-menu + + + + + + + + + + + yes + + + + + + + + + + yes + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + + + + + + + + + 8 + + 200 + + 400 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + next + + + previous + + + next + + + previous + + + next + + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + top + + + + + + left + + + + + + right + + + + + + bottom + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + horizontal + + + + + + + + + + + + + + + + + previous + + + next + + + + previous + + + next + + + previous + + + next + + + + + + + + + + + + + + + + client-list-combined-menu + + + root-menu + + + + + + previous + + + next + + + previous + + + next + + + + + + + + /usr/share/lubuntu/openbox/menu.xml + + menu.xml + + 200 + + no + + 100 + + 400 + + yes + + yes + + yes + + + + + + + + + + + yes + + + + +
diff --git a/scripts/start-lubuntu-live-env b/scripts/start-lubuntu-live-env index fa2b586..0dbe38a 100755 --- a/scripts/start-lubuntu-live-env +++ b/scripts/start-lubuntu-live-env @@ -2,7 +2,7 @@ # Starts the Lubuntu Live Environment. # This is pretty overkill, but don't remove anything without testing -export XDG_CONFIG_DIRS="/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS +export XDG_CONFIG_DIRS="/etc/xdg/xdg-lubuntu-live-environment:/etc/xdg/xdg-Lubuntu:"$XDG_CONFIG_DIRS export XDG_DATA_DIRS="/usr/share/Lubuntu:"$XDG_DATA_DIRS export XDG_SESSION_CLASS="user" export XDG_SESSION_DESKTOP="Lubuntu"