Merge lp:~john-pankov/dockmanager/quicklists into lp:dockmanager

[Eugene Pankov]

Added support for the Unity Quicklists

[Michal Hruby (mhr3)]

Since this is Ubuntu-specific, I think it'd be much better to read just the desktop cache file and also install a file monitor on it, and if it doesn't exist then assume this ain't Ubuntu and there are no Unity-specific desktop files.

[Eugene Pankov (john-pankov)]

AFAIK desktop*.cache doesn't contain X-Ayatana-Desktop-Shortcuts entries.
Also not sure if the file monitor is needed - we'll get item_path_found() if user launches newly installed app.
Please let me know your thoughts on this.

[Michal Hruby (mhr3)]

You're right, my bad... Still I don't like the crawling of all the desktop files, ultimately you do get the path to desktop file in the item_path_found() method, so it'd be much better to just load it there.

[Rico Tzschichholz (ricotz)]

Interesting, but indeed you should use the desktop-file-path over dbus and scan it for quicklists. Scanning the whole applications-folder everytime isnt nice.

review: Needs Fixing

[lp:~john-pankov/dockmanager/quicklists]

96. By Eugene Pankov on 2011-06-11

Enhanced quicklists backend

[Eugene Pankov (john-pankov)]

Fixed

review: Needs Resubmitting

[Michal Hruby (mhr3)]

1) the DesktopFile property can be empty string if the window can't be matched, you don't handle that
2) you should cache the desktop files you already loaded at some point, we don't need extra i/o on every window close/open cycle

review: Needs Fixing

[lp:~john-pankov/dockmanager/quicklists]

97. By Eugene Pankov on 2011-06-18

Added desktop file caching to quicklists

[Eugene Pankov (john-pankov)]

Fixed both points

review: Needs Resubmitting

[Michal Hruby (mhr3)]

One last thing, please use glib/gio to launch the desktop files (instead of Popen), that will enable you to get rid of the remove_params function.

review: Needs Fixing

[lp:~john-pankov/dockmanager/quicklists]

98. By Eugene Pankov on 2011-06-28

Replaced subprocess with gio in quicklists helper

[Eugene Pankov (john-pankov)]

Fixed

[Michal Hruby (mhr3)]

Looks good to me...

review: Approve

[Rico Tzschichholz (ricotz)]

Would be nice if available translations of the QuickList entries could be taken into account. This means using Name[LOCALE]=... with a fallback to Name=...

[lp:~john-pankov/dockmanager/quicklists]

99. By Eugene Pankov on 2011-06-28

Added localization support to quicklists

[Eugene Pankov (john-pankov)]

Done

[Rico Tzschichholz (ricotz)]

review: Approve

[Eugene Pankov (john-pankov)]

...

review: Approve

=== modified file 'metadata/Makefile.am'
--- metadata/Makefile.am	2011-04-23 11:23:30 +0000
+++ metadata/Makefile.am	2011-06-28 14:19:52 +0000
@@ -18,6 +18,7 @@
 	tomboy_menus.py.info	\
 	transmission_badge.py.info	\
 	tsclient_menus.py.info	\
+	quicklists.py.info	\
 	workrave_helper.py.info	\
 	zeitgeist_menus.py.info	\
 	zeitgeist_journal.py.info

=== added file 'metadata/quicklists.py.info'
--- metadata/quicklists.py.info	1970-01-01 00:00:00 +0000
+++ metadata/quicklists.py.info	2011-06-28 14:19:52 +0000
@@ -0,0 +1,4 @@
+[DockmanagerHelper]
+Name=Unity Quicklists
+Description=Adds quicklist entries to apps' context menus
+Icon=alacarte

=== modified file 'scripts/Makefile.am'
--- scripts/Makefile.am	2011-04-23 11:23:30 +0000
+++ scripts/Makefile.am	2011-06-28 14:19:52 +0000
@@ -18,6 +18,7 @@
 	tomboy_menus.py		\
 	transmission_badge.py	\
 	tsclient_menus.py	\
+	quicklists.py	\
 	workrave_helper.py	\
 	zeitgeist_menus.py	\
 	zeitgeist_journal.py

=== added file 'scripts/quicklists.py'
--- scripts/quicklists.py	1970-01-01 00:00:00 +0000
+++ scripts/quicklists.py	2011-06-28 14:19:52 +0000
@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+
+#  
+#  Copyright (C) 2010 Eugeny Pankov
+# 
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+# 
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+# 
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import atexit
+import gobject
+import glib
+import gio
+import locale
+import sys
+import os
+import subprocess
+from ConfigParser import ConfigParser
+from signal import signal, SIGTERM
+from sys import exit
+
+try:
+    from dockmanager.dockmanager import DockManagerItem, DockManagerSink, DOCKITEM_IFACE
+except ImportError, e:
+    print e
+    exit()
+
+desktop_cache = {}
+
+
+class QuickListItem(DockManagerItem):
+    def __init__(self, sink, name, path):
+        global desktop_cache
+        DockManagerItem.__init__(self, sink, path)
+
+        if name in desktop_cache:
+            cfg = desktop_cache[name]
+        else:
+            cfg = ConfigParser()
+            cfg.read(name)
+            desktop_cache[name] = cfg
+            
+        try:
+            icon = cfg.get('Desktop Entry', 'Icon')
+        except:
+            icon = os.path.split(name)[1].split('.')[0]
+
+        self.items = {}
+        
+        lc = locale.getdefaultlocale()[0]
+        names = [
+            'Name[%s]'%lc,
+            'Name[%s]'%lc.split('_')[0],
+            'Name',
+        ]
+        
+        for section in cfg.sections():
+            if section.endswith('Shortcut Group'):
+                name = None
+                for n in names:
+                    try:
+                        name = cfg.get(section, n)
+                        break
+                    except:
+                        pass
+                        
+                self.add_menu_item(
+                    name,
+                    icon, 
+                    'Quicklist',
+                )
+                self.items[name] = cfg.get(section, 'Exec')
+
+    def menu_pressed(self, menu_id):
+        gio.AppInfo(self.items[self.id_map[menu_id]]).launch()
+	      
+	        
+class QuickListSink(DockManagerSink):
+    def item_path_found(self, pathtoitem, item):
+        name = str(item.Get(DOCKITEM_IFACE, 'DesktopFile', dbus_interface='org.freedesktop.DBus.Properties'))
+        if name:
+            self.items[pathtoitem] = QuickListItem(self, name, pathtoitem)
+
+
+sink = QuickListSink()
+
+def cleanup ():
+    sink.dispose()
+
+if __name__ == '__main__':
+    mainloop = gobject.MainLoop(is_running=True)
+
+    atexit.register (cleanup)
+    signal(SIGTERM, lambda signum, stack_frame: exit(1))
+
+    mainloop.run()