Merge lp:~elachuni/software-center/disable-new-review into lp:software-center

[Anthony Lenton]

Overview
========
This branch disables the "Submit a new review" button when you click it, and reenables it when the submit review dialog closes.

Details
=======
To give some visual feedback about the disabled link, I applied the "subtle-label" style to it. I'm not sure this is the most appropriate style, or if we should use something more specific. Calling set_sensitive(False) also means that the pointer is no longer a hand when you hover over the link.

Some tests provided.

[Anthony Lenton (elachuni)]

... Also, while I was there, I made the submit_review_gtk3.py script set softwarecenter.paths.datadir to the one provided via the command line, so that this works in a local environment.

[Michael Vogt (mvo)]

Thanks, very nice!

review: Approve

=== modified file 'softwarecenter/backend/reviews/rnr.py'
--- softwarecenter/backend/reviews/rnr.py	2012-01-17 21:25:58 +0000
+++ softwarecenter/backend/reviews/rnr.py	2012-01-19 19:12:39 +0000
@@ -181,7 +181,8 @@
     # writing new reviews spawns external helper
     # FIXME: instead of the callback we should add proper gobject signals
     def spawn_write_new_review_ui(self, translated_app, version, iconname, 
-                                  origin, parent_xid, datadir, callback):
+                                  origin, parent_xid, datadir, callback,
+                                  done_callback=None):
         """ this spawns the UI for writing a new review and
             adds it automatically to the reviews DB """
         app = translated_app.get_untranslated_app(self.db)
@@ -199,6 +200,9 @@
         spawn_helper = SpawnHelper(format="json")
         spawn_helper.connect(
             "data-available", self._on_submit_review_data, app, callback)
+        if done_callback:
+            spawn_helper.connect("exited", done_callback)
+            spawn_helper.connect("error", done_callback)
         spawn_helper.run(cmd)
 
     def _on_submit_review_data(self, spawn_helper, review_json, app, callback):

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-01-18 16:32:18 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2012-01-19 19:12:39 +0000
@@ -854,6 +854,9 @@
         else:
             self.review_stats_widget.hide()
 
+    def _submit_reviews_done_callback(self, spawner, error):
+        self.reviews.new_review.enable()
+
     def _reviews_ready_callback(self, app, reviews_data, my_votes=None,
                                 action=None, single_review=None):
         """ callback when new reviews are ready, cleans out the
@@ -1607,10 +1610,12 @@
         # call the loader to do call out the right helper and collect the result
         parent_xid = ''
         #parent_xid = get_parent_xid(self)
+        self.reviews.new_review.disable()
         self.review_loader.spawn_write_new_review_ui(
             self.app, version, self.appdetails.icon, origin,
             parent_xid, self.datadir,
-            self._reviews_ready_callback)
+            self._reviews_ready_callback,
+            done_callback=self._submit_reviews_done_callback)
                          
     def _review_report_abuse(self, review_id):
         parent_xid = ''

=== modified file 'softwarecenter/ui/gtk3/widgets/buttons.py'
--- softwarecenter/ui/gtk3/widgets/buttons.py	2012-01-05 09:53:52 +0000
+++ softwarecenter/ui/gtk3/widgets/buttons.py	2012-01-19 19:12:39 +0000
@@ -580,6 +580,13 @@
         self.emit("clicked")
         return
 
+    def disable(self):
+        self.set_sensitive(False)
+        self.set_name("subtle-label")
+
+    def enable(self):
+        self.set_sensitive(True)
+        self.set_name("label")
 
 class MoreLink(Gtk.Button):
 

=== modified file 'test/gtk3/test_appdetailsview.py'
--- test/gtk3/test_appdetailsview.py	2012-01-18 20:12:05 +0000
+++ test/gtk3/test_appdetailsview.py	2012-01-19 19:12:39 +0000
@@ -230,6 +230,24 @@
         self.assertEqual(False, kwargs['relaxed'])
         self.assertEqual(2, kwargs['page'])
 
+    @patch('softwarecenter.backend.spawn_helper.SpawnHelper.run')
+    def test_submit_new_review_disables_button(self, mock_run):
+        button = self.view.reviews.new_review
+        self.assertTrue(button.is_sensitive())
+
+        button.emit('clicked')
+
+        self.assertFalse(button.is_sensitive())
+
+    def test_new_review_dialog_closes_reenables_submit_button(self):
+        button = self.view.reviews.new_review
+        button.disable()
+
+        self.view._submit_reviews_done_callback(None, 0)
+
+        self.assertTrue(button.is_sensitive())
+
+    
 
 if __name__ == "__main__":
     import logging

=== modified file 'utils/submit_review_gtk3.py'
--- utils/submit_review_gtk3.py	2012-01-19 09:23:54 +0000
+++ utils/submit_review_gtk3.py	2012-01-19 19:12:39 +0000
@@ -31,6 +31,7 @@
 from gettext import gettext as _
 from optparse import OptionParser
 
+import softwarecenter.paths
 from softwarecenter.paths import SOFTWARE_CENTER_CACHE_DIR
 from softwarecenter.db.database import Application
 
@@ -85,6 +86,8 @@
                           action="store_true", default=False)
         (options, args) = parser.parse_args()
 
+        softwarecenter.paths.datadir = options.datadir
+
         if options.test:
             options.pkgname = options.pkgname or 'apt'
             options.appname = options.appname or 'Apt'
@@ -122,6 +125,8 @@
                           action="store_true", default=False)
         (options, args) = parser.parse_args()
 
+        softwarecenter.paths.datadir = options.datadir
+
         if not (options.review_id):
             parser.error(_("Missing review-id arguments"))
     
@@ -146,6 +151,8 @@
                           action="store_true", default=False)
         (options, args) = parser.parse_args()
 
+        softwarecenter.paths.datadir = options.datadir
+
         if not (options.review_id):
             parser.error(_("Missing review-id arguments"))
     
@@ -170,6 +177,8 @@
                           action="store_true", default=False)
         (options, args) = parser.parse_args()
         
+        softwarecenter.paths.datadir = options.datadir
+
         if not (options.review_id):
             parser.error(_("Missing review-id argument"))
     
@@ -192,6 +201,8 @@
                           action="store_true", default=False)
         (options, args) = parser.parse_args()
 
+        softwarecenter.paths.datadir = options.datadir
+
         if not (options.review_id):
             parser.error(_("Missing review-id argument"))