Merge lp:~mvo/software-center/lp977179 into lp:software-center

[Michael Vogt]

This branch started out to fix the crash in bug #977179 (it still does fix that).

But then I got carried away a bit and fixed the fact that the reviews UI does not react
properly to network change events currently. The problem is that we use "show_all" after _fill()
which means that when the elements are hidden they become visible again. This branch should fix
that now.

To test open a package with reviews like eg. apt and disconnect network-manager. In trunk
you will still see "was this review useful yes/no" but with that branch those elementes are
hidden now. Same when starting without network. When the network becomes available the elements
become available as well.

Extra critical review for this is appreciated :)

[Gary Lasker (gary-lasker)]

Michael, this is really nice. It does just the right thing. Thanks!

review: Approve

=== modified file 'softwarecenter/ui/gtk3/widgets/reviews.py'
--- softwarecenter/ui/gtk3/widgets/reviews.py	2012-03-13 08:28:22 +0000
+++ softwarecenter/ui/gtk3/widgets/reviews.py	2012-04-13 16:18:33 +0000
@@ -199,6 +199,7 @@
                 pkgversion = self._parent.app_details.version
                 review = UIReview(r, pkgversion, self.logged_in_person,
                     self.useful_votes)
+                review.show_all()
                 self.vbox.pack_start(review, True, True, 0)
 
     def _be_the_first_to_review(self):
@@ -273,7 +274,6 @@
         # always hide spinner and call _fill (fine if there is nothing to do)
         self.hide_spinner()
         self._fill()
-        self.vbox.show_all()
 
         if self.reviews:
             # adjust label if we have reviews
@@ -452,17 +452,10 @@
         self._allocation = None
 
         if review_data:
-        # when this is mapped, show/hide widgets that are network sensitive
-        # this ensures that even with show_all() we show the right stuff
-            self.connect('realize',
-                         self._on_realize,
-                         review_data,
-                         app_version,
-                         logged_in_person,
-                         useful_votes)
-
-    def _on_realize(self, widget, *content):
-        self._build(*content)
+            self._build(review_data,
+                        app_version,
+                        logged_in_person,
+                        useful_votes)
 
     def _on_report_abuse_clicked(self, button):
         reviews = self.get_ancestor(UIReviewsList)
@@ -690,6 +683,7 @@
         watcher.connect(
             "changed", lambda w, s: self._on_network_state_change())
 
+
     def _build_usefulness_ui(self, current_user_reviewer, useful_total,
                              useful_favorable, useful_votes,
                              usefulness_submit_error=False):
@@ -738,14 +732,14 @@
         if network_state_is_connected():
             self.likebox.show()
             self.useful.show()
-            self.complain.show()
+            self.flagbox.show()
         else:
             self.likebox.hide()
             # we hide the useful box because if its there it says something
             # like "10 people found this useful. Did you?" but you can't
             # actually submit anything without network
             self.useful.hide()
-            self.complain.hide()
+            self.flagbox.hide()
 
     def _get_usefulness_label(self, current_user_reviewer,
                               useful_total, useful_favorable, already_voted):
@@ -839,7 +833,6 @@
                 # verb, it won't need a question mark.
                 self.complain = Link(m % _('Inappropriate?'))
                 self.complain.set_name("subtle-label")
-                self.complain.set_sensitive(network_state_is_connected())
                 self.flagbox.pack_start(self.complain, False, False, 0)
                 self.complain.connect('clicked', self._on_report_abuse_clicked)
             self.flagbox.show_all()