Merge lp:~shippo/plank/fix-1251625 into lp:plank

[Peter Feichtinger]

This fixes Bug #1251625 (partially).

There are two related changes in this branch which could be merged individually, but I think they belong together:
 * First, there is now a new preference setting that, when enabled, causes application items to show their menu when left clicked, instead of bringing all windows up. This way a window to be brought up can be selected from the menu without having to right click.
 * Second, the application item menu is changed to indicate the currently active window (in bold font) and allow it to be minimized by selecting it, and to indicate minimized windows by dimming their items slightly.

There is no window preview as requested in the original bug report, but I think this change makes the dock way more usable (and doesn't change the default behavior when disabled, aside from the new menu item styles).

[Rico Tzschichholz (ricotz)]

Overall this looks good, besides some minor code-style issues.

I would prefer if the special left-click menu would *only* contain the window-listing.

Also making it *2* commits is sufficient:
 * the menuitem-style change
 * the new menu including its requirements

- don't be lazy with variable names like "lbl" -> "label"
- prefix connectors in if-conditions in case of line-breaks

review: Needs Information

[Peter Feichtinger (shippo)]

Hm, I don't know how to merge several commits.
Should I just revert the branch and make new commits, or is there some clever way to achieve that?

You are right concerning the menu, I will try and exclude the other entries.
And I just realized that I will then need new commits anyway :-)

As for the coding style, I followed what was already there as closely as possible.
If you want me to break consistency I will, but I'd rather not.

[Peter Feichtinger (shippo)]

Never mind about the coding style, I see what you mean.

[Peter Feichtinger (shippo)]

So, I changed the implementation but now my local branch and the one on here have diverged, because I uncommitted the changed in my local branch before making the requested changes.
How do I fix this, should I just force push (by passing --override, I don't know if this will work anyway), or is there a smarter move?

[Rico Tzschichholz (ricotz)]

Yes, you need to use "bzr push --overwrite lp:~shippo/plank/fix-1251625" to push your altered branch.

[lp:~shippo/plank/fix-1251625]

1589. By Peter Feichtinger on 2017-03-03

Add support for switching windows when an application item is clicked.

* It should be possible for a DockItem to show a menu based on the
  current number of open windows, so a new method in DockItem is used in
  DockWindow to check whether an item wants to show a menu when any
  button is pressed.
* ApplicationDockItem is changed to show the window menu on left click,
  when more than one window is open for the application.
* A new preference switch for using the window menu is added: when
  'Use Window Menu' is enabled, left clicking on an item with multiple
  windows will open the item menu, allowing selection of only one window
  to show. When disabled, clicking has the default behavior.

1590. By Peter Feichtinger on 2017-03-03

Add indication for active and minimized windows and allow mimizing.

This adds an indication in the window menu for the currently active
window, as well as for minimized windows. The active window is minimized
when selected.

[Peter Feichtinger (shippo)]

Ooh nice, launchpad already put my changed branch here :-)

So, I implemented the changes you requested:
* The menu shown when multiple windows are open only contains the windows. This is done by passing the button and modifiers to get_menu_items, which presumably breaks ABI compatibility.
* I double checked that I followed the coding style, I hope this time I really did ;-)

[lp:~shippo/plank/fix-1251625]

1591. By Peter Feichtinger on 2017-03-14

Fix window menu showing with only one item.

[Peter Feichtinger (shippo)]

Do I need to resubmit?

review: Needs Resubmitting

[Rico Tzschichholz (ricotz)]

Sorry, I still have not get around to take a closer look at this. So no need for action from your side yet.

Unmerged revisions

1591. By Peter Feichtinger on 2017-03-14

Fix window menu showing with only one item.

1590. By Peter Feichtinger on 2017-03-03

Add indication for active and minimized windows and allow mimizing.

This adds an indication in the window menu for the currently active
window, as well as for minimized windows. The active window is minimized
when selected.

1589. By Peter Feichtinger on 2017-03-03

Add support for switching windows when an application item is clicked.

* It should be possible for a DockItem to show a menu based on the
  current number of open windows, so a new method in DockItem is used in
  DockWindow to check whether an item wants to show a menu when any
  button is pressed.
* ApplicationDockItem is changed to show the window menu on left click,
  when more than one window is open for the application.
* A new preference switch for using the window menu is added: when
  'Use Window Menu' is enabled, left clicking on an item with multiple
  windows will open the item menu, allowing selection of only one window
  to show. When disabled, clicking has the default behavior.

=== modified file 'data/net.launchpad.plank.gschema.xml.in.in'
--- data/net.launchpad.plank.gschema.xml.in.in	2016-03-09 08:51:55 +0000
+++ data/net.launchpad.plank.gschema.xml.in.in	2017-03-14 12:02:51 +0000
@@ -128,6 +128,11 @@
 			<_summary>Dock unhide delay</_summary>
 			<_description>Length of the delay before unhiding the dock, in milliseconds.</_description>
 		</key>
+		<key name="use-window-menu" type="b">
+			<default>false</default>
+			<_summary>Use window menu when multiple windows are open</_summary>
+			<_description>If true, clicking on an item with multiple windows will show the menu instead of activating all windows.</_description>
+		</key>
 		<key name="zoom-enabled" type="b">
 			<default>false</default>
 			<_summary>Zoom dock items when hovered</_summary>
 
=== modified file 'data/ui/preferences.ui'
--- data/ui/preferences.ui	2016-03-09 08:51:55 +0000
+++ data/ui/preferences.ui	2017-03-14 12:02:51 +0000
@@ -554,6 +554,30 @@
               </packing>
             </child>
             <child>
+              <object class="GtkLabel" id="l_window_menu">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Use Window Menu:</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="sw_window_menu">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
               <placeholder/>
             </child>
             <child>
 
=== modified file 'docklets/Clippy/ClippyDockItem.vala'
--- docklets/Clippy/ClippyDockItem.vala	2017-02-09 12:53:29 +0000
+++ docklets/Clippy/ClippyDockItem.vala	2017-03-14 12:02:51 +0000
@@ -158,7 +158,7 @@
 			return AnimationType.NONE;
 		}
 		
-		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items ()
+		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items (PopupButton button, Gdk.ModifierType modifiers)
 		{
 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
 			
 
=== modified file 'docklets/Clock/ClockDockItem.vala'
--- docklets/Clock/ClockDockItem.vala	2016-01-30 16:54:55 +0000
+++ docklets/Clock/ClockDockItem.vala	2017-03-14 12:02:51 +0000
@@ -246,7 +246,7 @@
 			render_file_onto_context (cr, current_theme + "/clock-frame.svg", radius * 2);
 		}
 		
-		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items ()
+		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items (PopupButton button, Gdk.ModifierType modifiers)
 		{
 			unowned ClockPreferences prefs = (ClockPreferences) Prefs;
 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
 
=== modified file 'docklets/Trash/TrashDockItem.vala'
--- docklets/Trash/TrashDockItem.vala	2017-03-05 09:09:39 +0000
+++ docklets/Trash/TrashDockItem.vala	2017-03-14 12:02:51 +0000
@@ -159,7 +159,7 @@
 			return trashed;
 		}
 		
-		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items ()
+		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items (PopupButton button, Gdk.ModifierType modifiers)
 		{
 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
 			
 
=== modified file 'lib/DockPreferences.vala'
--- lib/DockPreferences.vala	2016-03-04 15:54:48 +0000
+++ lib/DockPreferences.vala	2017-03-14 12:02:51 +0000
@@ -30,6 +30,9 @@
 		public const int MIN_ICON_ZOOM = 100;
 		public const int MAX_ICON_ZOOM = 200;
 		
+		[Description(nick = "use-window-menu", blurb = "Whether to use a menu to switch between multiple windows of an application instead of showing all at once.")]
+		public bool UseWindowMenu { get; set; }
+		
 		[Description(nick = "current-workspace-only", blurb = "Whether to show only windows of the current workspace.")]
 		public bool CurrentWorkspaceOnly { get; set; }
 		
 
=== modified file 'lib/Items/ApplicationDockItem.vala'
--- lib/Items/ApplicationDockItem.vala	2017-02-09 12:53:29 +0000
+++ lib/Items/ApplicationDockItem.vala	2017-03-14 12:02:51 +0000
@@ -38,6 +38,9 @@
 		
 		private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
 		
+		private const Gdk.ModifierType ANY_MODIFIER =
+			Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK | Gdk.ModifierType.MOD1_MASK;
+		
 		/**
 		 * Signal fired when the item's 'keep in dock' menu item is pressed.
 		 */
@@ -393,9 +396,27 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items ()
+		public override bool show_menu (PopupButton button, Gdk.ModifierType modifiers)
+		{
+			bool useWindowMenu = get_dock ().prefs.UseWindowMenu;
+			if (button == PopupButton.LEFT && (modifiers & ANY_MODIFIER) == 0 && App != null && useWindowMenu) {
+				var count = 0;
+				foreach (var view in App.get_windows ()) {
+					unowned Bamf.Window? window = (view as Bamf.Window);
+					if (window != null && window.get_transient () == null && ++count > 1)
+						return true;
+				}
+			}
+			return base.show_menu (button, modifiers);
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items (PopupButton button, Gdk.ModifierType modifiers)
 		{
 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
+			var event_time = Gtk.get_current_event_time ();
 			
 			GLib.List<unowned Bamf.View>? windows = null;
 			if (App != null)
@@ -405,51 +426,52 @@
 			if (windows != null)
 				window_count = windows.length ();
 			
-			unowned DefaultApplicationDockItemProvider? default_provider = (Container as DefaultApplicationDockItemProvider);
-			if (default_provider != null
-				&& !default_provider.Prefs.LockItems
-				&& !is_window ()) {
-				var item = new Gtk.CheckMenuItem.with_mnemonic (_("_Keep in Dock"));
-				item.active = !(this is TransientDockItem);
-				item.activate.connect (() => pin_launcher ());
-				items.add (item);
-			}
-			
-			var event_time = Gtk.get_current_event_time ();
-			if (is_running () && window_count > 0) {
-				var item = create_menu_item ((window_count > 1 ? _("_Close All") : _("_Close")), "window-close-symbolic;;window-close");
-				item.activate.connect (() => WindowControl.close_all (App, event_time));
-				items.add (item);
-			}
-			
+			if (button == PopupButton.RIGHT) {
+				unowned DefaultApplicationDockItemProvider? default_provider = (Container as DefaultApplicationDockItemProvider);
+				if (default_provider != null
+					&& !default_provider.Prefs.LockItems
+					&& !is_window ()) {
+					var item = new Gtk.CheckMenuItem.with_mnemonic (_("_Keep in Dock"));
+					item.active = !(this is TransientDockItem);
+					item.activate.connect (() => pin_launcher ());
+					items.add (item);
+				}
+				
+				if (is_running () && window_count > 0) {
+					var item = create_menu_item ((window_count > 1 ? _("_Close All") : _("_Close")), "window-close-symbolic;;window-close");
+					item.activate.connect (() => WindowControl.close_all (App, event_time));
+					items.add (item);
+				}
+				
 #if HAVE_DBUSMENU
-			if (Quicklist != null) {
-				if (items.size > 0)
-					items.add (new Gtk.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) {
+					if (items.size > 0)
+						items.add (new Gtk.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));
+					}
 				}
-			}
 #endif
-			
-			if (!is_window () && actions.size > 0) {
-				if (items.size > 0)
-					items.add (new Gtk.SeparatorMenuItem ());
 				
-				foreach (var s in actions) {
-					var values = actions_map.get (s).split (";;");
+				if (!is_window () && actions.size > 0) {
+					if (items.size > 0)
+						items.add (new Gtk.SeparatorMenuItem ());
 					
-					var item = create_menu_item (s, values[1], true);
-					item.activate.connect (() => {
-						try {
-							AppInfo.create_from_commandline (values[0], null, AppInfoCreateFlags.NONE).launch (null, null);
-						} catch { }
-					});
-					items.add (item);
+					foreach (var s in actions) {
+						var values = actions_map.get (s).split (";;");
+						
+						var item = create_menu_item (s, values[1], true);
+						item.activate.connect (() => {
+							try {
+								AppInfo.create_from_commandline (values[0], null, AppInfoCreateFlags.NONE).launch (null, null);
+							} catch { }
+						});
+						items.add (item);
+					}
 				}
 			}
 			
@@ -472,10 +494,21 @@
 					else 
 						window_item = create_literal_menu_item (window_name, Icon);
 					
-					if (window.is_active ())
-						window_item.set_sensitive (false);
-					else
+					if (window.is_active ()) {
+						window_item.activate.connect (() => WindowControl.minimize_window (window, event_time));
+						
+						unowned Gtk.Label? label = (window_item.get_child () as Gtk.Label);
+						if (label != null) {
+							Pango.AttrList attrs = new Pango.AttrList ();
+							attrs.change (Pango.attr_weight_new (Pango.Weight.BOLD));
+							label.set_attributes (attrs);
+						}
+					} else {
 						window_item.activate.connect (() => WindowControl.focus_window (window, event_time));
+						
+						if (WindowControl.is_window_minimized (window))
+							window_item.set_opacity (0.5);
+					}
 					
 					items.add (window_item);
 				}
 
=== modified file 'lib/Items/DockElement.vala'
--- lib/Items/DockElement.vala	2017-02-09 12:53:29 +0000
+++ lib/Items/DockElement.vala	2017-03-14 12:02:51 +0000
@@ -54,11 +54,6 @@
 		public bool IsVisible { get; set; default = true; }
 		
 		/**
-		 * The buttons this item shows popup menus for.
-		 */
-		public PopupButton Button { get; protected set; default = PopupButton.RIGHT; }
-		
-		/**
 		 * The animation to show for the item's last click event.
 		 */
 		public AnimationType ClickedAnimation { get; protected set; default = AnimationType.NONE; }
@@ -211,9 +206,11 @@
 		/**
 		 * Returns a list of the item's menu items.
 		 *
+		 * @param button The button that is pressed.
+		 * @param modifiers The modifiers pressed.
 		 * @return the item's menu items
 		 */
-		public virtual Gee.ArrayList<Gtk.MenuItem> get_menu_items ()
+		public virtual Gee.ArrayList<Gtk.MenuItem> get_menu_items (PopupButton button, Gdk.ModifierType modifiers)
 		{
 			return new Gee.ArrayList<Gtk.MenuItem> ();
 		}
 
=== modified file 'lib/Items/DockItem.vala'
--- lib/Items/DockItem.vala	2016-06-01 09:48:44 +0000
+++ lib/Items/DockItem.vala	2017-03-14 12:02:51 +0000
@@ -600,6 +600,18 @@
 		}
 		
 		/**
+		 * Check whether the menu should be shown.
+		 * 
+		 * @param button The button that is pressed.
+		 * @param modifiers The modifiers pressed.
+		 * @return Whether the menu should be shown.
+		 */
+		public virtual bool show_menu (PopupButton button, Gdk.ModifierType modifiers)
+		{
+			return button == PopupButton.RIGHT;
+		}
+		
+		/**
 		 * Copy all property value of this dockitem instance to target instance.
 		 *
 		 * @param target the dockitem to copy the values to
 
=== modified file 'lib/Items/FileDockItem.vala'
--- lib/Items/FileDockItem.vala	2017-02-09 12:53:29 +0000
+++ lib/Items/FileDockItem.vala	2017-03-14 12:02:51 +0000
@@ -96,8 +96,6 @@
 			
 			// pop up the dir contents on a left click too
 			if (OwnedFile.query_file_type (0) == FileType.DIRECTORY) {
-				Button = PopupButton.RIGHT | PopupButton.LEFT;
-				
 				try {
 					dir_monitor = OwnedFile.monitor_directory (0);
 					dir_monitor.changed.connect (handle_dir_changed);
@@ -259,7 +257,16 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items ()
+		public override bool show_menu (PopupButton button, Gdk.ModifierType modifiers)
+		{
+			return button == PopupButton.RIGHT
+				|| (OwnedFile.query_file_type (0) == FileType.DIRECTORY && button == PopupButton.LEFT);
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items (PopupButton button, Gdk.ModifierType modifiers)
 		{
 			if (OwnedFile.query_file_type (0) == FileType.DIRECTORY)
 				return get_dir_menu_items ();
 
=== modified file 'lib/Items/PlankDockItem.vala'
--- lib/Items/PlankDockItem.vala	2015-11-14 14:37:32 +0000
+++ lib/Items/PlankDockItem.vala	2017-03-14 12:02:51 +0000
@@ -66,7 +66,7 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items ()
+		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items (PopupButton button, Gdk.ModifierType modifiers)
 		{
 			var items = new Gee.ArrayList<Gtk.MenuItem> ();
 			
 
=== modified file 'lib/Services/WindowControl.vala'
--- lib/Services/WindowControl.vala	2016-11-05 19:48:09 +0000
+++ lib/Services/WindowControl.vala	2017-03-14 12:02:51 +0000
@@ -139,6 +139,13 @@
 			return pbuf;
 		}
 		
+		public static bool is_window_minimized (Bamf.Window window)
+		{
+			Wnck.Screen.get_default ();
+			unowned Wnck.Window w = Wnck.Window.@get (window.get_xid ());
+			return w.is_minimized ();
+		}
+		
 		public static bool has_maximized_window (Bamf.Application app)
 		{
 			Wnck.Screen.get_default ();
@@ -251,6 +258,19 @@
 			center_and_focus_window (w, event_time);
 		}
 		
+		public static void minimize_window (Bamf.Window window, uint32 event_time)
+		{
+			Wnck.Screen.get_default ();
+			unowned Wnck.Window w = Wnck.Window.@get (window.get_xid ());
+			
+			warn_if_fail (w != null);
+			
+			if (w == null)
+				return;
+			
+			w.minimize ();
+		}
+		
 		static int find_active_xid_index (Array<uint32>? xids)
 		{
 			var i = 0;
 
=== modified file 'lib/Widgets/DockWindow.vala'
--- lib/Widgets/DockWindow.vala	2016-11-04 19:03:20 +0000
+++ lib/Widgets/DockWindow.vala	2017-03-14 12:02:51 +0000
@@ -606,14 +606,14 @@
 			
 			if ((button & PopupButton.RIGHT) != 0
 				&& (item == null || (event.state & Gdk.ModifierType.CONTROL_MASK) != 0)) {
-				menu_items = Factory.item_factory.get_item_for_dock ().get_menu_items ();
+				menu_items = Factory.item_factory.get_item_for_dock ().get_menu_items (button, event.state);
 				if ((event.state & Gdk.ModifierType.MOD1_MASK) != 0
 					&& (event.state & Gdk.ModifierType.SHIFT_MASK) != 0)
 					menu_items.add_all (get_dock_debug_menu_items (controller));
 				set_hovered_provider (null);
 				set_hovered (null);
-			} else if (item != null && item.is_valid () && (item.Button & button) != 0) {
-				menu_items = item.get_menu_items ();
+			} else if (item != null && item.is_valid () && item.show_menu (button, event.state)) {
+				menu_items = item.get_menu_items (button, event.state);
 				if ((event.state & Gdk.ModifierType.MOD1_MASK) != 0
 					&& (event.state & Gdk.ModifierType.SHIFT_MASK) != 0)
 					menu_items.add_all (get_item_debug_menu_items (item));
 
=== modified file 'lib/Widgets/PreferencesWindow.vala'
--- lib/Widgets/PreferencesWindow.vala	2016-03-09 08:51:55 +0000
+++ lib/Widgets/PreferencesWindow.vala	2017-03-14 12:02:51 +0000
@@ -76,6 +76,8 @@
 		Gtk.Switch sw_pressure_reveal;
 		[GtkChild]
 		Gtk.Switch sw_zoom_enabled;
+		[GtkChild]
+		Gtk.Switch sw_window_menu;
 		
 		[GtkChild]
 		Gtk.IconView view_docklets;
@@ -180,6 +182,9 @@
 			case "ZoomPercent":
 				adj_zoom_percent.value = prefs.ZoomPercent;
 				break;
+			case "UseWindowMenu":
+				sw_window_menu.set_active (prefs.UseWindowMenu);
+				break;
 			// Ignored settings
 			case "DockItems":
 				break;
@@ -276,6 +281,11 @@
 			}
 		}
 		
+		void window_menu_toggled (GLib.Object widget, ParamSpec param)
+		{
+			prefs.UseWindowMenu = ((Gtk.Switch) widget).get_active ();
+		}
+		
 		void iconsize_changed (Gtk.Adjustment adj)
 		{
 			prefs.IconSize = (int) adj.value;
@@ -328,6 +338,7 @@
 			sw_zoom_enabled.notify["active"].connect (zoom_enabled_toggled);
 			cb_alignment.changed.connect (alignment_changed);
 			cb_items_alignment.changed.connect (items_alignment_changed);
+			sw_window_menu.notify["active"].connect (window_menu_toggled);
 		}
 		
 		void disconnect_signals ()
@@ -352,6 +363,7 @@
 			sw_zoom_enabled.notify["active"].disconnect (zoom_enabled_toggled);
 			cb_alignment.changed.disconnect (alignment_changed);
 			cb_items_alignment.changed.disconnect (items_alignment_changed);
+			sw_window_menu.notify["active"].disconnect (window_menu_toggled);
 		}
 		
 		void init_dock_tab ()
@@ -401,6 +413,7 @@
 			cb_alignment.active_id = ((int) prefs.Alignment).to_string ();
 			cb_items_alignment.active_id = ((int) prefs.ItemsAlignment).to_string ();
 			cb_items_alignment.sensitive = (prefs.Alignment == Gtk.Align.FILL);
+			sw_window_menu.set_active (prefs.UseWindowMenu);
 		}
 		
 		void init_docklets_tab ()
 
=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2017-02-09 12:53:29 +0000
+++ lib/libplank.symbols	2017-03-14 12:02:51 +0000
@@ -157,7 +157,6 @@
 plank_dock_element_create_menu_item
 plank_dock_element_create_menu_item_with_pixbuf
 plank_dock_element_get_AddTime
-plank_dock_element_get_Button
 plank_dock_element_get_ClickedAnimation
 plank_dock_element_get_Container
 plank_dock_element_get_dock
@@ -184,7 +183,6 @@
 plank_dock_element_reset_buffers
 plank_dock_element_scrolled
 plank_dock_element_set_AddTime
-plank_dock_element_set_Button
 plank_dock_element_set_ClickedAnimation
 plank_dock_element_set_Container
 plank_dock_element_set_HoveredAnimation
@@ -265,6 +263,7 @@
 plank_dock_item_set_Progress
 plank_dock_item_set_ProgressVisible
 plank_dock_item_set_State
+plank_dock_item_show_menu
 plank_dock_item_unset_move_state
 plank_docklet_get_description
 plank_docklet_get_icon
@@ -303,6 +302,7 @@
 plank_dock_preferences_get_TooltipsEnabled
 plank_dock_preferences_get_type
 plank_dock_preferences_get_UnhideDelay
+plank_dock_preferences_get_UseWindowMenu
 plank_dock_preferences_get_ZoomEnabled
 plank_dock_preferences_get_ZoomPercent
 plank_dock_preferences_increase_icon_size
@@ -326,6 +326,7 @@
 plank_dock_preferences_set_Theme
 plank_dock_preferences_set_TooltipsEnabled
 plank_dock_preferences_set_UnhideDelay
+plank_dock_preferences_set_UseWindowMenu
 plank_dock_preferences_set_ZoomEnabled
 plank_dock_preferences_set_ZoomPercent
 plank_dock_renderer_animate_items