Merge lp:~shnatsel/slingshot/app-visibility-fixes into lp:~elementary-pantheon/slingshot/trunk

[Sergey "Shnatsel" Davidoff]

Fixes multiple visibility issues.

Fixes multiple visibility issues:
- Some apps like usb-creator-gtk or synaptic not being displayed
- Some games not being displayed
- Some crap like xterm being shown

[Andrea Basso (voluntatefaber)]

This is great and fixes both bugs.
With this new branch, something strange happened. I've created two custom launchers with Alacarte to test its support in Slingshot and -previosuly- didn't appear. Now, they appear only in Category View and under "Other", no matter which category I'd set.
Do you think it's possible to make them appear in all three views and in the right category? If that's not possible, is at least possible not to show them at all?
In the meantime, I'm gonna merge this because it both works great and fixes what it's supposed to.

review: Approve

[Andrea Basso (voluntatefaber)]

I've just found out that all the apps that are listed under System Tools > Preferences in Alacarte show up under Other. Is this by design or they're supposed to be under System?

[Sergey "Shnatsel" Davidoff (shnatsel)]

Alacarte is way too bound to GNOME2 category layout. I don't think it's realistic to support it fully.

Still, I guess it should be possible to support creating launchers. Let's open a bug about that. I have no idea about not showing something in the main view, but if it's possible, I'd be glad to use that bug-o-feature for accessibility apps.

=== modified file 'data/pantheon-applications.menu'
--- data/pantheon-applications.menu	2012-03-22 15:37:53 +0000
+++ data/pantheon-applications.menu	2012-06-25 14:34:34 +0000
@@ -24,17 +24,14 @@
     <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 -->
+    <!-- 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>
-  <Exclude>
-    <Filename>plank.desktop</Filename>
-  </Exclude>
   </Menu> <!-- End Accessories -->
 
   <!-- Accessibility submenu -->
@@ -92,107 +89,8 @@
     <Include>
       <And>
         <Category>Game</Category>
-        <Not><Category>ActionGame</Category></Not>
-        <Not><Category>AdventureGame</Category></Not>
-        <Not><Category>ArcadeGame</Category></Not>
-        <Not><Category>BoardGame</Category></Not>
-        <Not><Category>BlocksGame</Category></Not>
-        <Not><Category>CardGame</Category></Not>
-        <Not><Category>KidsGame</Category></Not>
-        <Not><Category>LogicGame</Category></Not>
-        <Not><Category>Simulation</Category></Not>
-        <Not><Category>SportsGame</Category></Not>
-        <Not><Category>StrategyGame</Category></Not>
       </And>
     </Include>
-    <DefaultLayout inline="true" inline_limit="6" inline_header="false">
-      <Merge type="menus"/>
-      <Merge type="files"/>
-    </DefaultLayout>
-    <Menu>
-      <Name>Action</Name>
-      <Directory>ActionGames.directory</Directory>
-      <Include>
-        <Category>ActionGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Adventure</Name>
-      <Directory>AdventureGames.directory</Directory>
-      <Include>
-        <Category>AdventureGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Arcade</Name>
-      <Directory>ArcadeGames.directory</Directory>
-      <Include>
-        <Category>ArcadeGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Board</Name>
-      <Directory>BoardGames.directory</Directory>
-      <Include>
-        <Category>BoardGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Blocks</Name>
-      <Directory>BlocksGames.directory</Directory>
-      <Include>
-        <Category>BlocksGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Cards</Name>
-      <Directory>CardGames.directory</Directory>
-      <Include>
-        <Category>CardGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Kids</Name>
-      <Directory>KidsGames.directory</Directory>
-      <Include>
-        <Category>KidsGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Logic</Name>
-      <Directory>LogicGames.directory</Directory>
-      <Include>
-        <Category>LogicGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Role Playing</Name>
-      <Directory>RolePlayingGames.directory</Directory>
-      <Include>
-        <Category>RolePlaying</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Simulation</Name>
-      <Directory>SimulationGames.directory</Directory>
-      <Include>
-        <Category>Simulation</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Sports</Name>
-      <Directory>SportsGames.directory</Directory>
-      <Include>
-        <Category>SportsGame</Category>
-      </Include>
-    </Menu>
-    <Menu>
-      <Name>Strategy</Name>
-      <Directory>StrategyGames.directory</Directory>
-      <Include>
-        <Category>StrategyGame</Category>
-      </Include>
-    </Menu>
   </Menu> <!-- End Games -->
 
   <!-- Graphics -->
@@ -202,6 +100,7 @@
     <Include>
       <And>
         <Category>Graphics</Category>
+        <Not><Filename>evince.desktop</Filename></Not>
       </And>
     </Include>
   </Menu> <!-- End Graphics -->
@@ -245,12 +144,18 @@
     <Directory>System-Tools.directory</Directory>
     <Include>
       <And>
-        <Category>System</Category>
-        <Not><Category>Settings</Category></Not>
-	    <Not><Category>Game</Category></Not>
+        <Or>
+          <Category>System</Category>
+          <Category>Administration</Category>
+        </Or>
+        <Not>
+          <Category>Game</Category>
+          <Category>X-GNOME-Settings-Panel</Category>
+          <Filename>debian-xterm.desktop</Filename>
+          <Filename>debian-uxterm.desktop</Filename>
+          <Filename>ibus.desktop</Filename>
+        </Not>
       </And>
-      <Filename>switchboard.desktop</Filename>
-      <Filename>ubuntu-software-center.desktop</Filename>
     </Include>
   </Menu>   <!-- End System Tools -->
 
@@ -261,14 +166,35 @@
     <OnlyUnallocated/>
     <Include>
       <And>
-        <Not><Category>Core</Category></Not>
-        <Not><Category>Screensaver</Category></Not>
-        <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-        <Not><Category>System</Category></Not>
+        <Not>
+          <Category>Core</Category>
+          <Category>Screensaver</Category>
+          <Category>X-GNOME-Settings-Panel</Category>
+          <Filename>debian-xterm.desktop</Filename>
+          <Filename>debian-uxterm.desktop</Filename>
+          <Filename>ibus.desktop</Filename>
+          <Filename>empathy-accounts.desktop</Filename>
+        </Not>
+        <Or>
+          <Not><Category>Settings</Category></Not>
+          <And>
+            <Category>Settings</Category>
+            <Or>
+              <Category>DesktopSettings</Category>
+              <Category>Security</Category>
+            </Or>
+          </And>
+        </Or>
       </And>
     </Include>
   </Menu> <!-- End Other -->
 
+   <Layout>
+     <Merge type="menus" />
+     <Menuname>Other</Menuname>
+     <Merge type="files" />
+   </Layout>
+
   <!-- The Debian menu -->
   <Menu>
     <Name>Debian</Name>
@@ -276,12 +202,4 @@
     <Directory>Debian.directory</Directory>
   </Menu>
 
-
-<!-- Separator between menus and gnome-app-install -->
-<Layout>
-  <Merge type="menus"/>
-  <Merge type="files"/>
-  <Separator/>
-</Layout>
-
 </Menu> <!-- End Applications -->