Merge lp:~simon-d-bull/cappella/cappella10_task_manager_plugin into lp:cappella

[Simon Bull]

* Added unity_launcher.py file which handles launcher notifications based on task manager activity.

[Andrew Hayzen (ahayzen)]

review: Approve

[Simon Bull (simon-d-bull)]

review: Approve

=== modified file 'cappella/__init__.py'
--- cappella/__init__.py	2013-04-27 18:48:25 +0000
+++ cappella/__init__.py	2013-04-28 20:22:28 +0000
@@ -135,13 +135,6 @@
 
     Logger.debug("Loaded Media")
 
-    #----------------------------------------------------------- Load GUI Views
-    from .gui import view  # Add views to gui interface
-
-    gui_man.do_load_from_settings()  # Load settings to gui
-
-    Logger.debug("Loaded GUI Phase 2")
-
     #------------------------------------------------------------- Load Plugins
     if optpar.disable_plugins is False:
         from .management.plugin import management as plugin_man
@@ -153,6 +146,13 @@
 
         Logger.debug("Loaded Plugin")
 
+    #----------------------------------------------------------- Load GUI Views
+    from .gui import view  # Add views to gui interface
+
+    gui_man.do_load_from_settings()  # Load settings to gui
+
+    Logger.debug("Loaded GUI Phase 2")
+
     from .tool.garbage import Collect
 
     Collect()  # Force garbage collection

=== modified file 'cappella/data/default/plugins.js'
--- cappella/data/default/plugins.js	2013-04-21 19:24:31 +0000
+++ cappella/data/default/plugins.js	2013-04-28 20:22:28 +0000
@@ -2,5 +2,6 @@
 	"Media Keys": {"location": "media_keys", "autostart": true},
 	"Title Bar": {"location": "titlebar", "autostart": true},
 	"Unity Sound Menu": {"location": "unity_soundmenu", "autostart": true},
-	"Unity Quicklist": { "location": "unity_quicklist", "autostart": true}
-}
\ No newline at end of file
+	"Unity Quicklist": { "location": "unity_quicklist", "autostart": true},
+	"Unity Launcher": {"location": "unity_launcher", "autostart": true}
+}

=== modified file 'cappella/gui/widget/status.py'
--- cappella/gui/widget/status.py	2013-04-02 22:48:35 +0000
+++ cappella/gui/widget/status.py	2013-04-28 20:22:28 +0000
@@ -26,7 +26,7 @@
 from ...gui.widget.progress import ProgressWidget
 from ...management.library import LibraryType, LibraryPurpose, LibraryMode
 from ...signalhandler import signal
-from ...tool import skipx, thread_safe
+from ...tool import emit_signal, skipx, thread_safe
 
 
 class StatusBar():
@@ -99,6 +99,9 @@
 
             self.spinner.set_state(True)  # Force spinner spinning
 
+            GObject.idle_add(emit_signal, "_task_progress_", avg, 
+                            priority=GObject.PRIORITY_HIGH)
+
             sleep(0.50)  # Only refresh twice a second
 
     @thread_safe

=== added file 'cappella/plugin/unity_launcher.py'
--- cappella/plugin/unity_launcher.py	1970-01-01 00:00:00 +0000
+++ cappella/plugin/unity_launcher.py	2013-04-28 20:22:28 +0000
@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+'''
+ Copyright (C) 2011-2013 Andrew Hayzen and Simon Bull.
+
+ Cappella is a simple media player based on PyGObject for Ubuntu.
+
+ This file 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 file 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 file.  If not, see <http://www.gnu.org/licenses/>.
+'''
+
+try:
+    from gi.repository import Dbusmenu, Unity
+    unity = True
+except ImportError:
+    unity = False
+
+from ..config.cappella import settings
+from ..tool import thread_safe, skipx
+
+class Plugin():
+    """
+    PLUGIN FOR UNITY LAUNCHER
+    """
+    info = {"name": "Unity Launcher",
+            "description": "Adds progress bar and cunter to the unity "
+            "launcher that monitors tasks in cappella.",
+            "author": ["Andrew Hayzen", "Simon Bull"],
+            "copyright": "Copyright \u00A9 Andrew Hayzen & Simon Bull",
+            "website": "http://www.andrewhayzen.co.uk/",
+            "configure": False}
+
+    def __init__(self, plugin_object):
+        # Load variables
+        self.plugin_object = plugin_object
+
+        self.signal = self.plugin_object.signalhandler
+        self.name = self.plugin_object.name
+        self.ids = []
+
+        self.quicklist_items = {}
+
+        if unity:
+            desk_id = "cappella.desktop"
+            self.launcher = Unity.LauncherEntry.get_for_desktop_id(desk_id)
+            
+        self.counter = 0
+
+    def on_task_add(self, signal, task):
+        self.counter += 1
+        
+        if unity:
+            self.launcher.set_property("count", self.counter)
+            self.launcher.set_property("count_visible", self.counter != 0)
+            self.launcher.set_property("progress_visible", self.counter != 0)
+    
+    def on_task_progress(self, signal, fraction):
+        if unity:
+            self.launcher.set_property("progress", fraction)
+            
+    def on_task_remove(self, signal, task):
+        self.counter -= 1
+        
+        if unity:
+            self.launcher.set_property("count", self.counter)
+            self.launcher.set_property("count_visible", self.counter != 0)
+            self.launcher.set_property("progress_visible", self.counter != 0)
+            
+    def start(self):
+        i = self.signal.connect('_task_add_', self.on_task_add)
+        self.ids.append(i)
+        
+        i = self.signal.connect('_task_remove_', self.on_task_remove)
+        self.ids.append(i)
+        
+        i = self.signal.connect('_task_progress_', self.on_task_progress)
+        self.ids.append(i)
+
+    @thread_safe
+    def stop(self):
+        for i in self.ids:
+            self.signal.disconnect(i)
+
+        self.ids = []
+
+        if not unity:
+            return

=== modified file 'cappella/signalhandler.py'
--- cappella/signalhandler.py	2013-04-28 18:40:19 +0000
+++ cappella/signalhandler.py	2013-04-28 20:22:28 +0000
@@ -333,6 +333,10 @@
         # Add new task                task(object)
         '_task_remove_' : (GObject.SIGNAL_RUN_FIRST, GObject.TYPE_NONE,
                       (GObject.TYPE_PYOBJECT,)),
+                      
+        # Add new task                progress(float)
+        '_task_progress_' : (GObject.SIGNAL_RUN_FIRST, GObject.TYPE_NONE,
+                      (GObject.TYPE_DOUBLE,)),
 
         # Show progress widget
         '_task_show_' : (GObject.SIGNAL_RUN_FIRST, GObject.TYPE_NONE, ()),