Merge lp:~3v1n0/unity/quicklist-markup-support into lp:unity

[Marco Trevisan (Treviño)]

QuicklistMenuItem code cleanup and support for markup text and bold application titles.

In order to fix the bug #899677, as the quicklist uses the pango markup to draw its label, I made the quicklist to always escape the label text by default.
Actually this could have been done also making pango to just draw text, but since the design team asked me to still support the "_" (underscore) to show menu-items accelerators, I had to use this way.

Also, now a quicklist item can use markup only if the related dbusmenuitem has a "unity-use-markup" property that can be set only internally (i.e. it doesn't work if used through libunity) and that currently we only use to make every application name bold (to fix bug #900400).

I've also made a code cleanup of the QuicklistMenuItem* to reduce the code duplication, however I've not changed too much the types used not to change too much what has been already done.

Some basic tests have also been added.

[Tim Penhey (thumper)]

OK, lets make:

  gchar* app_name;
  gchar* tmp;
  tmp = g_markup_escape_text(BamfName(), -1);
  app_name = g_strdup_printf("<b>%s</b>", tmp);
  g_free(tmp);

less C and more C++ :)

#include <sstream>

  glib::String app_name(g_markup_escape_text(BamfName(), -1));
  std::ostringstream sout;
  sout << "<b>" << app_name << "</b>";

  // use sout.str().c_str(); to get a const char*

No need for g_free(app_name).

Why did you remove the texture unreferencing?

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

> less C and more C++ :)
Ok, done!

> Why did you remove the texture unreferencing?

Since the textures are controlled by QuicklistMenuItem I just moved the unreferencing thing from each ~QuicklistMenuItem* to ~QuicklistMenuItem to avoid code duplication.

[Tim Penhey (thumper)]

OK. I'd still like Mirco to look at this though :-)

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Agree.

[Mirco Müller (macslow)]

Looks fine, works as expected, tests pass... good to go!

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'plugins/unityshell/src/BFBLauncherIcon.cpp'
--- plugins/unityshell/src/BFBLauncherIcon.cpp	2011-12-06 16:27:58 +0000
+++ plugins/unityshell/src/BFBLauncherIcon.cpp	2011-12-09 14:48:26 +0000
@@ -72,7 +72,7 @@
     ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST, g_variant_new("(sus)", lens, dash::GOTO_DASH_URI, ""));
     g_free(lens);
   }
-}                                     
+}
 
 std::list<DbusmenuMenuitem*> BFBLauncherIcon::GetMenus()
 {  
@@ -99,11 +99,9 @@
     if (!lens->visible())
       continue;
     
-    glib::String name(g_markup_escape_text(lens->name().c_str(), -1));
-    
     menu_item = dbusmenu_menuitem_new();
 
-    dbusmenu_menuitem_property_set(menu_item, DBUSMENU_MENUITEM_PROP_LABEL, name.Value());
+    dbusmenu_menuitem_property_set(menu_item, DBUSMENU_MENUITEM_PROP_LABEL, lens->name().c_str());
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
 

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-10-25 17:00:12 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-12-09 14:48:26 +0000
@@ -1003,6 +1003,7 @@
       if (dbusmenu_menuitem_property_get_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE))
       {
         first_separator_needed = true;
+        dbusmenu_menuitem_property_set_bool(item, "unity-use-markup", FALSE);
 
         result.push_back(item);
       }
@@ -1053,18 +1054,21 @@
   }
   else
   {
-    gchar* app_name;
-    app_name = g_markup_escape_text(BamfName(), -1);
+    glib::String app_name(g_markup_escape_text(BamfName(), -1));
+    std::ostringstream bold_app_name;
+    bold_app_name << "<b>" << app_name << "</b>";
 
     item = dbusmenu_menuitem_new();
     dbusmenu_menuitem_property_set(item,
                                    DBUSMENU_MENUITEM_PROP_LABEL,
-                                   app_name);
+                                   bold_app_name.str().c_str());
     dbusmenu_menuitem_property_set_bool(item,
                                         DBUSMENU_MENUITEM_PROP_ENABLED,
                                         true);
+    dbusmenu_menuitem_property_set_bool(item,
+                                        "unity-use-markup",
+                                        true);
     g_signal_connect(item, "item-activated", (GCallback) OnAppLabelActivated, this);
-    g_free(app_name);
 
     _menu_items_extra["AppName"] = item;
   }

=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2011-12-08 03:52:32 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2011-12-09 14:48:26 +0000
@@ -549,6 +549,8 @@
 
   for (auto menu_item : menus)
   {
+    QuicklistMenuItem* ql_item;
+
     const gchar* type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TYPE);
     const gchar* toggle_type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE);
     gboolean prop_visible = dbusmenu_menuitem_property_get_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE);
@@ -559,24 +561,22 @@
 
     if (g_strcmp0(type, DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0)
     {
-      QuicklistMenuItemSeparator* item = new QuicklistMenuItemSeparator(menu_item, NUX_TRACKER_LOCATION);
-      _quicklist->AddMenuItem(item);
+      ql_item = new QuicklistMenuItemSeparator(menu_item, NUX_TRACKER_LOCATION);
     }
     else if (g_strcmp0(toggle_type, DBUSMENU_MENUITEM_TOGGLE_CHECK) == 0)
     {
-      QuicklistMenuItemCheckmark* item = new QuicklistMenuItemCheckmark(menu_item, NUX_TRACKER_LOCATION);
-      _quicklist->AddMenuItem(item);
+      ql_item = new QuicklistMenuItemCheckmark(menu_item, NUX_TRACKER_LOCATION);
     }
     else if (g_strcmp0(toggle_type, DBUSMENU_MENUITEM_TOGGLE_RADIO) == 0)
     {
-      QuicklistMenuItemRadio* item = new QuicklistMenuItemRadio(menu_item, NUX_TRACKER_LOCATION);
-      _quicklist->AddMenuItem(item);
+      ql_item = new QuicklistMenuItemRadio(menu_item, NUX_TRACKER_LOCATION);
     }
     else //(g_strcmp0 (type, DBUSMENU_MENUITEM_PROP_LABEL) == 0)
     {
-      QuicklistMenuItemLabel* item = new QuicklistMenuItemLabel(menu_item, NUX_TRACKER_LOCATION);
-      _quicklist->AddMenuItem(item);
+      ql_item = new QuicklistMenuItemLabel(menu_item, NUX_TRACKER_LOCATION);
     }
+
+    _quicklist->AddMenuItem(ql_item);
   }
 
   if (default_to_first_item)

=== modified file 'plugins/unityshell/src/QuicklistMenuItem.cpp'
--- plugins/unityshell/src/QuicklistMenuItem.cpp	2011-11-07 19:21:52 +0000
+++ plugins/unityshell/src/QuicklistMenuItem.cpp	2011-12-09 14:48:26 +0000
@@ -48,39 +48,7 @@
     g_warning("Invalid DbusmenuMenuitem in file %s at line %s.", G_STRFUNC, G_STRLOC);
   }
 
-  _name       = 0;
-  _text       = 0;
-  _color      = nux::Color(1.0f, 1.0f, 1.0f, 1.0f);
-  _menuItem   = item;
-  _debug      = false;
-  _item_type  = MENUITEM_TYPE_UNKNOWN;
-
-  _normalTexture[0]   = NULL;
-  _normalTexture[1]   = NULL;
-  _prelightTexture[0] = NULL;
-  _prelightTexture[1] = NULL;
-
-  if (_menuItem)
-  {
-    g_signal_connect(_menuItem,
-                     "property-changed",
-                     G_CALLBACK(OnPropertyChanged),
-                     this);
-    g_signal_connect(_menuItem,
-                     "item-activated",
-                     G_CALLBACK(OnItemActivated),
-                     this);
-  }
-
-  mouse_down.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseDown));
-  mouse_up.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseUp));
-  mouse_click.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseClick));
-  mouse_move.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseMove));
-  mouse_drag.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseDrag));
-  mouse_enter.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseEnter));
-  mouse_leave.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseLeave));
-
-  _prelight = false;
+  Initialize(item, false);
 }
 
 QuicklistMenuItem::QuicklistMenuItem(DbusmenuMenuitem* item,
@@ -88,11 +56,18 @@
                                      NUX_FILE_LINE_DECL) :
   View(NUX_FILE_LINE_PARAM)
 {
-  _text       = 0;
-  _color      = nux::Color(1.0f, 1.0f, 1.0f, 1.0f);
-  _menuItem   = item;
-  _debug      = debug;
-  _item_type  = MENUITEM_TYPE_UNKNOWN;
+  Initialize(item, debug);
+}
+
+void
+QuicklistMenuItem::Initialize(DbusmenuMenuitem* item, bool debug)
+{
+  _name        = 0;
+  _text        = 0;
+  _color       = nux::Color(1.0f, 1.0f, 1.0f, 1.0f);
+  _menuItem    = DBUSMENU_MENUITEM(g_object_ref(item));
+  _debug       = debug;
+  _item_type   = MENUITEM_TYPE_UNKNOWN;
 
   _normalTexture[0]   = NULL;
   _normalTexture[1]   = NULL;
@@ -129,6 +104,42 @@
 
   if (_text)
     g_free(_text);
+
+  if (_normalTexture[0])
+    _normalTexture[0]->UnReference();
+
+  if (_normalTexture[1])
+    _normalTexture[1]->UnReference();
+
+  if (_prelightTexture[0])
+    _prelightTexture[0]->UnReference();
+
+  if (_prelightTexture[1])
+    _prelightTexture[1]->UnReference();
+
+  if (_menuItem)
+    g_object_unref(_menuItem);
+}
+
+const gchar*
+QuicklistMenuItem::GetDefaultText()
+{
+  return NULL;
+}
+
+void
+QuicklistMenuItem::InitializeText()
+{
+  if (_menuItem)
+    _text = GetText();
+  else
+    _text = g_strdup(GetDefaultText());
+
+  int textWidth = 1;
+  int textHeight = 1;
+  GetTextExtents(textWidth, textHeight);
+  SetMinimumSize(textWidth + ITEM_INDENT_ABS + 3 * ITEM_MARGIN,
+                 textHeight + 2 * ITEM_MARGIN);
 }
 
 QuicklistMenuItemType QuicklistMenuItem::GetItemType()
@@ -212,6 +223,31 @@
   std::cout << "ItemActivated() called" << std::endl;
 }
 
+gchar* QuicklistMenuItem::GetText()
+{
+  const gchar *label;
+  gchar *text;
+
+  if (!_menuItem)
+    return NULL;
+
+  label = GetLabel();
+
+  if (!label)
+    return NULL;
+
+  if (!IsMarkupEnabled())
+  {
+    text = g_markup_escape_text(label, -1);
+  }
+  else
+  {
+    text = g_strdup(label);
+  }
+
+  return text;
+}
+
 void QuicklistMenuItem::GetTextExtents(int& width, int& height)
 {
   GtkSettings* settings = gtk_settings_get_default();  // not ref'ed
@@ -395,6 +431,35 @@
   g_object_unref(layout);
 }
 
+void
+QuicklistMenuItem::EnableLabelMarkup(bool enabled)
+{
+  if (IsMarkupEnabled() != enabled)
+  {
+    dbusmenu_menuitem_property_set_bool(_menuItem, "unity-use-markup", enabled);
+
+    if (_text)
+    {
+      g_free(_text);
+      _text = NULL;
+    }
+
+    InitializeText();
+  }
+}
+
+bool
+QuicklistMenuItem::IsMarkupEnabled()
+{
+  gboolean markup;
+
+  if (!_menuItem)
+    return false;
+
+  markup = dbusmenu_menuitem_property_get_bool(_menuItem, "unity-use-markup");
+  return (markup != FALSE);
+}
+
 // Introspection
 
 const gchar* QuicklistMenuItem::GetName()

=== modified file 'plugins/unityshell/src/QuicklistMenuItem.h'
--- plugins/unityshell/src/QuicklistMenuItem.h	2011-11-28 21:27:17 +0000
+++ plugins/unityshell/src/QuicklistMenuItem.h	2011-12-09 14:48:26 +0000
@@ -75,17 +75,16 @@
   QuicklistMenuItemType GetItemType();
 
   void ItemActivated();
+  void EnableLabelMarkup(bool enabled);
+  bool IsMarkupEnabled();
 
   sigc::signal<void, QuicklistMenuItem&> sigChanged;
   sigc::signal<void, QuicklistMenuItem*> sigTextChanged;
   sigc::signal<void, QuicklistMenuItem*> sigColorChanged;
 
   virtual const gchar* GetLabel();
-
   virtual bool GetEnabled();
-
   virtual bool GetActive();
-
   virtual bool GetVisible();
 
   // Introspection
@@ -102,6 +101,11 @@
   nux::BaseTexture*     _normalTexture[2];
   nux::BaseTexture*     _prelightTexture[2];
 
+  void Initialize(DbusmenuMenuitem* item, bool debug);
+  void InitializeText();
+  virtual const gchar* GetDefaultText();
+
+  gchar* GetText();
   //! Return the size of the text + size of associated radio button or check box
   void GetTextExtents(int& width, int& height);
   void GetTextExtents(const gchar* font, int& width, int& height);

=== modified file 'plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp'
--- plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/QuicklistMenuItemCheckmark.cpp	2011-12-09 14:48:26 +0000
@@ -44,8 +44,9 @@
   QuicklistMenuItem(item,
                     NUX_FILE_LINE_PARAM)
 {
+  _item_type  = MENUITEM_TYPE_CHECK;
   _name = g_strdup("QuicklistMenuItemCheckmark");
-  Initialize(item);
+  InitializeText();
 }
 
 QuicklistMenuItemCheckmark::QuicklistMenuItemCheckmark(DbusmenuMenuitem* item,
@@ -55,40 +56,18 @@
                     debug,
                     NUX_FILE_LINE_PARAM)
 {
+  _item_type  = MENUITEM_TYPE_CHECK;
   _name = g_strdup("QuicklistMenuItemCheckmark");
-  Initialize(item);
-}
-
-void
-QuicklistMenuItemCheckmark::Initialize(DbusmenuMenuitem* item)
-{
-  _item_type  = MENUITEM_TYPE_CHECK;
-
-  if (item)
-    _text = g_strdup(dbusmenu_menuitem_property_get(item, DBUSMENU_MENUITEM_PROP_LABEL));
-  else
-    _text = g_strdup("Check Mark");
-
-  int textWidth = 1;
-  int textHeight = 1;
-  GetTextExtents(textWidth, textHeight);
-  SetMinimumSize(textWidth + ITEM_INDENT_ABS + 3 * ITEM_MARGIN,
-                 textHeight + 2 * ITEM_MARGIN);
+  InitializeText();
 }
 
 QuicklistMenuItemCheckmark::~QuicklistMenuItemCheckmark()
+{}
+
+const gchar*
+QuicklistMenuItemCheckmark::GetDefaultText()
 {
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-
-  if (_normalTexture[1])
-    _normalTexture[1]->UnReference();
-
-  if (_prelightTexture[0])
-    _prelightTexture[0]->UnReference();
-
-  if (_prelightTexture[1])
-    _prelightTexture[1]->UnReference();
+  return "Check Mark";
 }
 
 void

=== modified file 'plugins/unityshell/src/QuicklistMenuItemCheckmark.h'
--- plugins/unityshell/src/QuicklistMenuItemCheckmark.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/QuicklistMenuItemCheckmark.h	2011-12-09 14:48:26 +0000
@@ -53,7 +53,7 @@
 
   void PostDraw(nux::GraphicsEngine& gfxContext, bool forceDraw);
 
-  void Initialize(DbusmenuMenuitem* item);
+  virtual const gchar* GetDefaultText();
 
   virtual void UpdateTexture();
   virtual int CairoSurfaceWidth();

=== modified file 'plugins/unityshell/src/QuicklistMenuItemLabel.cpp'
--- plugins/unityshell/src/QuicklistMenuItemLabel.cpp	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/QuicklistMenuItemLabel.cpp	2011-12-09 14:48:26 +0000
@@ -33,8 +33,9 @@
   QuicklistMenuItem(item,
                     NUX_FILE_LINE_PARAM)
 {
+  _item_type  = MENUITEM_TYPE_LABEL;
   _name = g_strdup("QuicklistMenuItemLabel");
-  Initialize(item);
+  InitializeText();
 }
 
 QuicklistMenuItemLabel::QuicklistMenuItemLabel(DbusmenuMenuitem* item,
@@ -44,40 +45,18 @@
                     debug,
                     NUX_FILE_LINE_PARAM)
 {
+  _item_type  = MENUITEM_TYPE_LABEL;
   _name = g_strdup("QuicklistMenuItemLabel");
-  Initialize(item);
-}
-
-void
-QuicklistMenuItemLabel::Initialize(DbusmenuMenuitem* item)
-{
-  _item_type  = MENUITEM_TYPE_LABEL;
-
-  if (item)
-    _text = g_strdup(dbusmenu_menuitem_property_get(item, DBUSMENU_MENUITEM_PROP_LABEL));
-  else
-    _text = g_strdup("Label");
-
-  int textWidth = 1;
-  int textHeight = 1;
-  GetTextExtents(textWidth, textHeight);
-  SetMinimumSize(textWidth + ITEM_INDENT_ABS + 3 * ITEM_MARGIN,
-                 textHeight + 2 * ITEM_MARGIN);
+  InitializeText();
 }
 
 QuicklistMenuItemLabel::~QuicklistMenuItemLabel()
+{}
+
+const gchar*
+QuicklistMenuItemLabel::GetDefaultText()
 {
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-
-  if (_normalTexture[1])
-    _normalTexture[1]->UnReference();
-
-  if (_prelightTexture[0])
-    _prelightTexture[0]->UnReference();
-
-  if (_prelightTexture[1])
-    _prelightTexture[1]->UnReference();
+  return "Label";
 }
 
 void

=== modified file 'plugins/unityshell/src/QuicklistMenuItemLabel.h'
--- plugins/unityshell/src/QuicklistMenuItemLabel.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/QuicklistMenuItemLabel.h	2011-12-09 14:48:26 +0000
@@ -53,7 +53,7 @@
 
   void PostDraw(nux::GraphicsEngine& gfxContext, bool forceDraw);
 
-  void Initialize(DbusmenuMenuitem* item);
+  virtual const gchar* GetDefaultText();
 
   virtual void UpdateTexture();
   virtual int CairoSurfaceWidth();

=== modified file 'plugins/unityshell/src/QuicklistMenuItemRadio.cpp'
--- plugins/unityshell/src/QuicklistMenuItemRadio.cpp	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/QuicklistMenuItemRadio.cpp	2011-12-09 14:48:26 +0000
@@ -43,8 +43,9 @@
   QuicklistMenuItem(item,
                     NUX_FILE_LINE_PARAM)
 {
+  _item_type  = MENUITEM_TYPE_RADIO;
   _name = g_strdup("QuicklistMenuItemRadio");
-  Initialize(item);
+  InitializeText();
 }
 
 QuicklistMenuItemRadio::QuicklistMenuItemRadio(DbusmenuMenuitem* item,
@@ -54,41 +55,18 @@
                     debug,
                     NUX_FILE_LINE_PARAM)
 {
+  _item_type  = MENUITEM_TYPE_RADIO;
   _name = g_strdup("QuicklistMenuItemRadio");
-  Initialize(item);
-}
-
-void
-QuicklistMenuItemRadio::Initialize(DbusmenuMenuitem* item)
-{
-  _item_type  = MENUITEM_TYPE_LABEL;
-
-  if (item)
-    _text = g_strdup(dbusmenu_menuitem_property_get(item, DBUSMENU_MENUITEM_PROP_LABEL));
-  else
-    _text = g_strdup("Radio Button");
-
-  int textWidth = 1;
-  int textHeight = 1;
-  GetTextExtents(textWidth, textHeight);
-  SetMinimumSize(textWidth + ITEM_INDENT_ABS + 3 * ITEM_MARGIN,
-                 textHeight + 2 * ITEM_MARGIN);
-
+  InitializeText();
 }
 
 QuicklistMenuItemRadio::~QuicklistMenuItemRadio()
+{}
+
+const gchar*
+QuicklistMenuItemRadio::GetDefaultText()
 {
-  if (_normalTexture[0])
-    _normalTexture[0]->UnReference();
-
-  if (_normalTexture[1])
-    _normalTexture[1]->UnReference();
-
-  if (_prelightTexture[0])
-    _prelightTexture[0]->UnReference();
-
-  if (_prelightTexture[1])
-    _prelightTexture[1]->UnReference();
+  return "Radio Button";
 }
 
 void

=== modified file 'plugins/unityshell/src/QuicklistMenuItemRadio.h'
--- plugins/unityshell/src/QuicklistMenuItemRadio.h	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/QuicklistMenuItemRadio.h	2011-12-09 14:48:26 +0000
@@ -54,7 +54,7 @@
   void PostDraw(nux::GraphicsEngine& gfxContext,
                 bool                 forceDraw);
 
-  void Initialize(DbusmenuMenuitem* item);
+  virtual const gchar* GetDefaultText();
 
   virtual void UpdateTexture();
   virtual int CairoSurfaceWidth();

=== modified file 'tests/unit/TestQuicklistMenuitems.cpp'
--- tests/unit/TestQuicklistMenuitems.cpp	2011-07-21 14:59:25 +0000
+++ tests/unit/TestQuicklistMenuitems.cpp	2011-12-09 14:48:26 +0000
@@ -87,6 +87,7 @@
   g_assert_cmpstr(qlCheckmarkItem->GetLabel(), == , "Unchecked");
   g_assert_cmpint(qlCheckmarkItem->GetEnabled(), == , false);
   g_assert_cmpint(qlCheckmarkItem->GetActive(), == , false);
+  g_assert_cmpint(qlCheckmarkItem->IsMarkupEnabled(), == , false);
 
   //qlCheckmarkItem->sigChanged.connect (sigc::mem_fun (pointerToCallerClass,
   //                                                    &CallerClass::RecvChanged));
@@ -111,12 +112,17 @@
                                       DBUSMENU_MENUITEM_PROP_ENABLED,
                                       true);
 
+  dbusmenu_menuitem_property_set_bool(item,
+                                      "unity-use-markup",
+                                      true);
+
   QuicklistMenuItemLabel* qlLabelItem = NULL;
 
   qlLabelItem = new QuicklistMenuItemLabel(item, true);
 
   g_assert_cmpstr(qlLabelItem->GetLabel(), == , "A Label");
   g_assert_cmpint(qlLabelItem->GetEnabled(), == , true);
+  g_assert_cmpint(qlLabelItem->IsMarkupEnabled(), == , true);
 
   //qlLabelItem->sigChanged.connect (sigc::mem_fun (pointerToCallerClass,
   //                                                &CallerClass::RecvChanged));
@@ -151,10 +157,12 @@
   QuicklistMenuItemRadio* qlRadioItem = NULL;
 
   qlRadioItem = new QuicklistMenuItemRadio(item, true);
+  qlRadioItem->EnableLabelMarkup(true);
 
   g_assert_cmpstr(qlRadioItem->GetLabel(), == , "Radio Active");
   g_assert_cmpint(qlRadioItem->GetEnabled(), == , true);
   g_assert_cmpint(qlRadioItem->GetActive(), == , true);
+  g_assert_cmpint(qlRadioItem->IsMarkupEnabled(), == , true);
 
   //qlRadioItem->sigChanged.connect (sigc::mem_fun (pointerToCallerClass,
   //                                                &CallerClass::RecvChanged));