Merge lp:~3v1n0/unity/ups-empty-menu into lp:unity

[Marco Trevisan (Treviño)]

PanelService: show a menu with an Activate menu item for entries without menu

There are some (badly written, imho) applications that have a menubar containing entries that can be clicked directly... Unity does not support this, but to allow these menus to work I added a simple menu entry that can be activated, when an IndicatorEntry has not a menu (but just a label).

Not to break the contract where an indicator should have a menu, and to allow menus scrubbing, this entry can be activated only using a new menu entry we added.

[Andrea Azzarone (azzar1)]

LGTM. Works here.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/199/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/199/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/204/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/204/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/205/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/205/console

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/unity/ups-empty-menu]

2924. By Marco Trevisan (Treviño) on 2012-12-05

CMakeLists: Look for pkgconfig before getting variables, or it won't work the first time

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-29 12:53:42 +0000
+++ CMakeLists.txt	2012-12-05 01:17:24 +0000
@@ -130,6 +130,10 @@
 set (VERSION "${UNITY_VERSION}")
 set (BUILDDIR "${CMAKE_BINARY_DIR}")
 
+find_package (PkgConfig)
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE INDICATORDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE INDICATORICONDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
 #
@@ -210,7 +214,6 @@
   )
 endif ()
 
-find_package (PkgConfig)
 pkg_check_modules (CACHED_UNITY_DEPS REQUIRED ${UNITY_PLUGIN_DEPS})
 pkg_check_modules (CACHED_UNITY_PRIVATE_DEPS REQUIRED ${UNITY_PROTOCOL_PRIVATE_DEPS})
 add_subdirectory(unity-shared)

=== modified file 'config.h.cmake'
--- config.h.cmake	2011-02-27 16:57:57 +0000
+++ config.h.cmake	2012-12-05 01:17:24 +0000
@@ -10,5 +10,7 @@
 #cmakedefine TESTVALADIR "@TESTVALADIR@"
 #cmakedefine TESTDATADIR "@TESTDIRDIR@"
 #cmakedefine GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+#cmakedefine INDICATORDIR "@INDICATORDIR@"
+#cmakedefine INDICATORICONDIR "@INDICATORICONDIR@"
 
 #endif // CONFIG_H

=== modified file 'manual-tests/PanelService.txt'
--- manual-tests/PanelService.txt	2012-07-12 12:03:05 +0000
+++ manual-tests/PanelService.txt	2012-12-05 01:17:24 +0000
@@ -13,3 +13,20 @@
   This means that the menus and indicators must not be removed and readded
   from the unity panel.
   For more info see bug #937119
+
+
+Panel Service shows entries with no menus
+-----------------------------------------
+
+Setup:
+
+Actions:
+#. Start with a clean screen
+#. Save this python script and run it http://pastebin.ubuntu.com/1395885/
+#. Make sure the "Simple Menu" window is focused
+#. Move the mouse pointer over the panel
+
+Expected Result:
+  The panel should contains three menu entries: "File", "HiddenExit" and "Other",
+  clicking over "HiddenExit" should bring up a menu with a single entry named
+  "Activate". Clicking on it should close the "Simple Menu" application.
\ No newline at end of file

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-11-06 18:19:09 +0000
+++ po/POTFILES.in	2012-12-05 01:17:24 +0000
@@ -31,6 +31,7 @@
 plugins/unityshell/unityshell.xml.in
 shortcuts/ShortcutHintPrivate.cpp
 shortcuts/ShortcutView.cpp
+services/panel-service.c
 unity-shared/DashStyle.cpp
 unity-shared/SearchBar.cpp
 gnome/50-unity-launchers.xml.in

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2012-11-26 16:09:53 +0000
+++ services/CMakeLists.txt	2012-12-05 01:17:24 +0000
@@ -1,12 +1,20 @@
 #
 # Panel Service
 #
+
+set(UNITY_PANEL_SERVICE_DEPS
+    atk
+    atk-bridge-2.0
+    gio-2.0
+    gobject-2.0
+    gthread-2.0
+    gtk+-3.0>=3.3
+    indicator3-0.4>=0.4.90
+    x11
+)
+
 find_package(PkgConfig)
-
-pkg_check_modules(SERVICE_DEPS REQUIRED gtk+-3.0>=3.3 gobject-2.0 gio-2.0 gthread-2.0 indicator3-0.4>=0.4.90 x11 atk-bridge-2.0)
-
-execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)
+pkg_check_modules(SERVICE_DEPS REQUIRED ${UNITY_PANEL_SERVICE_DEPS})
 
 set(PANEL_SOURCES
     panel-a11y.c
@@ -33,14 +41,12 @@
   COMMENT "Generating marshallers")
 
 set(CFLAGS
-    "${SERVICE_DEPS_CFLAGS}"
+    ${SERVICE_DEPS_CFLAGS}
     ${SERVICE_DEPS_CFLAGS_OTHER}
-    "-DINDICATORDIR=\"${_indicatordir}\""
-    "-DINDICATORICONDIR=\"${_iconsdir}\""
     "-Werror -Wall"
     )
 add_definitions(${CFLAGS})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR})
 
 set(LIBS ${SERVICE_DEPS_LIBRARIES})
 link_libraries(${LIBS})

=== modified file 'services/panel-main.c'
--- services/panel-main.c	2012-12-04 00:33:01 +0000
+++ services/panel-main.c	2012-12-05 01:17:24 +0000
@@ -22,6 +22,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
+#include "config.h"
 #include "panel-a11y.h"
 #include "panel-service.h"
 

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2012-12-04 00:33:01 +0000
+++ services/panel-service.c	2012-12-05 01:17:24 +0000
@@ -19,10 +19,7 @@
  *              Marco Trevisan (Treviño) <[e-mail]>
  */
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include "config.h"
 #include "panel-marshal.h"
 #include "panel-service.h"
 
@@ -30,6 +27,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
+#include <glib/gi18n-lib.h>
 
 #include <X11/extensions/XInput2.h>
 #include <X11/XKBlib.h>
@@ -836,14 +834,12 @@
     {
       g_signal_connect (entry->label, "notify::label",
                         G_CALLBACK (on_entry_property_changed), object);
-
       g_signal_connect (entry->label, "notify::sensitive",
                         G_CALLBACK (on_entry_property_changed), object);
       g_signal_connect (entry->label, "show",
                         G_CALLBACK (on_entry_changed), object);
       g_signal_connect (entry->label, "hide",
                         G_CALLBACK (on_entry_changed), object);
-
     }
   if (GTK_IS_IMAGE (entry->image))
     {
@@ -859,14 +855,12 @@
                         G_CALLBACK (on_entry_property_changed), object);
       g_signal_connect (entry->image, "notify::stock",
                         G_CALLBACK (on_entry_property_changed), object);
-
       g_signal_connect (entry->image, "notify::sensitive",
                         G_CALLBACK (on_entry_property_changed), object);
       g_signal_connect (entry->image, "show",
                         G_CALLBACK (on_entry_changed), object);
       g_signal_connect (entry->image, "hide",
                         G_CALLBACK (on_entry_changed), object);
-
     }
 
   notify_object (object);
@@ -1634,7 +1628,18 @@
 menu_deactivated (GtkWidget *menu)
 {
   g_signal_handlers_disconnect_by_func (menu, menu_deactivated, NULL);
-  gtk_widget_destroy (menu);
+
+  if (g_object_is_floating (menu))
+    g_object_ref_sink (menu);
+
+  g_object_unref (menu);
+}
+
+static void
+menuitem_activated (GtkWidget *menuitem, IndicatorObjectEntry *entry)
+{
+  IndicatorObject *object = get_entry_parent_indicator (entry);
+  indicator_object_entry_activate (object, entry, CurrentTime);
 }
 
 static void
@@ -1677,17 +1682,17 @@
 
   if (entry != NULL)
     {
-      if (xid > 0)
-        {
-          indicator_object_entry_activate_window (object, entry, xid, CurrentTime);
-        }
-      else
-        {
-          indicator_object_entry_activate (object, entry, CurrentTime);
-        }
-
       if (GTK_IS_MENU (entry->menu))
         {
+          if (xid > 0)
+            {
+              indicator_object_entry_activate_window (object, entry, xid, CurrentTime);
+            }
+          else
+            {
+              indicator_object_entry_activate (object, entry, CurrentTime);
+            }
+
           priv->last_menu = entry->menu;
         }
       else
@@ -1696,10 +1701,17 @@
              rest of the code and to keep scrubbing fluidly, we'll create a
              stub menu for the duration of this scrub. */
           priv->last_menu = GTK_MENU (gtk_menu_new ());
+
+          GtkWidget *menu_item = gtk_menu_item_new_with_label (_("Activate"));
+          gtk_menu_shell_append (GTK_MENU_SHELL (priv->last_menu), menu_item);
+          gtk_widget_show (menu_item);
+
           g_signal_connect (priv->last_menu, "deactivate",
                             G_CALLBACK (menu_deactivated), NULL);
           g_signal_connect (priv->last_menu, "destroy",
                             G_CALLBACK (gtk_widget_destroyed), &priv->last_menu);
+          g_signal_connect (menu_item, "activate",
+                            G_CALLBACK (menuitem_activated), entry);
         }
 
       GtkWidget *top_widget = gtk_widget_get_toplevel (GTK_WIDGET (priv->last_menu));

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-12-04 15:25:01 +0000
+++ tests/CMakeLists.txt	2012-12-05 01:17:24 +0000
@@ -28,8 +28,6 @@
      "-g"
      "-DTESTDATADIR=\"${TESTDATADIR}\""
      "-DGETTEXT_PACKAGE=\"unity\""
-     "-DINDICATORDIR=\"${CMAKE_BINARY_DIR}/tests\""
-     "-DINDICATORICONDIR=\"${CMAKE_BINARY_DIR}/tests\""
      "-I${CMAKE_CURRENT_BINARY_DIR}"
      )
 add_definitions (${CFLAGS})