diff options
| -rw-r--r-- | shell/matecc.menu | 132 |
1 files changed, 87 insertions, 45 deletions
diff --git a/shell/matecc.menu b/shell/matecc.menu index a99fdf77..4c94a242 100644 --- a/shell/matecc.menu +++ b/shell/matecc.menu @@ -14,50 +14,69 @@ <!-- Sort the control center categories --> <Layout> - <Menuname>Personal</Menuname> - <Menuname>Internet and Network</Menuname> + <Menuname>Administration</Menuname> <Menuname>Hardware</Menuname> - <Menuname>System</Menuname> + <Menuname>Internet and Network</Menuname> + <Menuname>Look and Feel</Menuname> + <Menuname>Personal</Menuname> + <Menuname>Universal Access</Menuname> <Merge type="all" /> </Layout> - <!-- Stuff in the toplevel (Other category) --> + <!-- Define what appears in the Other category --> <Include> <And> <Category>Settings</Category> - <Not> - <Or> - <Category>X-MATE-PersonalSettings</Category> - <Category>DesktopSettings</Category> - <Category>X-MATE-NetworkSettings</Category> - <Category>HardwareSettings</Category> - <Category>X-MATE-SystemSettings</Category> - <Category>System</Category> - </Or> - </Not> + <Not><Category>Accessibility</Category></Not> + <Not><Category>System</Category></Not> + <Not><Category>DesktopSettings</Category></Not> + <Not><Category>HardwareSettings</Category></Not> + <Not><Category>Security</Category></Not> + <Not><Category>Archiving</Category></Not> + <Not><Category>Qt</Category></Not> + <Not><Category>X-MATE-NetworkSettings</Category></Not> + <Not><Category>X-GNOME-NetworkSettings</Category></Not> + <Not><Category>X-MATE-PersonalSettings</Category></Not> + <Not><Category>X-GNOME-PersonalSettings</Category></Not> </And> </Include> + <Exclude> + <Filename>matecc.desktop</Filename> + </Exclude> <!-- Avoid the shell having a launcher for itself --> <Exclude> <Filename>matecc.desktop</Filename> </Exclude> - <!-- Personal category --> + <!-- Administration category --> <Menu> - <Name>Personal</Name> - <Directory>mate-personal.directory</Directory> + <Name>Administration</Name> <Include> <And> <Category>Settings</Category> - <Category>X-MATE-PersonalSettings</Category> + <Category>System</Category> </And> <And> <Category>Settings</Category> - <Category>DesktopSettings</Category> + <Category>System</Category> + <Category>Printing</Category> </And> </Include> - </Menu> <!-- End Personal --> + </Menu> <!-- End Administration --> + + <!-- Hardware category --> + <Menu> + <Name>Hardware</Name> + <Directory>mate-hardware.directory</Directory> + <Include> + <And> + <Category>Settings</Category> + <Category>HardwareSettings</Category> + <Not><Category>System</Category></Not> + </And> + </Include> + </Menu> <!-- End Hardware --> <!-- Internet and Network category --> <Menu> @@ -67,45 +86,68 @@ <And> <Category>Settings</Category> <Category>X-MATE-NetworkSettings</Category> + <Not><Category>System</Category></Not> + </And> + <And> + <Category>Settings</Category> + <Category>X-GNOME-NetworkSettings</Category> + <Not><Category>System</Category></Not> + </And> + <And> + <Category>Settings</Category> + <Category>Security</Category> + <Not><Category>System</Category></Not> </And> </Include> </Menu> <!-- End Internet and Network --> - - <!-- Hardware category --> + + <!-- Look and Feel category --> <Menu> - <Name>Hardware</Name> - <Directory>mate-hardware.directory</Directory> + <Name>Look and Feel</Name> + <Directory>mate-look-and-feel.directory</Directory> <Include> <And> <Category>Settings</Category> - <Category>HardwareSettings</Category> + <Category>DesktopSettings</Category> + <Not><Category>System</Category></Not> + <Not><Category>Security</Category></Not> + </And> + <And> + <Category>Settings</Category> + <Category>Qt</Category> + <Not><Category>System</Category></Not> + <Not><Category>Security</Category></Not> </And> </Include> - </Menu> <!-- End Hardware --> + </Menu> <!-- End Look and Feel category --> + - <!-- System category --> + <!-- Personal category --> <Menu> - <Name>System</Name> - <Directory>mate-system.directory</Directory> + <Name>Personal</Name> + <Directory>mate-personal.directory</Directory> <Include> <And> <Category>Settings</Category> - <Or> - <Category>X-MATE-SystemSettings</Category> - <And> - <Category>System</Category> - <Not> - <Or> - <Category>X-MATE-PersonalSettings</Category> - <Category>DesktopSettings</Category> - <Category>HardwareSettings</Category> - <Category>X-MATE-NetworkSettings</Category> - </Or> - </Not> - </And> - </Or> + <Category>X-MATE-PersonalSettings</Category> + <Not><Category>System</Category></Not> + </And> + <And> + <Category>Settings</Category> + <Category>X-GNOME-PersonalSettings</Category> + <Not><Category>System</Category></Not> + </And> + <And> + <Category>Settings</Category> + <Category>X-GNOME-SystemSettings</Category> + <Category>Archiving</Category> + </And> + <And> + <Category>Settings</Category> + <Category>Accessibility</Category> + <Not><Category>Utility</Category></Not> </And> </Include> - </Menu> <!-- End System --> + </Menu> <!-- End Personal --> -</Menu> <!-- End CC --> +</Menu> <!-- End CC --> |