[packages/applnk.git] / xfce-4.10.patch

diff -ur applnk-2.2.0/menus/applnk-applications.menu applnk-2.2.0-xfce/menus/applnk-applications.menu
--- applnk-2.2.0/menus/applnk-applications.menu	2011-02-22 11:20:34.000000000 +0100
+++ applnk-2.2.0-xfce/menus/applnk-applications.menu	2012-05-18 08:35:37.000000000 +0200
@@ -26,7 +26,7 @@
 	</Include>
 
 	<Layout>
-		<Filename>xfrun4.desktop</Filename>
+		<Filename>xfce4-run.desktop</Filename>
 		<Separator/>
 		<Filename>exo-terminal-emulator.desktop</Filename>
 		<Filename>exo-file-manager.desktop</Filename>
@@ -38,7 +38,6 @@
 		<Separator/>
 		<Menuname>Settings</Menuname>
 		<Separator/>
-		<Filename>xfhelp4.desktop</Filename>
 		<Filename>xfce4-about.desktop</Filename>
 		<Filename>xfce4-session-logout.desktop</Filename>
 	</Layout>
@@ -621,6 +620,7 @@
 			<Category>PackageManager</Category>
 			<Category>Printing</Category>
 			</Or>
+			<Not><Category>XFCE</Category></Not>
 			<Not><Category>X-XFCE</Category></Not>
 			<Not><Category>GNOME</Category></Not>
 			</And>
@@ -631,15 +631,71 @@
 			<Include>
 				<And>
 				<Category>Settings</Category>
+				<Or>
 				<Category>X-XFCE</Category>
+				<Category>XFCE</Category>
+				</Or>
+				<Not>
+				<Or>
+				<Category>X-XFCE-PersonalSettings</Category>
+				<Category>X-XFCE-HardwareSettings</Category>
+				<Category>X-XFCE-SystemSettings</Category>
+				</Or>
+				</Not>
 				</And>
 			</Include>
 			<Layout>
-				<Filename>xfce-settings-manager.desktop</Filename>
-				<Separator/>
-				<Merge type="menus"/>
-				<Merge type="files"/>
+				<Menuname>Personal</Menuname>
+				<Menuname>Hardware</Menuname>
+				<Menuname>System</Menuname>
+				<Merge type="all"/>
 			</Layout>
+			<Menu>
+				<Name>Personal</Name>
+				<Directory>xfce-personal.directory</Directory>
+				<Include>
+					<And>
+					<Category>Settings</Category>
+					<Or>
+					<Category>X-XFCE</Category>
+					<Category>XFCE</Category>
+					</Or>
+					<Category>X-XFCE-SettingsDialog</Category>
+					<Category>X-XFCE-PersonalSettings</Category>
+					</And>
+					<Filename>xscreensaver-properties.desktop</Filename>
+				</Include>
+			</Menu>
+			<Menu>
+				<Name>Hardware</Name>
+				<Directory>xfce-hardware.directory</Directory>
+				<Include>
+					<And>
+					<Category>Settings</Category>
+					<Or>
+					<Category>X-XFCE</Category>
+					<Category>XFCE</Category>
+					</Or>
+					<Category>X-XFCE-SettingsDialog</Category>
+					<Category>X-XFCE-HardwareSettings</Category>
+					</And>
+				</Include>
+			</Menu>
+			<Menu>
+				<Name>System</Name>
+				<Directory>xfce-system.directory</Directory>
+				<Include>
+					<And>
+					<Category>Settings</Category>
+					<Or>
+					<Category>X-XFCE</Category>
+					<Category>XFCE</Category>
+					</Or>
+					<Category>X-XFCE-SettingsDialog</Category>
+					<Category>X-XFCE-SystemSettings</Category>
+					</And>
+				</Include>
+			</Menu>
 		</Menu>
 		<Menu>
 			<Name>GNOME</Name>
Commit	Line	Data
9972c606 JR	1	diff -ur applnk-2.2.0/menus/applnk-applications.menu applnk-2.2.0-xfce/menus/applnk-applications.menu
	2	--- applnk-2.2.0/menus/applnk-applications.menu 2011-02-22 11:20:34.000000000 +0100
	3	+++ applnk-2.2.0-xfce/menus/applnk-applications.menu 2012-05-18 08:35:37.000000000 +0200
a2f7030c JR	4	@@ -26,7 +26,7 @@
	5	</Include>
	6
	7	<Layout>
	8	- <Filename>xfrun4.desktop</Filename>
	9	+ <Filename>xfce4-run.desktop</Filename>
	10	<Separator/>
	11	<Filename>exo-terminal-emulator.desktop</Filename>
	12	<Filename>exo-file-manager.desktop</Filename>
	13	@@ -38,7 +38,6 @@
	14	<Separator/>
	15	<Menuname>Settings</Menuname>
	16	<Separator/>
	17	- <Filename>xfhelp4.desktop</Filename>
	18	<Filename>xfce4-about.desktop</Filename>
	19	<Filename>xfce4-session-logout.desktop</Filename>
	20	</Layout>
	21	@@ -621,6 +620,7 @@
2996e4ed JR	22	<Category>PackageManager</Category>
	23	<Category>Printing</Category>
	24	</Or>
	25	+ <Not><Category>XFCE</Category></Not>
	26	<Not><Category>X-XFCE</Category></Not>
	27	<Not><Category>GNOME</Category></Not>
	28	</And>
9972c606 JR	29	@@ -631,15 +631,71 @@
9972c606 JR	30	<Include>
2996e4ed JR	31	<And>
2996e4ed JR	32	<Category>Settings</Category>
9972c606	33	+ <Or>
2996e4ed JR	34	<Category>X-XFCE</Category>
2996e4ed JR	35	+ <Category>XFCE</Category>
9972c606 JR	36	+ </Or>
	37	+ <Not>
	38	+ <Or>
	39	+ <Category>X-XFCE-PersonalSettings</Category>
	40	+ <Category>X-XFCE-HardwareSettings</Category>
	41	+ <Category>X-XFCE-SystemSettings</Category>
	42	+ </Or>
	43	+ </Not>
2996e4ed JR	44	</And>
	45	</Include>
	46	<Layout>
9972c606 JR	47	- <Filename>xfce-settings-manager.desktop</Filename>
	48	- <Separator/>
	49	- <Merge type="menus"/>
	50	- <Merge type="files"/>
	51	+ <Menuname>Personal</Menuname>
	52	+ <Menuname>Hardware</Menuname>
	53	+ <Menuname>System</Menuname>
	54	+ <Merge type="all"/>
a2f7030c	55	</Layout>
9972c606 JR	56	+ <Menu>
	57	+ <Name>Personal</Name>
	58	+ <Directory>xfce-personal.directory</Directory>
	59	+ <Include>
	60	+ <And>
	61	+ <Category>Settings</Category>
	62	+ <Or>
	63	+ <Category>X-XFCE</Category>
	64	+ <Category>XFCE</Category>
	65	+ </Or>
	66	+ <Category>X-XFCE-SettingsDialog</Category>
	67	+ <Category>X-XFCE-PersonalSettings</Category>
	68	+ </And>
	69	+ <Filename>xscreensaver-properties.desktop</Filename>
	70	+ </Include>
	71	+ </Menu>
	72	+ <Menu>
	73	+ <Name>Hardware</Name>
	74	+ <Directory>xfce-hardware.directory</Directory>
	75	+ <Include>
	76	+ <And>
	77	+ <Category>Settings</Category>
	78	+ <Or>
	79	+ <Category>X-XFCE</Category>
	80	+ <Category>XFCE</Category>
	81	+ </Or>
	82	+ <Category>X-XFCE-SettingsDialog</Category>
	83	+ <Category>X-XFCE-HardwareSettings</Category>
	84	+ </And>
	85	+ </Include>
	86	+ </Menu>
	87	+ <Menu>
	88	+ <Name>System</Name>
	89	+ <Directory>xfce-system.directory</Directory>
	90	+ <Include>
	91	+ <And>
	92	+ <Category>Settings</Category>
	93	+ <Or>
	94	+ <Category>X-XFCE</Category>
	95	+ <Category>XFCE</Category>
	96	+ </Or>
	97	+ <Category>X-XFCE-SettingsDialog</Category>
	98	+ <Category>X-XFCE-SystemSettings</Category>
	99	+ </And>
	100	+ </Include>
	101	+ </Menu>
a2f7030c JR	102	</Menu>
	103	<Menu>
	104	<Name>GNOME</Name>