Merge lp:~jeremywootten/plank/fix-1063913 into lp:plank

[Jeremy Wootten]

Implements persistence of the bookmarks in the launcher when Files is not running. Requires modification of Files also to provide both labels and uris over DBus and to signal a quicklist update whenever the bookmarks change so that the launcher can be updated even if the right-click menu is not used again before Files closes. These modifications are contained in the branch lp:~jeremywootten/pantheon-files/quicklist-add-uris

The bookmark labels and uris are stored in the launcher preferences file. If the app is running the launcher bookmarks are taken from the Quicklist as usual; when the app is closed the bookmarks are taken from the preference file.

[Robert Dyer (psybers)]

I do not approve of adding quicklist entries into the .dockitem.

review: Disapprove

[Rico Tzschichholz (ricotz)]

I am not totally opposed to parts of this idea. Having a little restructuring of and extending the dockitem syntax seems interesting.

Like adding optional fields to override "Name" and "Icon" while also adding support for an equivalent of DesktopActions. Which would be capable to hold needed information to provide such an feature. Passing the information to plank in a nice way in another story while of course direct adjustment of the dockitem file is possible.

[Plank Entry]
Launcher=file:///.*.desktop
Name=... (optional localestring)
Icon=... (optional localestring)
Actions=...;...; (optional string-array)

[Plank Action %ACTION%]
Name=... (localestring)
Icon=... (optional localestring)
Exec=... (optional localestring)

[Rico Tzschichholz (ricotz)]

@jeremywootten: Just a note. Make sure you are not proposing unwanted changes like commented code or removing files e.g. plank.pot.

[Robert Dyer (psybers)]

I don't see any reason to put these into the .dockitem. If you want a custom icon or text, make a new .desktop file and point your .dockitem to that.

[Rico Tzschichholz (ricotz)]

Don't just think about dockitems which point to desktop-files. Also copying and adjusting a desktop-file isn't actually comfortable and will also prevent you from receiving changes/update if the original system's desktop-file gets altered.

[Jeremy Wootten (jeremywootten)]

Hello Rico, Robert

This branch was in response to a bug filed against Pantheon Files and only
makes sense in the context of the ElementaryOS desktop with the
corresponding changes made to Pantheon Files. I perhaps should not
therefore have submitted for merging into Plank? I was not aware (being
relatively new to ElementaryOS development) that there was another trunk
(lp:pantheon-dock) that this perhaps should have been based on.

The bug could be fixed without altering Plank/Pantheon-Dock by having a
Files daemon running in the background all the time to serve up the
bookmark list to the Files launcher when Files is not running but that has
its own complications.

Its not a particularly important bug although it is moderately useful to be
open Files straight into a bookmarked directory using the Dock. So its not
a disaster if the branch is rejected - the corresponding Files branch is
not accepted yet anyway!

Re the missing .pot file: Sorry about that, it wasn't intentional.

On 23 January 2014 11:48, Rico Tzschichholz <email address hidden> wrote:

> Don't just think about dockitems which point to desktop-files. Also
> copying and adjusting a desktop-file isn't actually comfortable and will
> also prevent you from receiving changes/update if the original system's
> desktop-file gets altered.
> --
> https://code.launchpad.net/~jeremywootten/plank/fix-1063913/+merge/202751
> You are the owner of lp:~jeremywootten/plank/fix-1063913.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

Unmerged revisions

950. By Jeremy Wootten on 2014-01-22

Update quicklist when bookmarks change even if menu not opened - required changes to pantheon-files as well

949. By Jeremy Wootten on 2014-01-18

Save quicklist labels and uris in DockItemPreferences file

=== modified file 'lib/Items/ApplicationDockItem.vala'
--- lib/Items/ApplicationDockItem.vala	2014-01-21 12:42:02 +0000
+++ lib/Items/ApplicationDockItem.vala	2014-01-22 21:15:30 +0000
@@ -390,16 +390,10 @@
 			}
 			
 #if HAVE_DBUSMENU
-			if (Quicklist != null) {
-				items.add (new SeparatorMenuItem ());
-				
-				var dm_root = Quicklist.get_root ();
-				if (dm_root != null) {
-					Logger.verbose ("%i quicklist menuitems for %s", dm_root.get_children ().length (), Text);
-					foreach (var menuitem in dm_root.get_children ())
-						items.add (Quicklist.menuitem_get (menuitem));
-				}
-			}
+			if (Quicklist != null)
+				add_items_from_quicklist (ref items);
+			else
+				add_items_from_preferences (ref items);
 #endif
 			
 			if (!is_window () && actions.size > 0) {
@@ -440,6 +434,73 @@
 			return items;
 		}
 		
+#if HAVE_DBUSMENU
+		void add_items_from_quicklist (ref ArrayList<Gtk.MenuItem> items) {
+			var dm_root = Quicklist.get_root ();
+			if (dm_root != null) {
+				var n_children = dm_root.get_children ().length ();
+				Logger.verbose ("%u quicklist menuitems for %s", n_children , Text);
+				if (n_children > 0)
+					items.add (new SeparatorMenuItem ());
+
+				foreach (Dbusmenu.Menuitem menuitem in dm_root.get_children ())
+					items.add (Quicklist.menuitem_get (menuitem));
+
+				//update_preferences_from_quicklist ();
+
+			} else 
+				add_items_from_preferences (ref items);
+		}
+
+		void update_preferences_from_quicklist () {
+			var dm_root = Quicklist.get_root ();
+			if (dm_root != null) {
+				string ql_uris = "";
+				string ql_labels = "";
+				foreach (Dbusmenu.Menuitem menuitem in dm_root.get_children ()) {
+					if (menuitem.property_exist ("uri")) {
+					/* Add label and uri to quicklist strings for saving in Preferences*/
+						if (ql_uris.length > 0)
+							ql_uris+= ";;";
+
+						ql_uris+= menuitem.property_get ("uri");
+
+						if (ql_labels.length > 0)
+							ql_labels+= ";;";
+
+						ql_labels+= menuitem.property_get ("label");
+					}
+				}
+				Prefs.QuicklistUris = ql_uris;
+				Prefs.QuicklistLabels = ql_labels;
+			}
+		}
+
+		void add_items_from_preferences (ref ArrayList<Gtk.MenuItem> items) {
+			string[] uris = Prefs.QuicklistUris.split (";;");
+			string[] labels = Prefs.QuicklistLabels.split (";;");
+			if (uris.length == labels.length && uris.length > 0) {
+				items.add (new SeparatorMenuItem ());
+				for (int i = 0; i < uris.length; i++) {
+					if (uris[i] == null)
+						continue;
+
+					var uri = uris[i];
+					var label = labels[i];
+					var item = create_menu_item (label, null, true);
+					item.activate.connect (() => {
+						var app = File.new_for_uri (Prefs.Launcher);
+						File[] files = new File [1];
+						files [0] = File.new_for_uri (uri);
+						Services.System.launch_with_files (app, files);
+					});
+
+					items.add (item);
+				}
+			}
+		}
+#endif
+
 		/**
 		 * {@inheritDoc}
 		 */
@@ -765,14 +826,19 @@
 				else if (prop_key == "quicklist") {
 					/* The value is the object path of the dbusmenu */
 					var dbus_path = prop_value.get_string ();
-					// Make sure we don't update our Quicklist instance if isn't necessary
-					if (Quicklist == null || Quicklist.dbus_object != dbus_path)
-						if (dbus_path != "") {
-							Logger.verbose ("Loading dynamic quicklists for %s (%s)", Text, sender_name);
-							Quicklist = new DbusmenuGtk.Client (sender_name, dbus_path);
-						} else {
-							Quicklist = null;
-						}
+					/* Update Quicklist whenever it changes in order that preferences
+					 * are updated even if the menu is not shown, ensuring persistence
+					 * of the quicklist when app is not running */
+					if (dbus_path != "") {
+						Logger.verbose ("Loading dynamic quicklists for %s (%s)", Text, sender_name);
+						Quicklist = new DbusmenuGtk.Client (sender_name, dbus_path);
+					} else
+						Quicklist = null;
+					/* wait to make sure remote menu is available */
+					Timeout.add (100, () => {
+						update_preferences_from_quicklist (); 
+						return false;
+					});
 				}
 #endif
 			}

=== modified file 'lib/Items/DockItemPreferences.vala'
--- lib/Items/DockItemPreferences.vala	2013-04-11 12:16:34 +0000
+++ lib/Items/DockItemPreferences.vala	2014-01-22 21:15:30 +0000
@@ -26,6 +26,10 @@
 	{
 		[Description(nick = "launcher", blurb = "The uri for this item.")]
 		public string Launcher { get; set; }
+		[Description(nick = "quicklisturis", blurb = "The quicklist uris for this item.")]
+		public string QuicklistUris { get; set; default = ""; }
+		[Description(nick = "quicklistlabels", blurb = "The quicklist labels for this item.")]
+		public string QuicklistLabels { get; set; default = ""; }
 		
 		/**
 		 * {@inheritDoc}
@@ -58,6 +62,8 @@
 		protected override void reset_properties ()
 		{
 			Launcher = "";
+			QuicklistUris = "";
+			QuicklistLabels = "";
 		}
 		
 		/**

=== removed file 'po/plank.pot'
--- po/plank.pot	2012-10-13 09:09:54 +0000
+++ po/plank.pot	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-13 11:09+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/plank.desktop.in.h:1
-msgid "Plank. Stupidly simple."
-msgstr ""
-
-#: ../lib/Items/ApplicationDockItem.vala:326
-#: ../lib/Items/FileDockItem.vala:251 ../lib/Items/FileDockItem.vala:269
-msgid "_Keep in Dock"
-msgstr ""
-
-#: ../lib/Items/ApplicationDockItem.vala:336
-msgid "Unma_ximize"
-msgstr ""
-
-#: ../lib/Items/ApplicationDockItem.vala:340
-msgid "Ma_ximize"
-msgstr ""
-
-#: ../lib/Items/ApplicationDockItem.vala:345
-msgid "_Close All"
-msgstr ""
-
-#: ../lib/Items/FileDockItem.vala:256
-msgid "_Open in File Browser"
-msgstr ""
-
-#: ../lib/Items/FileDockItem.vala:274
-msgid "_Open"
-msgstr ""
-
-#: ../lib/Items/FileDockItem.vala:278
-msgid "Open Containing _Folder"
-msgstr ""
-
-#: ../lib/Items/PlankDockItem.vala:79
-msgid "Get _Help Online..."
-msgstr ""
-
-#: ../lib/Items/PlankDockItem.vala:83
-msgid "_Translate This Application..."
-msgstr ""