Author: adgor                        Date: Fri Sep 29 18:49:58 2006 GMT
Module: applnk                        Tag: HEAD
---- Log message:
- Merged {system,category,finance}.patch
- Added 'TrayIcon' cat. to 'Docklets' submenu
- Sorted some items

---- Files affected:
applnk/menus:
   applications.menu (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: applnk/menus/applications.menu
diff -u applnk/menus/applications.menu:1.41 applnk/menus/applications.menu:1.42
--- applnk/menus/applications.menu:1.41 Tue Mar 22 00:59:20 2005
+++ applnk/menus/applications.menu      Fri Sep 29 20:49:53 2006
@@ -438,6 +438,7 @@
                        <And>           
                        <Category>AudioVideo</Category>
                        <Not><Category>AudioVideoEditing</Category></Not>
+                       <Not><Category>DiscBurning</Category></Not>
                        <Not><Category>Mixer</Category></Not>
                        <Not><Category>Player</Category></Not>
                        <Not><Category>Recorder</Category></Not>
@@ -462,6 +463,16 @@
                        </Or>
                </Include>
                <Menu>
+                       <Name>CD-RW</Name>
+                       <Directory>cd-rw.directory</Directory>
+                       <Include>
+                               <And>
+                               <Category>AudioVideo</Category>
+                               <Category>DiscBurning</Category>
+                               </And>
+                       </Include>
+               </Menu>
+               <Menu>
                        <Name>Editing</Name>
                        <Directory>media-edit.directory</Directory>
                        <Include>
@@ -634,18 +645,19 @@
                <Include>
                        <And>
                        <Category>Office</Category>
+                       <Not><Category>Calendar</Category></Not>
+                       <Not><Category>Chart</Category></Not>
                        <Not><Category>ContactManagement</Category></Not>
+                       <Not><Category>Database</Category></Not>
+                       <Not><Category>Dictionary</Category></Not>
+                       <Not><Category>Email</Category></Not>
+                       <Not><Category>Finance</Category></Not>
+                       <Not><Category>PDA</Category></Not>
                        <Not><Category>Presentation</Category></Not>
                        <Not><Category>Spreadsheet</Category></Not>
                        <Not><Category>WordProcessor</Category></Not>
-                       <Not><Category>Database</Category></Not>
                        <Not><Category>X-Misc</Category></Not>
                        <Not><Category>X-PIM</Category></Not>
-                       <Not><Category>Calendar</Category></Not>
-                       <Not><Category>Chart</Category></Not>
-                       <Not><Category>PDA</Category></Not>
-                       <Not><Category>Email</Category></Not>
-                       <Not><Category>Dictionary</Category></Not>
                        </And>
                </Include>
                <Menu>
@@ -675,8 +687,9 @@
                                <And>
                                <Category>Office</Category>
                                <Or>
-                               <Category>X-Misc</Category>
                                <Category>Chart</Category>
+                               <Category>Finance</Category>
+                               <Category>X-Misc</Category>
                                </Or>
                                </And>
                        </Include>
@@ -823,6 +836,7 @@
                        </Or>
                        <Not><Category>Filesystem</Category></Not>
                        <Not><Category>Monitor</Category></Not>
+                       <Not><Category>X-Capplet</Category></Not>
                        </And>
                </Include>
                <Menu>
@@ -915,22 +929,13 @@
                        </Include>
                </Menu>
                <Menu>
-                       <Name>CD-RW</Name>
-                       <Directory>cd-rw.directory</Directory>
-                       <Include>
-                               <And>
-                               <Category>Utility</Category>
-                               <Category>DiscBurning</Category>
-                               </And>
-                       </Include>
-               </Menu>
-               <Menu>
                        <Name>Docklets</Name>
                        <Directory>docklets.directory</Directory>
                        <Include>
                                <Or>
-                               <Category>X-Docklet</Category>
                                <Category>Applet</Category>
+                               <Category>TrayIcon</Category>
+                               <Category>X-Docklet</Category>
                                </Or>
                        </Include>
                </Menu>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/applnk/menus/applications.menu?r1=1.41&r2=1.42&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to