git.iko.soy/unity8
on xenial help sign in
Make the plug-in work and send the data back.
commit0d7c8082725b7740c890d8cb8bfbb828d175af2c authorRodney Dawes <rodney.dawes@canonical.com> dateThu 29 May 2014, 08:42 (12 years ago) parent8fc8a8f
3 files changed+9−13
compare with xenial
unifiedsplit
plugins/Ubuntu/Payments/Payments.cpp+3−5 plugins/Ubuntu/Payments/Payments.h+3−3 qml/Dash/Previews/PreviewPayments.qml+3−5
plugins/Ubuntu/Payments/Payments.cpp+3−5
@@ -90,12 +90,12 @@ void observer(PayPackage* package, const char* /*itemid*/, PayPackageItemStatus
9090 case PAY_PACKAGE_ITEM_STATUS_VERIFYING:
9191 break;
9292 case PAY_PACKAGE_ITEM_STATUS_PURCHASED:
93− Q_EMIT self->finished();
93+ Q_EMIT self->purchaseCompleted();
9494 break;
9595 case PAY_PACKAGE_ITEM_STATUS_PURCHASING:
9696 break;
9797 case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:
98− Q_EMIT self->error("not purchased");
98+ Q_EMIT self->purchaseError("not purchased");
9999 break;
100100 case PAY_PACKAGE_ITEM_STATUS_UNKNOWN:
101101 break;
@@ -115,11 +115,9 @@ void Payments::start()
115115 qDebug() << "after new" << ba.data();
116116 pay_package_item_observer_install(package, observer, this);
117117 qDebug() << "after observer install";
118+ // FIXME: Enable once verification is working in pay-service.
118119 //pay_package_item_start_verification(package, ba.data());
119120 qDebug() << "after start verify";
120121 pay_package_item_start_purchase(package, ba.data());
121122 qDebug() << "after start purchase";
122−
123− // FIXME: remove this when the payments service starts working ok
124− finished();
125123}
plugins/Ubuntu/Payments/Payments.h+3−3
@@ -53,9 +53,9 @@ Q_SIGNALS:
5353 void storeItemIdChanged(const QString &store_item_id);
5454 void formattedPriceChanged(const QString &formatted_price);
5555
56− void canceled();
57− void error(const QString &error);
58− void finished();
56+ void purchaseCanceled();
57+ void purchaseError(const QString &error);
58+ void purchaseCompleted();
5959
6060private:
6161 QString m_currency;
qml/Dash/Previews/PreviewPayments.qml+3−5
@@ -38,8 +38,6 @@ PreviewWidget {
3838 objectName: "paymentButton"
3939 color: Theme.palette.selected.foreground
4040 text: paymentClient.formattedPrice
41− iconSource: data && data.icon || ""
42− iconPosition: "left"
4341 onClicked: paymentClient.start()
4442 anchors.right: parent.right
4543 width: (root.width - units.gu(1)) / 2
@@ -49,9 +47,9 @@ PreviewWidget {
4947 price: paymentButton.source["price"]
5048 currency: paymentButton.source["currency"]
5149 storeItemId: paymentButton.source["store_item_id"]
52− onFinished: root.triggered(widgetId, "finished", data)
53− onCanceled: root.triggered(widgetId, "canceled", data)
54− onError: root.triggered(widgetId, "error", data)
50+ onPurchaseCompleted: root.triggered(widgetId, "purchaseCompleted", paymentButton.source)
51+ onPurchaseCanceled: root.triggered(widgetId, "purchaseCanceled", paymentButton.source)
52+ onPurchaseError: root.triggered(widgetId, "purchaseError", paymentButton.source)
5553 }
5654 }
5755}