Merge lp:~mandel/unity/plan-b into lp:unity

[Manuel de la Peña]

Add code to ensure that a label is shown when u1 creds are not present.

Add code to ensure that a label is shown when u1 creds are not present.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3275
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mandel/unity/plan-b/+merge/158383/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

12 + for (dash::Preview::InfoHintPtr info_hint : hints)

dash::Preview::InfoHintPtr const& info_hint

Otherwise, LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3276
http://jenkins.qa.ubuntu.com/job/unity-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/17/rebuild

review: Needs Fixing (continuous-integration)

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

19 + glib::Variant data(g_variant_lookup_value(preview_data,
20 + "no_credentials_label", G_VARIANT_TYPE_ANY));

Not blocking, but shouldn't be G_VARIANT_TYPE_STRING, instead of ANY?

99 + warning_texture_ = new IconTexture(style.GetWarningIcon(), style.GetPaymentWarningWidth(),
100 + style.GetPaymentWarningHeight());

180 +nux::BaseTexture* Style::GetWarningIcon()
181 +{
182 + return nux::CreateTexture2DFromFile(
183 + PKGDATADIR"/warning_icon.png", -1, true);
184 +}

You're leaking here... GetWarningIcon() returns a nux::BaseTexture that has not been unreffed, so when passing it to IconTexture, it gets reffed and its reference count is 2 instead of being just 1. So it won't ever destructed.

Solutions: (1) use the LazyLoader for that as well, (2) manually unref it when returning. PreviewStyle's textures are intended to be used as they are, I think it's better to keep the same assumptions.

Also, if the texture is already 22x22 you don't really need to GetPaymentWarningWidth()/GetPaymentWarningHeight(); IconTexture will guess it for you.

review: Needs Fixing

[Alejandro J. Cura (alecu)]

According to the logs, the jenkins build is only failing on armhf:
https://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/17/console

The unity build is being killed after two hours while running some headless tests, but after all of unity has been built.

Perhaps for unity builds on armhf, the two hours limit should be increased even further (!)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3276
http://jenkins.qa.ubuntu.com/job/unity-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/25/rebuild

review: Approve (continuous-integration)

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

Thanks for fixing it, approved!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3279
http://jenkins.qa.ubuntu.com/job/unity-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/27/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp	2013-01-18 16:02:50 +0000
+++ dash/previews/MusicPreview.cpp	2013-04-17 15:41:26 +0000
@@ -92,6 +92,31 @@
   Preview::AddProperties(builder);
 }
 
+bool MusicPreview::HasUbuntuOneCredentials()
+{
+  dash::Preview::InfoHintPtrList hints = preview_model_->GetInfoHints();
+  GVariant *preview_data = NULL;
+  for (dash::Preview::InfoHintPtr const& info_hint : hints)
+  {
+    if (info_hint->id == "music_preview")
+    {
+      preview_data = info_hint->value;
+      if (preview_data != NULL)
+      {
+        glib::Variant data(g_variant_lookup_value(preview_data,
+	  "no_credentials_label", G_VARIANT_TYPE_STRING));
+
+        if (!data)
+          no_credentials_message_ = "";
+        else
+          no_credentials_message_ = data.GetString();
+      }
+      break;
+    }
+  }
+  return no_credentials_message_.empty(); 
+}
+
 void MusicPreview::SetupViews()
 {
   dash::MusicPreview* music_preview_model = dynamic_cast<dash::MusicPreview*>(preview_model_.get());
@@ -164,29 +189,60 @@
       // Hints && Actions
       nux::VLayout* hints_layout = NULL;
       nux::Layout* actions_layout = NULL;
-      if (!preview_model_->GetInfoHints().empty())
-      {
-        hints_layout = new nux::VLayout();
-        hints_layout->SetSpaceBetweenChildren(0);
-        hints_layout->AddSpace(0, 1);
-        preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
-        AddChild(preview_info_hints_.GetPointer());
-        preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
-        hints_layout->AddView(preview_info_hints_.GetPointer(), 0);
-
-        // If there are actions, we use a vertical layout
-        action_buttons_.clear();
-        actions_layout = BuildVerticalActionsLayout(preview_model_->GetActions(), action_buttons_);
-        actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
-      }
-      else // otherwise we add a grid layout.
-      {
-        action_buttons_.clear();
-        actions_layout = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
-        if (action_buttons_.size() < 2)
-          hint_actions_layout->AddSpace(0, 1);
-        actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
-      }
+      bool has_u1_creds = HasUbuntuOneCredentials();
+
+      if (has_u1_creds)
+      {
+        if (!preview_model_->GetInfoHints().empty())
+        {
+          hints_layout = new nux::VLayout();
+          hints_layout->SetSpaceBetweenChildren(0);
+          hints_layout->AddSpace(0, 1);
+          preview_info_hints_ = new PreviewInfoHintWidget(preview_model_, style.GetInfoHintIconSizeWidth());
+          AddChild(preview_info_hints_.GetPointer());
+          preview_info_hints_->request_close().connect([this]() { preview_container_->request_close.emit(); });
+          hints_layout->AddView(preview_info_hints_.GetPointer(), 0);
+
+          // If there are actions, we use a vertical layout
+          action_buttons_.clear();
+          actions_layout = BuildVerticalActionsLayout(preview_model_->GetActions(), action_buttons_);
+          actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+        }
+        else // otherwise we add a grid layout.
+        {
+          action_buttons_.clear();
+          actions_layout = BuildGridActionsLayout(preview_model_->GetActions(), action_buttons_);
+          if (action_buttons_.size() < 2)
+            hint_actions_layout->AddSpace(0, 1);
+          actions_layout->SetLeftAndRightPadding(0, style.GetDetailsRightMargin());
+        }
+      }
+      else
+      {
+        // let the user know he needs to connect
+        previews::Style& style = dash::previews::Style::Instance();
+	actions_layout = new nux::HLayout();
+	nux::VLayout* icon_layout = new nux::VLayout();
+  	icon_layout->SetLeftAndRightPadding(10);
+
+        warning_texture_ = new IconTexture(style.GetWarningIcon());
+        icon_layout->AddView(warning_texture_.GetPointer(), 0, nux::MINOR_POSITION_START,
+          nux::MINOR_SIZE_FULL, 100.0f, nux::NUX_LAYOUT_BEGIN);
+        actions_layout->AddLayout(icon_layout, 0, nux::MINOR_POSITION_CENTER);
+
+        warning_msg_ = new StaticCairoText(
+                     no_credentials_message_, true,
+                     NUX_TRACKER_LOCATION);
+        warning_msg_->SetFont(style.u1_warning_font().c_str());
+        warning_msg_->SetLines(-2);
+        warning_msg_->SetMinimumHeight(50);
+        warning_msg_->SetMaximumWidth(300);
+
+        actions_layout->AddView(warning_msg_.GetPointer(), 0, nux::MINOR_POSITION_CENTER);
+
+      }
+     
+
         /////////////////////
 
       if (hints_layout) hint_actions_layout->AddView(hints_layout, 1);

=== modified file 'dash/previews/MusicPreview.h'
--- dash/previews/MusicPreview.h	2012-12-20 18:51:09 +0000
+++ dash/previews/MusicPreview.h	2013-04-17 15:41:26 +0000
@@ -24,6 +24,7 @@
 #define MUSICPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/IconTexture.h"
 
 namespace unity
 {
@@ -55,9 +56,14 @@
 
   void OnPlayTrack(std::string const& uri);
   void OnPauseTrack(std::string const& uri);
+  bool HasUbuntuOneCredentials();
 
 protected:
   nux::ObjectPtr<Tracks> tracks_;
+  nux::ObjectPtr<StaticCairoText> warning_msg_;
+  nux::ObjectPtr<IconTexture> warning_texture_;
+  std::string no_credentials_message_;
+
  };
 
 }

=== added file 'resources/warning_icon.png'
Binary files resources/warning_icon.png	1970-01-01 00:00:00 +0000 and resources/warning_icon.png	2013-04-17 15:41:26 +0000 differ
=== modified file 'unity-shared/PreviewStyle.cpp'
--- unity-shared/PreviewStyle.cpp	2012-11-29 10:19:01 +0000
+++ unity-shared/PreviewStyle.cpp	2013-04-17 15:41:26 +0000
@@ -99,6 +99,7 @@
   , preview_play_texture_("/preview_play.svg")
   , preview_pause_texture_("/preview_pause.svg")
   , preview_spin_texture_("/search_spin.svg")
+  , warning_icon_texture_("/warning_icon.png")
   {
   }
   ~Impl() {}
@@ -110,6 +111,7 @@
   LazyLoadTexture<32> preview_play_texture_;
   LazyLoadTexture<32> preview_pause_texture_;
   LazyLoadTexture<32> preview_spin_texture_;
+  LazyLoadTexture<22> warning_icon_texture_;
 };
 
 
@@ -292,6 +294,11 @@
   return 12;
 }
 
+std::string Style::u1_warning_font() const
+{
+  return "Ubuntu Bold 11.5";
+}
+
 float Style::GetVideoImageAspectRatio() const
 {
   return float(540)/380;
@@ -401,6 +408,11 @@
   return pimpl->preview_pause_texture_.texture();
 }
 
+nux::BaseTexture* Style::GetWarningIcon()
+{
+  return pimpl->warning_icon_texture_.texture();
+}
+
 nux::BaseTexture* Style::GetSearchSpinIcon(int size)
 {
   return pimpl->preview_spin_texture_.texture(size);

=== modified file 'unity-shared/PreviewStyle.h'
--- unity-shared/PreviewStyle.h	2012-11-29 10:19:01 +0000
+++ unity-shared/PreviewStyle.h	2013-04-17 15:41:26 +0000
@@ -25,7 +25,7 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
- 
+
 #include <string>
 #include <memory>
 
@@ -54,12 +54,12 @@
 public:
   Style();
   ~Style();
-  
+
   static Style& Instance();
 
   int GetNavigatorWidth() const;
   int GetNavigatorIconSize() const;
-  
+
   int GetPreviewWidth() const;
   int GetPreviewHeight() const;
   int GetPreviewTopPadding() const;
@@ -120,10 +120,12 @@
   ////////////////////////////////
   // Music Preview
   std::string track_font() const;
+  std::string u1_warning_font() const;
+  nux::BaseTexture* GetWarningIcon();
 
   int GetTrackHeight() const;
   ////////////////////////////////
-  
+
   ////////////////////////////////
   // Movie Preview
   float GetVideoImageAspectRatio() const;