Merge lp:~nick-dedekind/unity/preview-action-extra-text into lp:unity

[Nick Dedekind]

Added extra-text to preview actions (for price tags).

Added extra-text to preview actions (for price tags).

[Michal Hruby (mhr3)]

Could we get a test? Or will that be done in a separate branch?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

Added unity tests

[Michal Hruby (mhr3)]

Awesome!

review: Approve

=== modified file 'dash/previews/ActionButton.cpp'
--- dash/previews/ActionButton.cpp	2012-09-10 15:43:52 +0000
+++ dash/previews/ActionButton.cpp	2012-09-13 16:15:29 +0000
@@ -50,7 +50,7 @@
   SetAcceptKeyNavFocusOnMouseDown(false);
   SetAcceptKeyNavFocusOnMouseEnter(false);
   Init();
-  BuildLayout(label, icon_hint);
+  BuildLayout(label, icon_hint, "");
 }
 
 ActionButton::~ActionButton()
@@ -105,7 +105,19 @@
   SetMinimumWidth(kMinButtonWidth);
 }
 
-void ActionButton::BuildLayout(std::string const& label, std::string const& icon_hint)
+void ActionButton::SetExtraHint(std::string const& extra_hint, std::string const& font_hint)
+{  
+  extra_font_hint_= font_hint;
+  if (extra_text_)
+  {
+    extra_text_->SetFont(extra_font_hint_);
+    ComputeContentSize();
+    QueueDraw();
+  }
+  BuildLayout(label_, icon_hint_, extra_hint);
+}
+
+void ActionButton::BuildLayout(std::string const& label, std::string const& icon_hint, std::string const& extra_hint)
 {
   if (icon_hint != icon_hint_)
   {
@@ -121,7 +133,7 @@
       image_ = new IconTexture(icon_hint, icon_size);
       image_->texture_updated.connect([&](nux::BaseTexture*)
       {
-        BuildLayout(label_, icon_hint_);
+        BuildLayout(label_, icon_hint_, extra_hint_);
       });
       image_->SetInputEventSensitivity(false);
       image_->SetMinMaxSize(icon_size, icon_size);
@@ -147,16 +159,37 @@
     }
   }
 
+  if (extra_hint != extra_hint_)
+  {
+    extra_hint_ = extra_hint;
+    if (extra_text_)
+    {
+      extra_text_.Release();
+      extra_text_ = NULL;
+    }
+
+    if (!extra_hint_.empty())
+    {
+      extra_text_ = new nux::StaticCairoText(extra_hint_, true, NUX_TRACKER_LOCATION);
+      if (!extra_font_hint_.empty())
+        extra_text_->SetFont(extra_font_hint_);
+      extra_text_->SetInputEventSensitivity(false);
+      extra_text_->SetTextAlignment(nux::StaticCairoText::NUX_ALIGN_CENTRE);
+    }
+  }
+
   RemoveLayout();
 
   nux::HLayout* layout = new nux::HLayout();
   layout->SetHorizontalInternalMargin(6);
-  layout->SetPadding(2, 11, 2, 11);
+  layout->SetPadding(2, 0, 2, 0);
   layout->AddSpace(0,1);
   if (image_)
     layout->AddView(image_.GetPointer(), 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
   if (static_text_)
     layout->AddView(static_text_.GetPointer(), 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
+  if (extra_text_)
+    layout->AddView(extra_text_.GetPointer(), 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
   layout->AddSpace(0,1);
   SetLayout(layout);
 
@@ -302,5 +335,15 @@
   QueueDraw();
 }
 
+std::string ActionButton::GetLabel() const
+{
+  return label_;
+}
+
+std::string ActionButton::GetExtraText() const
+{
+  return extra_hint_;
+}
+
 } // namespace dash
 } // namespace unity
 
=== modified file 'dash/previews/ActionButton.h'
--- dash/previews/ActionButton.h	2012-08-16 09:09:37 +0000
+++ dash/previews/ActionButton.h	2012-09-13 16:15:29 +0000
@@ -49,10 +49,14 @@
   sigc::signal<void, ActionButton*, std::string const&> click;
 
   void SetFont(std::string const& font_hint);
+  void SetExtraHint(std::string const& extra_hint, std::string const& font_hint);
 
   void Activate();
   void Deactivate();
 
+  std::string GetLabel() const;
+  std::string GetExtraText() const;
+
 protected:
   virtual long ComputeContentSize();
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -64,7 +68,7 @@
   void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
   void RedrawFocusOverlay(nux::Geometry const& geom, cairo_t* cr);
 
-  void BuildLayout(std::string const& label, std::string const& icon_hint);
+  void BuildLayout(std::string const& label, std::string const& icon_hint, std::string const& extra_hint);
  
   // From debug::Introspectable
   std::string GetName() const;
@@ -83,9 +87,12 @@
   std::string action_hint_;
   std::string icon_hint_;
   std::string font_hint_;
+  std::string extra_hint_;
+  std::string extra_font_hint_;
 
   nux::ObjectPtr<IconTexture> image_;
   nux::ObjectPtr<nux::StaticCairoText> static_text_;
+  nux::ObjectPtr<nux::StaticCairoText> extra_text_;
 };
 
 } // namespace dash
 
=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2012-08-22 08:16:02 +0000
+++ dash/previews/Preview.cpp	2012-09-13 16:15:29 +0000
@@ -136,6 +136,8 @@
         dash::Preview::ActionPtr action = actions[action_iter];
 
         ActionButton* button = new ActionButton(action->id, action->display_name, action->icon_hint, NUX_TRACKER_LOCATION);
+        button->SetFont(style.action_font());
+        button->SetExtraHint(action->extra_text, style.action_extra_font());
         AddChild(button);
         button->click.connect(sigc::mem_fun(this, &Preview::OnActionActivated));
         buttons.push_back(button);
@@ -165,9 +167,11 @@
   uint action_iter = 0;
   for (uint i = 0; i < actions.size(); i++)
   {
-      dash::Preview::ActionPtr action = actions[action_iter];
+      dash::Preview::ActionPtr action = actions[action_iter++];
 
       ActionButton* button = new ActionButton(action->id, action->display_name, action->icon_hint, NUX_TRACKER_LOCATION);
+      button->SetFont(style.action_font());
+      button->SetExtraHint(action->extra_text, style.action_extra_font());
       AddChild(button);
       button->click.connect(sigc::mem_fun(this, &Preview::OnActionActivated));
       buttons.push_back(button);
 
=== modified file 'dash/previews/StandaloneApplicationPreview.cpp'
--- dash/previews/StandaloneApplicationPreview.cpp	2012-08-10 12:55:06 +0000
+++ dash/previews/StandaloneApplicationPreview.cpp	2012-09-13 16:15:29 +0000
@@ -164,6 +164,9 @@
   glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/5/lens-nav-home.svg", NULL));
   glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/5/lens-nav-people.svg", NULL));
 
+  GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
+  g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
+
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
   unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
@@ -173,13 +176,12 @@
   unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.5);
   unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 17);
 
-
   unity_protocol_preview_set_image_source_uri(proto_obj, "file:///home/nick/Skype.png");
   unity_protocol_preview_set_title(proto_obj, app_name.str().c_str());
   unity_protocol_preview_set_subtitle(proto_obj, subtitle);
   unity_protocol_preview_set_description(proto_obj, description);
   unity_protocol_preview_add_action(proto_obj, "uninstall", "Uninstall", iconHint1, 0);
-  unity_protocol_preview_add_action(proto_obj, "launch", "Launch", iconHint2, 0);
+  unity_protocol_preview_add_action_with_hints(proto_obj, "launch", "Download", iconHint2, 0, action_hints1);
   unity_protocol_preview_add_info_hint(proto_obj, "time", "Total time", iconHint1, g_variant_new("s", "16 h 34miin 45sec"));
   unity_protocol_preview_add_info_hint(proto_obj, "energy",  "Energy", iconHint2, g_variant_new("s", "58.07 mWh"));
   unity_protocol_preview_add_info_hint(proto_obj, "load",  "CPU Load", iconHint3, g_variant_new("i", 12));
@@ -190,6 +192,7 @@
   dash::Preview::Ptr preview_model(dash::Preview::PreviewForVariant(v));
   container_->Preview(preview_model, previews::Navigation::RIGHT);
 
+  g_hash_table_unref(action_hints1);
 }
 
 void TestRunner::NavRight()
@@ -206,10 +209,11 @@
   glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/5/lens-nav-home.svg", NULL));
   glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/5/lens-nav-people.svg", NULL));
 
+  GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
+  g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
+
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
-  
-
   unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
   unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Proprietary");
   unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "(c) Skype 2012");
@@ -222,7 +226,7 @@
   unity_protocol_preview_set_subtitle(proto_obj, subtitle);
   unity_protocol_preview_set_description(proto_obj, description);
   unity_protocol_preview_add_action(proto_obj, "uninstall", "Uninstall", iconHint1, 0);
-  unity_protocol_preview_add_action(proto_obj, "launch", "Launch", iconHint2, 0);
+  unity_protocol_preview_add_action_with_hints(proto_obj, "launch", "Download", iconHint2, 0, action_hints1);
   unity_protocol_preview_add_info_hint(proto_obj, "time", "Total time", iconHint1, g_variant_new("s", "16 h 34miin 45sec"));
   unity_protocol_preview_add_info_hint(proto_obj, "energy",  "Energy", iconHint2, g_variant_new("s", "58.07 mWh"));
   unity_protocol_preview_add_info_hint(proto_obj, "load",  "CPU Load", iconHint3, g_variant_new("d", 12.1));
@@ -232,6 +236,8 @@
 
   dash::Preview::Ptr preview_model(dash::Preview::PreviewForVariant(v));
   container_->Preview(preview_model, previews::Navigation::RIGHT);
+
+  g_hash_table_unref(action_hints1);
 }
 
 void TestRunner::NavLeft()
@@ -251,7 +257,10 @@
     glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/5/lens-nav-home.svg", NULL));
     glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/5/lens-nav-people.svg", NULL));
 
-    glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
+    GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
+  g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
+
+  glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
 
     unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
@@ -266,7 +275,7 @@
     unity_protocol_preview_set_subtitle(proto_obj, subtitle);
     unity_protocol_preview_set_description(proto_obj, description);
     unity_protocol_preview_add_action(proto_obj, "uninstall", "Uninstall", iconHint1, 0);
-    unity_protocol_preview_add_action(proto_obj, "launch", "Launch", iconHint2, 0);
+    unity_protocol_preview_add_action_with_hints(proto_obj, "launch", "Download", iconHint2, 0, action_hints1);
     unity_protocol_preview_add_info_hint(proto_obj, "time", "Total time", iconHint1, g_variant_new("s", "16 h 34miin 45sec"));
     unity_protocol_preview_add_info_hint(proto_obj, "energy",  "Energy", iconHint2, g_variant_new("s", "58.07 mWh"));
     unity_protocol_preview_add_info_hint(proto_obj, "load",  "CPU Load", iconHint3, g_variant_new("i", 22));
@@ -277,6 +286,8 @@
     dash::Preview::Ptr preview_model(dash::Preview::PreviewForVariant(v));
     container_->Preview(preview_model, previews::Navigation::LEFT);
 
+    g_hash_table_unref(action_hints1);
+
     return false;
   }));
 }
 
=== modified file 'tests/test_previews_application.cpp'
--- tests/test_previews_application.cpp	2012-08-21 09:47:11 +0000
+++ tests/test_previews_application.cpp	2012-09-13 16:15:29 +0000
@@ -34,6 +34,7 @@
 #include "dash/previews/ApplicationPreview.h"
 #include "dash/previews/PreviewInfoHintWidget.h"
 #include "dash/previews/PreviewRatingsWidget.h"
+#include "dash/previews/ActionButton.h"
 #include "test_utils.h"
 using namespace unity;
 using namespace unity::dash;
@@ -69,6 +70,9 @@
   {
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
+    GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
+    g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
+
     unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
     unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "License & special char");
     unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Copywrite & special char");
@@ -81,13 +85,15 @@
     unity_protocol_preview_set_subtitle(proto_obj, "Application Subtitle > special char");
     unity_protocol_preview_set_description(proto_obj, "Application Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
-    unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
+    unity_protocol_preview_add_action_with_hints(proto_obj, "action2", "Action 2", NULL, 0, action_hints1);
     unity_protocol_preview_add_info_hint(proto_obj, "hint1", "Hint 1", NULL, g_variant_new("s", "string hint 1"));
     unity_protocol_preview_add_info_hint(proto_obj, "hint2", "Hint 2", NULL, g_variant_new("s", "string hint 2"));
     unity_protocol_preview_add_info_hint(proto_obj, "hint3", "Hint 3", NULL, g_variant_new("i", 12));
 
     glib::Variant v(dee_serializable_serialize(DEE_SERIALIZABLE(proto_obj.RawPtr())), glib::StealRef());
     preview_model_ = dash::Preview::PreviewForVariant(v);
+
+    g_hash_table_unref(action_hints1);
   }
 
   nux::BaseWindow* parent_window_;
@@ -119,6 +125,24 @@
 
   EXPECT_EQ(preview_view->app_rating_->GetRating(), 0.8f);
   EXPECT_EQ(preview_view->action_buttons_.size(), 2);
+
+  if (preview_view->action_buttons_.size() >= 2)
+  {
+    auto iter = preview_view->action_buttons_.begin();
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 1");
+      EXPECT_EQ(action->GetExtraText(), "");
+    }
+    iter++;
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 2");
+      EXPECT_EQ(action->GetExtraText(), "£30.99");
+    }
+  }
 }
 
 }
 
=== modified file 'tests/test_previews_generic.cpp'
--- tests/test_previews_generic.cpp	2012-08-21 09:47:11 +0000
+++ tests/test_previews_generic.cpp	2012-09-13 16:15:29 +0000
@@ -32,6 +32,7 @@
 #include <unity-protocol.h>
 #include "UnityCore/GenericPreview.h"
 #include "dash/previews/GenericPreview.h"
+#include "dash/previews/ActionButton.h"
 #include "test_utils.h"
 using namespace unity;
 using namespace unity::dash;
@@ -63,18 +64,23 @@
   {
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_generic_preview_new()));
 
+    GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
+    g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("2.00"));
+
     unity_protocol_preview_set_image_source_uri(proto_obj, "http://ia.media-imdb.com/images/M/MV5BMTM3NDM5MzY5Ml5BMl5BanBnXkFtZTcwNjExMDUwOA@@._V1._SY317_.jpg");
     unity_protocol_preview_set_title(proto_obj, "Generic Title & special char");
     unity_protocol_preview_set_subtitle(proto_obj, "Generic Subtitle > special char");
     unity_protocol_preview_set_description(proto_obj, "Generic Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
-    unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
+    unity_protocol_preview_add_action_with_hints(proto_obj, "action2", "Action 2", NULL, 0, action_hints1);
     unity_protocol_preview_add_info_hint(proto_obj, "hint1", "Hint 1", NULL, g_variant_new("s", "string hint 1"));
     unity_protocol_preview_add_info_hint(proto_obj, "hint2", "Hint 2", NULL, g_variant_new("s", "string hint 2"));
     unity_protocol_preview_add_info_hint(proto_obj, "hint3", "Hint 3", NULL, g_variant_new("i", 12));
 
     glib::Variant v(dee_serializable_serialize(DEE_SERIALIZABLE(proto_obj.RawPtr())), glib::StealRef());
     preview_model_ = dash::Preview::PreviewForVariant(v);
+
+    g_hash_table_unref(action_hints1);
   }
 
   nux::BaseWindow* parent_window_;
@@ -102,6 +108,24 @@
   EXPECT_EQ(preview_view->description_->GetText(), "Generic Desctiption &lt; special char");
 
   EXPECT_EQ(preview_view->action_buttons_.size(), 2);
+
+  if (preview_view->action_buttons_.size() >= 2)
+  {
+    auto iter = preview_view->action_buttons_.begin();
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 1");
+      EXPECT_EQ(action->GetExtraText(), "");
+    }
+    iter++;
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 2");
+      EXPECT_EQ(action->GetExtraText(), "2.00");
+    }
+  }
 }
 
 }
 
=== modified file 'tests/test_previews_movie.cpp'
--- tests/test_previews_movie.cpp	2012-08-21 09:47:11 +0000
+++ tests/test_previews_movie.cpp	2012-09-13 16:15:29 +0000
@@ -34,6 +34,7 @@
 #include "dash/previews/MoviePreview.h"
 #include "dash/previews/PreviewInfoHintWidget.h"
 #include "dash/previews/PreviewRatingsWidget.h"
+#include "dash/previews/ActionButton.h"
 #include "test_utils.h"
 using namespace unity;
 using namespace unity::dash;
@@ -66,6 +67,9 @@
   {
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_movie_preview_new()));
 
+    GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
+    g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£1.00"));
+
     unity_protocol_movie_preview_set_rating(UNITY_PROTOCOL_MOVIE_PREVIEW(proto_obj.RawPtr()), 0.8);
     unity_protocol_movie_preview_set_num_ratings(UNITY_PROTOCOL_MOVIE_PREVIEW(proto_obj.RawPtr()), 12);
 
@@ -74,13 +78,15 @@
     unity_protocol_preview_set_subtitle(proto_obj, "Movie Subtitle > special char");
     unity_protocol_preview_set_description(proto_obj, "Movie Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
-    unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
+    unity_protocol_preview_add_action_with_hints(proto_obj, "action2", "Action 2", NULL, 0, action_hints1);
     unity_protocol_preview_add_info_hint(proto_obj, "hint1", "Hint 1", NULL, g_variant_new("s", "string hint 1"));
     unity_protocol_preview_add_info_hint(proto_obj, "hint2", "Hint 2", NULL, g_variant_new("s", "string hint 2"));
     unity_protocol_preview_add_info_hint(proto_obj, "hint3", "Hint 3", NULL, g_variant_new("i", 12));
 
     glib::Variant v(dee_serializable_serialize(DEE_SERIALIZABLE(proto_obj.RawPtr())), glib::StealRef());
     preview_model_ = dash::Preview::PreviewForVariant(v);
+
+    g_hash_table_unref(action_hints1);
   }
 
   nux::BaseWindow* parent_window_;
@@ -109,6 +115,24 @@
 
   EXPECT_EQ(preview_view->rating_->GetRating(), 0.8f);
   EXPECT_EQ(preview_view->action_buttons_.size(), 2);
+
+  if (preview_view->action_buttons_.size() >= 2)
+  {
+    auto iter = preview_view->action_buttons_.begin();
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 1");
+      EXPECT_EQ(action->GetExtraText(), "");
+    }
+    iter++;
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 2");
+      EXPECT_EQ(action->GetExtraText(), "£1.00");
+    }
+  }
 }
 
 }
 
=== modified file 'tests/test_previews_music.cpp'
--- tests/test_previews_music.cpp	2012-08-21 09:47:11 +0000
+++ tests/test_previews_music.cpp	2012-09-13 16:15:29 +0000
@@ -34,6 +34,7 @@
 #include "dash/previews/MusicPreview.h"
 #include "dash/previews/PreviewInfoHintWidget.h"
 #include "dash/previews/PreviewRatingsWidget.h"
+#include "dash/previews/ActionButton.h"
 #include "test_utils.h"
 using namespace unity;
 using namespace unity::dash;
@@ -64,12 +65,15 @@
   {
     glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_music_preview_new()));
 
+    GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
+    g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£3.99"));
+
     unity_protocol_preview_set_image_source_uri(proto_obj, "http://ia.media-imdb.com/images/M/MV5BMTM3NDM5MzY5Ml5BMl5BanBnXkFtZTcwNjExMDUwOA@@._V1._SY317_.jpg");
     unity_protocol_preview_set_title(proto_obj, "Music Title & special char");
     unity_protocol_preview_set_subtitle(proto_obj, "Music Subtitle > special char");
     unity_protocol_preview_set_description(proto_obj, "Music Desctiption &lt; special char");
     unity_protocol_preview_add_action(proto_obj, "action1", "Action 1", NULL, 0);
-    unity_protocol_preview_add_action(proto_obj, "action2", "Action 2", NULL, 0);
+    unity_protocol_preview_add_action_with_hints(proto_obj, "action2", "Action 2", NULL, 0, action_hints1);
     unity_protocol_preview_add_action(proto_obj, "action3", "Action 3", NULL, 0);
     unity_protocol_preview_add_action(proto_obj, "action4", "Action 4", NULL, 0);
     unity_protocol_preview_add_info_hint(proto_obj, "hint1", "Hint 1", NULL, g_variant_new("s", "string hint 1"));
@@ -78,6 +82,8 @@
 
     glib::Variant v(dee_serializable_serialize(DEE_SERIALIZABLE(proto_obj.RawPtr())), glib::StealRef());
     preview_model_ = dash::Preview::PreviewForVariant(v);
+
+    g_hash_table_unref(action_hints1);
   }
 
   nux::BaseWindow* parent_window_;
@@ -104,6 +110,24 @@
   EXPECT_EQ(preview_view->subtitle_->GetText(), "Music Subtitle &gt; special char");
 
   EXPECT_EQ(preview_view->action_buttons_.size(), 4);
+
+  if (preview_view->action_buttons_.size() >= 2)
+  {
+    auto iter = preview_view->action_buttons_.begin();
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 1");
+      EXPECT_EQ(action->GetExtraText(), "");
+    }
+    iter++;
+    if ((*iter)->Type().IsDerivedFromType(ActionButton::StaticObjectType))
+    {
+      ActionButton *action = static_cast<ActionButton*>(*iter);
+      EXPECT_EQ(action->GetLabel(), "Action 2");
+      EXPECT_EQ(action->GetExtraText(), "£3.99");
+    }
+  }
 }
 
 }
 
=== modified file 'unity-shared/PreviewStyle.cpp'
--- unity-shared/PreviewStyle.cpp	2012-09-10 15:43:52 +0000
+++ unity-shared/PreviewStyle.cpp	2012-09-13 16:15:29 +0000
@@ -305,6 +305,15 @@
 std::string Style::description_font() const
 {
   return "Ubuntu Light 10";
+
+}
+std::string Style::action_font() const
+{
+  return "Ubuntu 11";
+}
+std::string Style::action_extra_font() const
+{
+  return "Ubuntu Bold 11";  
 }
 
 std::string Style::app_license_font() const
 
=== modified file 'unity-shared/PreviewStyle.h'
--- unity-shared/PreviewStyle.h	2012-09-04 10:45:31 +0000
+++ unity-shared/PreviewStyle.h	2012-09-13 16:15:29 +0000
@@ -90,6 +90,9 @@
   std::string subtitle_size_font() const;
   std::string description_font() const;
 
+  std::string action_font() const;
+  std::string action_extra_font() const;
+
   nux::AbstractPaintLayer* GetBackgroundLayer() const;
 
   ////////////////////////////////