From cc34c12726272ff9f54df449ce6d1faa9606430f Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Mon, 10 Aug 2015 12:08:24 +0200
Subject: [PATCH] * src/etc/xdg/lubuntu/menus/ &
 src/etc/xdg/lxsession/QLubuntu/desktop.conf  - Add a specific layout for
 qlubuntu session.

---
 debian/changelog                              |   2 +
 debian/lubuntu-extra-sessions.install         |   2 +
 .../lxqt-settings.directory                   |   5 +
 .../xdg/lubuntu/menus/lxqt-applications.menu  | 231 ++++++++++++++++++
 src/etc/xdg/lxsession/QLubuntu/desktop.conf   |   2 +-
 5 files changed, 241 insertions(+), 1 deletion(-)
 create mode 100644 src/etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory
 create mode 100644 src/etc/xdg/lubuntu/menus/lxqt-applications.menu

diff --git a/debian/changelog b/debian/changelog
index d587217..f620d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ lubuntu-default-settings (0.43) UNRELEASED; urgency=medium
    - Depends on sddm for the qlubuntu session.
   * debian/lubuntu-default-settings.dirs:
    - Create /etc/lightdm if not exist.
+  * src/etc/xdg/lubuntu/menus/ & src/etc/xdg/lxsession/QLubuntu/desktop.conf
+   - Add a specific layout for qlubuntu session.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Sun, 17 May 2015 15:07:48 +0200
 
diff --git a/debian/lubuntu-extra-sessions.install b/debian/lubuntu-extra-sessions.install
index 6a17fb2..9e2b9d9 100644
--- a/debian/lubuntu-extra-sessions.install
+++ b/debian/lubuntu-extra-sessions.install
@@ -1,4 +1,6 @@
+etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory
 etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu
+etc/xdg/lubuntu/menus/lxqt-applications.menu
 etc/xdg/lxsession/Lubuntu-Nexus7/
 etc/xdg/lxsession/LX-Games/
 etc/xdg/lxsession/QLubuntu/
diff --git a/src/etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory b/src/etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory
new file mode 100644
index 0000000..5dcf6d4
--- /dev/null
+++ b/src/etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=LXQt
+Icon=preferences-system
diff --git a/src/etc/xdg/lubuntu/menus/lxqt-applications.menu b/src/etc/xdg/lubuntu/menus/lxqt-applications.menu
new file mode 100644
index 0000000..1476e06
--- /dev/null
+++ b/src/etc/xdg/lubuntu/menus/lxqt-applications.menu
@@ -0,0 +1,231 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+	<Name>Applications</Name>
+	<Directory>lxde-menu-applications.directory</Directory>
+
+	<!-- Read standard .directory and .desktop file locations -->
+	<DefaultAppDirs/>
+	<DefaultDirectoryDirs/>
+
+	<!-- Read in overrides and child menus from applications-merged/ -->
+	<DefaultMergeDirs/>
+
+	<!-- Accessories submenu -->
+	<Menu>
+		<Name>Accessories</Name>
+		<Directory>lxde-utility.directory</Directory>
+		<Include>
+			<And>
+				<Category>Utility</Category>
+	<!-- Accessibility spec must have either the Utility or Settings
+			 category, and we display an accessibility submenu already for
+			 the ones that do not have Settings, so don't display accessibility
+			 applications here -->
+				<Not><Category>Accessibility</Category></Not>
+				<Not><Category>System</Category></Not>
+			</And>
+		</Include>
+	</Menu> <!-- End Accessories -->
+
+	<!-- Accessibility submenu -->
+	<Menu>
+		<Name>Universal Access</Name>
+		<Directory>lxde-utility-accessibility.directory</Directory>
+		<Include>
+			<And>
+				<Category>Accessibility</Category>
+				<Not><Category>Settings</Category></Not>
+			</And>
+		</Include>
+	</Menu> <!-- End Accessibility -->
+
+	<!-- Development Tools -->
+	<Menu>
+		<Name>Development</Name>
+		<Directory>lxde-development.directory</Directory>
+		<Include>
+			<And>
+				<Category>Development</Category>
+			</And>
+			<Filename>emacs.desktop</Filename>
+		</Include>
+	</Menu> <!-- End Development Tools -->
+
+	<!-- Education -->
+	<Menu>
+		<Name>Education</Name>
+		<Directory>lxde-education.directory</Directory>
+		<Include>
+			<And>
+				<Category>Education</Category>
+			</And>
+		</Include>
+	</Menu> <!-- End Education -->
+
+	<!-- Games -->
+	<Menu>
+		<Name>Games</Name>
+		<Directory>lxde-game.directory</Directory>
+		<Include>
+			<And>
+				<Category>Game</Category>
+			</And>
+		</Include>
+	</Menu> <!-- End Games -->
+
+	<!-- Graphics -->
+	<Menu>
+		<Name>Graphics</Name>
+		<Directory>lxde-graphics.directory</Directory>
+		<Include>
+			<And>
+				<Category>Graphics</Category>
+				<Not><Category>Utility</Category></Not>
+			</And>
+		</Include>
+	</Menu> <!-- End Graphics -->
+
+	<!-- Internet -->
+	<Menu>
+		<Name>Internet</Name>
+		<Directory>lxde-network.directory</Directory>
+		<Include>
+			<And>
+				<Category>Network</Category>
+			</And>
+		</Include>
+	</Menu>	 <!-- End Internet -->
+
+	<!-- LXQt-About -->
+	<Menu>
+		<Name>LXQt-About</Name>
+		<Include>
+		<Filename>lxqt-about.desktop</Filename>
+		</Include>
+	</Menu> <!-- End LXQt-About -->
+
+	<!-- Multimedia -->
+	<Menu>
+		<Name>Multimedia</Name>
+		<Directory>lxde-audio-video.directory</Directory>
+		<Include>
+			<And>
+				<Category>AudioVideo</Category>
+			</And>
+		</Include>
+	</Menu>	 <!-- End Multimedia -->
+
+	<!-- Office -->
+	<Menu>
+		<Name>Office</Name>
+		<Directory>lxde-office.directory</Directory>
+		<Include>
+			<And>
+				<Category>Office</Category>
+			</And>
+		</Include>
+	</Menu> <!-- End Office -->
+
+	<!-- System Tools-->
+	<Menu>
+		<Name>System</Name>
+		<Directory>lxde-system-tools.directory</Directory>
+		<Include>
+			<And>
+				<Category>System</Category>
+				<Not><Category>Settings</Category></Not>
+				<Not><Category>PackageManager</Category></Not>
+			</And>
+		</Include>
+	</Menu>	 <!-- End System Tools -->
+
+	<!-- Other -->
+	<Menu>
+		<Name>Other</Name>
+		<Directory>lxde-other.directory</Directory>
+		<OnlyUnallocated/>
+		<Include>
+			<And>
+				<Not><Category>Core</Category></Not>
+				<Not><Category>Settings</Category></Not>
+				<Not><Category>Screensaver</Category></Not>
+			</And>
+		</Include>
+		</Menu> <!-- End Other -->
+
+	<Menu>
+		<Name>DesktopSettings</Name>
+		<Directory>lxde-settings.directory</Directory>
+		<Menu>
+			<Name>LXQtSettings</Name>
+			<Directory>lxqt-settings.directory</Directory>
+			<Include>
+				<And>
+					<Category>LXQt</Category>
+					<Or>
+						<Category>Settings</Category>
+						<Category>PackageManager</Category>
+					</Or>
+				</And>
+				<!-- Include some optional components here -->
+				<Filename>obconf-qt.desktop</Filename>
+				<Filename>compton-conf.desktop</Filename>
+				<Filename>pcmanfm-qt-desktop-pref.desktop</Filename>
+			</Include>
+			<Layout>
+				<Filename>lxqt-config.desktop</Filename>
+				<Separator/>
+				<Merge type="menus"/>
+				<Merge type="files"/>
+			</Layout>
+		</Menu>
+		<OnlyUnallocated/>
+		<Include>
+			<Or>
+				<Category>Settings</Category>
+				<Category>PackageManager</Category>
+			</Or>
+		</Include>
+		<Exclude>
+			<Or>
+				<Filename>lxqt-config.desktop</Filename>
+			</Or>
+		</Exclude>
+		<Layout>
+			<Merge type="menus"/>
+			<Merge type="files"/>
+		</Layout>
+	</Menu> <!-- End Settings -->
+
+		<!-- Leave -->
+	<Menu>
+		<Name>X-Leave</Name>
+		<Directory>lxqt-leave.directory</Directory>
+		<Include>
+		<Filename>lubuntu-logout.desktop</Filename>
+		</Include>
+	</Menu> <!-- End Leave -->
+
+	<!-- Screensaver -->
+	<Menu>
+		<Name>Screensaver</Name>
+		<Include>
+		<Filename>lxqt-lockscreen.desktop</Filename>
+		</Include>
+	</Menu> <!-- End Screensaver -->
+
+	<Layout>
+		<Merge type="files"/>
+		<Merge type="menus"/>
+		<Separator/>
+		<Menuname>DesktopSettings</Menuname>
+		<Menuname show_empty="false" inline="true">LXQt-About</Menuname>
+		<Separator/>
+		<Menuname show_empty="false">X-Leave</Menuname>
+		<Menuname show_empty="false" inline="true">Screensaver</Menuname>
+	</Layout>
+
+</Menu> <!-- End Applications -->
diff --git a/src/etc/xdg/lxsession/QLubuntu/desktop.conf b/src/etc/xdg/lxsession/QLubuntu/desktop.conf
index a4296ef..25c2393 100644
--- a/src/etc/xdg/lxsession/QLubuntu/desktop.conf
+++ b/src/etc/xdg/lxsession/QLubuntu/desktop.conf
@@ -86,7 +86,7 @@ activate=true
 
 [Environment]
 type=lubuntu
-menu_prefix=lxde-
+menu_prefix=lxqt-
 
 [GTK]
 sNet/ThemeName=Lubuntu-default