summaryrefslogtreecommitdiff
path: root/dash
diff options
authorManuel de la Pena <manuel@canonical.com>2013-07-19 11:27:54 +0000
committerTarmac <>2013-07-19 11:27:54 +0000
commitfeed1f60ba1a0f5ed2055d210a6405c914b2beb6 (patch)
tree458086b0fa909068cca3f09d080368fa8a380747 /dash
parentce8a93f2465c4b9d9f484b3d4edf4d8089d182fd (diff)
parentfc6f867d5e58a36ab88a02ae3b1348ae9695b5f5 (diff)
Fix the introspection so that QA can work with autopilot. Fixes: https://bugs.launchpad.net/bugs/1185486.
Approved by PS Jenkins bot, Marco Trevisan (TreviƱo), Leo Arias. (bzr r3430)
Diffstat (limited to 'dash')
-rw-r--r--dash/previews/ErrorPreview.cpp5
-rw-r--r--dash/previews/ErrorPreview.h2
-rw-r--r--dash/previews/MusicPaymentPreview.cpp5
-rw-r--r--dash/previews/MusicPaymentPreview.h1
-rw-r--r--dash/previews/PaymentPreview.cpp6
-rw-r--r--dash/previews/PaymentPreview.h1
6 files changed, 19 insertions, 1 deletions
diff --git a/dash/previews/ErrorPreview.cpp b/dash/previews/ErrorPreview.cpp
index 9afd4b1cc..bee583176 100644
--- a/dash/previews/ErrorPreview.cpp
+++ b/dash/previews/ErrorPreview.cpp
@@ -91,6 +91,11 @@ std::string ErrorPreview::GetName() const
return "ErrorPreview";
}
+void ErrorPreview::AddProperties(GVariantBuilder* builder)
+{
+ PaymentPreview::AddProperties(builder);
+}
+
void ErrorPreview::OnActionActivated(ActionButton* button, std::string const& id)
{
Preview::OnActionActivated(button, id);
diff --git a/dash/previews/ErrorPreview.h b/dash/previews/ErrorPreview.h
index 841d92328..1c2088ddd 100644
--- a/dash/previews/ErrorPreview.h
+++ b/dash/previews/ErrorPreview.h
@@ -72,6 +72,8 @@ public:
unsigned long special_keys_state);
// From debug::Introspectable
std::string GetName() const;
+ void AddProperties(GVariantBuilder* builder);
+
nux::Layout* GetTitle();
nux::Layout* GetPrice();
nux::Layout* GetBody();
diff --git a/dash/previews/MusicPaymentPreview.cpp b/dash/previews/MusicPaymentPreview.cpp
index 4242231fe..dea364ca8 100644
--- a/dash/previews/MusicPaymentPreview.cpp
+++ b/dash/previews/MusicPaymentPreview.cpp
@@ -84,6 +84,11 @@ std::string MusicPaymentPreview::GetName() const
return "MusicPaymentPreview";
}
+void MusicPaymentPreview::AddProperties(GVariantBuilder* builder)
+{
+ PaymentPreview::AddProperties(builder);
+}
+
void MusicPaymentPreview::OnActionActivated(ActionButton* button, std::string const& id)
{
// Check the action id and send the password only when we
diff --git a/dash/previews/MusicPaymentPreview.h b/dash/previews/MusicPaymentPreview.h
index 40062f562..2e8e37e8a 100644
--- a/dash/previews/MusicPaymentPreview.h
+++ b/dash/previews/MusicPaymentPreview.h
@@ -74,6 +74,7 @@ protected:
// From debug::Introspectable
std::string GetName() const;
+ void AddProperties(GVariantBuilder* builder);
nux::Layout* GetTitle();
nux::Layout* GetPrice();
diff --git a/dash/previews/PaymentPreview.cpp b/dash/previews/PaymentPreview.cpp
index 388734b34..e3773c7bc 100644
--- a/dash/previews/PaymentPreview.cpp
+++ b/dash/previews/PaymentPreview.cpp
@@ -194,9 +194,13 @@ PaymentPreview::PaymentPreview(dash::Preview::Ptr preview_model)
std::string PaymentPreview::GetName() const
{
- return "";
+ return "PaymentPreview";
}
+void PaymentPreview::AddProperties(GVariantBuilder* builder)
+{
+ Preview::AddProperties(builder);
+}
nux::Layout* PaymentPreview::GetHeader()
{
diff --git a/dash/previews/PaymentPreview.h b/dash/previews/PaymentPreview.h
index 3a09e895b..5db1e8bf9 100644
--- a/dash/previews/PaymentPreview.h
+++ b/dash/previews/PaymentPreview.h
@@ -60,6 +60,7 @@ public:
// From debug::Introspectable
std::string GetName() const;
+ void AddProperties(GVariantBuilder* builder);
// Create and connect an action link to OnActionLinkActivated
nux::ObjectPtr<ActionLink> CreateLink(dash::Preview::ActionPtr action);