Merge lp:~gary-lasker/software-center/tos_buy_button_fix_lp961216 into lp:software-center

[Gary Lasker]

This branch fixes bug 961216, where the "Buy" button on the details page stays insensitive after declining the ToS dialog. See the bug for more details and steps to reproduce.

The same problem for the "Buy" button in the list view is also fixed now.

Thanks Mr. Reviewer Man

[Michael Vogt (mvo)]

Thanks for this branch.

I think we need to add a comment here to explain why we do something different here than in the other
surrounding code. Or even better move the code that make the button sensitive again closer
to where the purchase was declined.

Looking at the bug there is also the case that clicking on "buy" in the listview will make the button
no longer respond.

[Gary Lasker (gary-lasker)]

Yes, as I said in my initial comment, this MP is for the details page case. I have the code in progress to fix the list view case, and that would have followed today with a second MP.

This one is a very small change as I was trying to make a "surgical" fix with minimal code churn at this late date in the cycle, and in fact the fix does the trick fine with no regressions. But if there is an alternate and cleaner approach that will take care of both the listview and detailsview cases, I'll find that now and implement it.

Thanks mvo!

[Gary Lasker (gary-lasker)]

review: Needs Fixing

[lp:~gary-lasker/software-center/tos_buy_button_fix_lp961216]

2909. By Gary Lasker on 2012-03-22

REFACTOR: reimplement the opt-out status using a signal, not working for the list view case yet

2910. By Gary Lasker on 2012-03-22

make it work for the list view case also, and remove debug statements

2911. By Gary Lasker on 2012-03-22

remove a remaining debug statement, woops

2912. By Gary Lasker on 2012-03-22

pep8 ftw

[Gary Lasker (gary-lasker)]

Hi mvo! Ok, I reimplemented using a signal that is used for both the details view and the list view cases. Both work correctly now. Please re-review and let me know if anything else needs changing.

Thanks again!

review: Needs Resubmitting

[Michael Vogt (mvo)]

Hello Gary, thanks for your work on this branch. This is fine and covers all cases and the code is
nice and elegant.

review: Approve

[Gary Lasker (gary-lasker)]

Thanks Michael. :)

=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-03-19 21:01:41 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-03-22 23:35:23 +0000
@@ -149,6 +149,8 @@
             self.on_purchase_failed)
         self.purchase_view.connect("purchase-cancelled-by-user",
             self.on_purchase_cancelled_by_user)
+        self.purchase_view.connect("terms-of-service-declined",
+            self.on_terms_of_service_declined)
         self.purchase_view.connect("purchase-needs-spinner",
             self.on_purchase_needs_spinner)
 
@@ -260,6 +262,15 @@
     def on_purchase_cancelled_by_user(self, widget):
         self._return_to_appdetails_view()
 
+    def on_terms_of_service_declined(self, widget):
+        """ The Terms of Service dialog was declined by the user, so we just
+            reset the purchase button in case they want another chance
+        """
+        if self.is_app_details_view_showing():
+            self.app_details_view.pkg_statusbar.button.set_sensitive(True)
+        elif self.is_applist_view_showing():
+            self.app_view.tree_view.reset_action_button()
+
     def _return_to_appdetails_view(self):
         vm = get_viewmanager()
         vm.nav_back()
 
=== modified file 'softwarecenter/ui/gtk3/views/purchaseview.py'
--- softwarecenter/ui/gtk3/views/purchaseview.py	2012-03-19 14:38:10 +0000
+++ softwarecenter/ui/gtk3/views/purchaseview.py	2012-03-22 23:35:23 +0000
@@ -93,6 +93,9 @@
          'purchase-cancelled-by-user': (GObject.SignalFlags.RUN_LAST,
                                         None,
                                         ()),
+         'terms-of-service-declined': (GObject.SignalFlags.RUN_LAST,
+                                       None,
+                                       ()),
          'purchase-needs-spinner': (GObject.SignalFlags.RUN_LAST,
                                      None,
                                     (bool, )),
@@ -145,6 +148,7 @@
         for the item specified
         """
         if not self._ask_for_tos_acceptance_if_needed():
+            self.emit("terms-of-service-declined")
             return False
 
         self.init_view()
 
=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
--- softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-03-20 16:34:24 +0000
+++ softwarecenter/ui/gtk3/widgets/apptreeview.py	2012-03-22 23:35:23 +0000
@@ -172,6 +172,18 @@
     def rowref_is_category(self, rowref):
         return isinstance(rowref, CategoryRowReference)
 
+    def reset_action_button(self):
+        """ Set the current row's action button sensitivity to the
+            specified value
+        """
+        if self.selected_row_renderer:
+            action_btn = self.selected_row_renderer.get_button_by_name(
+                CellButtonIDs.ACTION)
+            if action_btn:
+                action_btn.set_sensitive(True)
+                pkgname = self.db.get_pkgname(self.selected_doc)
+                self._check_remove_pkg_from_blocklist(pkgname)
+
     def _on_realize(self, widget, tr):
         # connect to backend events once self is realized so handlers
         # have access to the TreeView's initialised Gdk.Window
@@ -270,11 +282,11 @@
         self._update_selected_row(view, tr, path)
 
     def _update_selected_row(self, view, tr, path=None):
-        # keep track of the currently selected row renderer for use when
-        # calculating icon size and coordinate values for the Unity
-        # launcher integration feature
+        # keep track of the currently selected row renderer and associated
+        # doc for use when updating the widgets and for use with the Unity
+        # integration feature
         self.selected_row_renderer = tr
-        ##
+        self.selected_doc = tr.application
         sel = view.get_selection()
         if not sel:
             return False
 
=== modified file 'softwarecenter/ui/gtk3/widgets/cellrenderers.py'
--- softwarecenter/ui/gtk3/widgets/cellrenderers.py	2012-03-12 12:43:52 +0000
+++ softwarecenter/ui/gtk3/widgets/cellrenderers.py	2012-03-22 23:35:23 +0000
@@ -529,7 +529,7 @@
         self.current_variant = current_var
 
     def is_sensitive(self):
-        return self.state == Gtk.StateFlags.INSENSITIVE
+        return self.state is not Gtk.StateFlags.INSENSITIVE
 
     def render(self, context, cr, layout):
         if not self.visible: