Merge lp:~kalikiana/midori/dock into lp:midori

[Cris Dywan]

Show a counter in the dock for in-progress downloads

[Cris Dywan (kalikiana)]

There's no progress at this point. This will require some refactoring beyond this feature.

[gue5t gue5t (gue5t)]

A minor question I have is why "libunity" vs. "unity" is chosen in different contexts; all external references seem to have no "lib" prefix.

I haven't tested the code but it looks ok--a nitpick on naming is that the function name "update_dock_item" is not very descriptive of how it works; to me it seems like "add/increase_dock_item_count" would explain the behavior of its parameter.

[Julián Unrrein (junrrein)]

Acording to the HIG (http://www.elementaryos.org/docs/human-interface-guidelines/desktop-integration/dock-integration) the purpose of dock badges "is to inform the user that there is something that requires attention without being obtrusive".

I don't think that's the case here. The user is already notified about the download in the main window.

[Julián Unrrein (junrrein)]

They would make sense to indicate finished downloads.

[Cris Dywan (kalikiana)]

The dock is used specifically when the user doesn't see the window. I'm not sure what's obtrusive here.

Unmerged revisions

6186. By Cris Dywan on 2013-05-31

Drop urgent hint which is redundant with notifications

6185. By Cris Dywan on 2013-05-31

Decrease dock count when download stops, it may remain in the list

6184. By Cris Dywan on 2013-05-31

REname update_dock_item to add_dock_item_count for clarity

6183. By Cris Dywan on 2013-05-31

Always refer to unity, there's no lib prefix

6182. By Cris Dywan on 2013-05-30

Show a counter in the dock for in-progress downloads

=== modified file 'extensions/transfers.vala'
--- extensions/transfers.vala	2013-05-30 18:07:54 +0000
+++ extensions/transfers.vala	2013-05-31 11:02:29 +0000
@@ -420,6 +420,15 @@
             transfer.changed.connect (transfer_changed);
             array.remove_item.connect (transfer_removed);
             array.add_item (transfer);
+            add_dock_item_count (1);
+        }
+
+        void add_dock_item_count (int count_diff) {
+#if HAVE_UNITY
+            var dock = Unity.LauncherEntry.get_for_desktop_id (PACKAGE_NAME + ".desktop");
+            dock.count += count_diff;
+            dock.count_visible = dock.count > 0;
+#endif
         }
 
         bool notification_timeout_triggered () {
@@ -438,6 +447,8 @@
         }
 
         void transfer_changed (Transfer transfer) {
+            if (transfer.finished)
+                add_dock_item_count (-1);
             if (transfer.succeeded) {
                 /* FIXME: The following 2 blocks ought to be done in core */
                 if (transfer.action == Midori.DownloadType.OPEN) {

=== modified file 'extensions/wscript_build'
--- extensions/wscript_build	2013-05-14 17:52:15 +0000
+++ extensions/wscript_build	2013-05-31 11:02:29 +0000
@@ -35,7 +35,7 @@
     obj.target = target
     obj.includes = '.. ../katze ../midori'
     obj.source = source
-    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE'
+    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE UNITY'
     if 'vala' in source:
         obj.env.append_value ('CCFLAGS', '-w')
         obj.vapi_dirs = '../midori ../katze'
@@ -50,6 +50,8 @@
             obj.packages += ' webkitgtk-3.0'
         if bld.env['HAVE_GRANITE']:
             obj.packages += ' granite'
+        if bld.env['HAVE_UNITY']:
+            obj.packages += ' unity'
     obj.install_path = '${LIBDIR}/midori'
     # See LINKFLAGS in wscript: w/ o it we get several "undefined reference" errors
     if bld.env['platform'] == 'win32':

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-05-30 16:40:15 +0000
+++ midori/midori-view.c	2013-05-31 11:02:29 +0000
@@ -4067,7 +4067,8 @@
         LIBNOTIFY_VERSION));
     midori_view_add_version (markup, html, g_strdup_printf ("gcr %s\tgranite %s",
         GCR_VERSION, GRANITE_VERSION));
-    midori_view_add_version (markup, html, g_strdup_printf ("single instance %s",
+    midori_view_add_version (markup, html, g_strdup_printf ("unity %s\tsingle instance %s",
+        UNITY_VERSION,
         #if HAVE_UNIQUE
         "libunique " UNIQUE_VERSION
         #else

=== modified file 'wscript'
--- wscript	2013-05-30 19:20:29 +0000
+++ wscript	2013-05-31 11:02:29 +0000
@@ -212,6 +212,16 @@
         conf.define ('GRANITE_VERSION', 'No')
         conf.check_message_custom ('granite', '', 'disabled')
 
+    if option_enabled ('unity'):
+        if not check_pkg ('unity', mandatory=False):
+            option_checkfatal ('unity', 'dock badges')
+        else:
+            conf.env.append_value ('VALAFLAGS', '-D HAVE_UNITY')
+    else:
+        conf.define ('UNITY_VERSION', 'No')
+        conf.check_message_custom ('unity', '', 'disabled')
+    conf.define ('HAVE_UNITY', [0,1][conf.env['UNITY_VERSION'] != 'No'])
+
     if option_enabled ('zeitgeist'):
         check_pkg ('zeitgeist-1.0', '0.3.14')
     else:
@@ -423,6 +433,7 @@
     add_enable_option ('tests', 'install tests', group, disable=True)
     add_enable_option ('gtk3', 'GTK+3 and WebKitGTK+3 support', group, disable=True)
     add_enable_option ('webkit2', 'WebKit2 support', group, disable=True)
+    add_enable_option ('unity', 'dock badges', group)
     add_enable_option ('zeitgeist', 'Zeitgeist history integration', group, disable=is_win32 (os.environ))
 
     # Provided for compatibility