Merge lp:~didrocks/unity-lens-applications/aboutconfig into lp:unity-lens-applications

[Didier Roche-Tolomelli]

about:config will launch and store in history ccsm -p unityshell (LP: #736765)

[Mikkel Kamstrup Erlandsen (kamstrup)]

I agree that it could be nice with an about: namespace that can trigger certain built in actions.

However, before I merge this i'd rather see a more generic implementation where we can easily add/remove stuff under about:. Having a specific hack only for about:config seems well... a hack :-)

Fx. like adding a

private class AboutEntry {
  public string name;
  public string exec;
  public Icon icon;
}

Store them in a list or map and then in get_icon_uri_and_mimetype() check all registered AboutEntries or something...

review: Needs Fixing

[lp:~didrocks/unity-lens-applications/aboutconfig]

180. By Didier Roche-Tolomelli on 2011-03-17

enable later extension creating a map of AboutEntry

[Didier Roche-Tolomelli (didrocks)]

repropose with a map and some extensions :)

[Mikkel Kamstrup Erlandsen (kamstrup)]

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

Merged with a pedantic nullity-fix:

- AboutEntry entry = null;
+ AboutEntry? entry = null;

=== modified file 'src/runner.vala'
--- src/runner.vala	2011-03-11 18:03:48 +0000
+++ src/runner.vala	2011-03-17 12:43:32 +0000
@@ -23,6 +23,19 @@
 
 namespace Unity.ApplicationsPlace {
 
+  private class AboutEntry {
+    public string name;
+    public string exec;
+    public Icon   icon;
+    
+    public AboutEntry (string name, string exec, Icon icon)
+    {
+      this.name = name;
+      this.exec = exec;
+      this.icon = icon;
+    }
+  }
+
   public class Runner: GLib.Object
   {  
   
@@ -41,6 +54,7 @@
      * incremental filtering of the result models */
     private PlaceSearch? previous_search;    
     
+    private Gee.HashMap<string,AboutEntry> about_entries;
     private Gee.List<string> executables;
     private Gee.List<string> history;
 
@@ -64,6 +78,10 @@
 
       previous_search = null;
       
+      /* create the private about entries */
+      about_entries = new Gee.HashMap<string,AboutEntry> ();
+      load_about_entries ();
+      
       executables = new Gee.ArrayList<string> ();
       find_system_executables.begin ();
       
@@ -111,15 +129,15 @@
       string uri;      
       Icon icon;
       string mimetype;
+      string display_name;
       var group_id = RunnerGroup.HISTORY;
 
       foreach (var command in this.history)
       {          
-        uri = @"unity-runner://$(command)";   
-        get_icon_and_mimetype (command, out icon, out mimetype);   
+        display_name = get_icon_uri_and_mimetype (command, out icon, out uri, out mimetype);   
         model.append (uri, icon.to_string (),
                       group_id, mimetype,
-                      command,
+                      display_name,
                       null);
       }
               
@@ -231,11 +249,10 @@
 
       // populate results
       // 1. enable launching the exact search string
-      uri = @"unity-runner://$(search_string)";   
-      get_icon_and_mimetype (search_string, out icon, out mimetype);   
+      display_name = get_icon_uri_and_mimetype (search_string, out icon, out uri, out mimetype);
       model.append (uri, icon.to_string (),
                     group_id, mimetype,
-                    search_string,
+                    display_name,
                     null);
       
       // 2. add possible directories (we don't store them)
@@ -255,11 +272,11 @@
       {
         // TODO: try to match to a desktop file for the icon
         uri = @"unity-runner://$(final_exec)";
-        get_icon_and_mimetype (final_exec, out icon, out mimetype);   
+        display_name = get_icon_uri_and_mimetype (final_exec, out icon, out uri, out mimetype);   
         
         model.append (uri, icon.to_string (),
                       group_id, mimetype,
-                      final_exec,
+                      display_name,
                       null);
       }
       
@@ -316,19 +333,30 @@
       }
     }
     
-    private void get_icon_and_mimetype (string exec_string, out Icon? icon, out string? mimetype)
+    private string get_icon_uri_and_mimetype (string exec_string, out Icon? icon, out string? uri, out string? mimetype)
     {
-        
+      
+      AboutEntry entry = null;
+      
+      mimetype = "application/x-unity-run";      
+      entry = about_entries[exec_string];
+      if (entry != null)
+      {
+        uri = @"unity-runner://$(entry.exec)";
+        icon = entry.icon;
+        return entry.name;
+      }
+
+      uri = @"unity-runner://$(exec_string)";
+
+      
       // if it's a folder, show… a folder icone! + right exec
       if (FileUtils.test (exec_string, FileTest.IS_DIR))
       {
         mimetype = "inode/directory";
         icon = ContentType.get_icon (mimetype);
-        return;
+        return exec_string;
       }
-      
-      mimetype = "application/x-unity-run";
-      
                         
       var s = exec_string.delimit ("-", '_').split (" ", 0)[0];      
       var appresults = this.daemon.appsearcher.search (@"type:Application AND exec:$s", 0,
@@ -342,12 +370,13 @@
         
         // pick the first one
         icon = this.daemon.find_pkg_icon (pkginfo);
-        return;
+        return exec_string;
         
       }
       
       // if no result, default icon
       icon = new ThemedIcon ("gtk-execute");
+      return exec_string;
       
     }
 
@@ -451,6 +480,31 @@
         warning ("Can't access to the history: %s", e.message);
       }
     }
+    
+    private void load_about_entries ()
+    { 
+      AboutEntry entry;
+      string name;
+      string exec;
+      Icon icon;
+      
+      // first about:config
+      name = "about:config";
+      exec = "ccsm -p unityshell";
+      try {
+        icon = Icon.new_for_string (@"$(Config.PREFIX)/share/ccsm/icons/hicolor/64x64/apps/plugin-unityshell.png");      
+      }
+      catch (Error err) {
+        warning ("Can't find unityshell icon: %s", err.message);
+        icon = new ThemedIcon ("gtk-execute");
+      }   
+      entry = new AboutEntry (name, exec, icon);
+      
+      about_entries[name] = entry;
+      about_entries[exec] = entry;
+      
+    }
+      
   }
   
 }