Merge lp:~matteox27/lensit/lensit into lp:lensit

[Matteo Pentassuglia]

Display the names of the scopes

[Andrea Colangelo (warp10)]

Thank you for your merge proposal.

I am prone to approve your merge, but I'd like to ask you a little cleanup. You commented out a lot of lines (the ones you replaced with the code we actually need): since we don't need that code anymore, please drop it.

Please, fix this (very minor) issue, and I'll be happy to approve your merge.

review: Needs Resubmitting

[lp:~matteox27/lensit/lensit]

4. By Matteo Pentassuglia on 2012-06-18

[Andrea Colangelo (warp10)]

Thank you for resubmitting.

You mixed up spaces and tabs in your code (lines 22-28 of the diff). Python doesn't like that, please be consistent with 4 spaces (no more, no less, no tabs too) in the future. I will fix the issue before pushing.

review: Approve

=== modified file 'lensit/lensit.py'
--- lensit/lensit.py	2012-06-13 21:45:29 +0000
+++ lensit/lensit.py	2012-06-18 06:13:22 +0000
@@ -30,29 +30,19 @@
         ### Populate filters
         filters = []
         # A filter is an id, a display name, an icon (not displayed, so it's usually "None"), and a contracted state
-        f = Unity.RadioOptionFilter.new ("filter1", "RadioOption", None, False)
-        # Then we add options to the filter : an id, a display name and an icon.
-        f.add_option ("option1", "Option 1", None)
-        f.add_option ("option2", "Option 2", None)
-        f.add_option ("option3", "option 3", None)
-        filters.append (f)
-        f2 = Unity.CheckOptionFilter.new ("filter2", "CheckOption", None, False)
-        f2.add_option ("option1", "option 1", None)
-        f2.add_option ("option2", "option 2", None)
-        f2.add_option ("option3", "option 3", None)
+        f2 = Unity.CheckOptionFilter.new ("fonti", "Fonti:", None, False)
+        f2.add_option ("ubuntu-it-forum", "Ubuntu-it Forum", None)
+        f2.add_option ("ubuntu-it-news", "Ubuntu-it News", None)
+        f2.add_option ("newsletter-italiana", "Newsletter Italiana", None)
+	f2.add_option ("planet-ubuntu-it", "Planet Ubuntu-it", None)
+	f2.add_option ("documentazione", "Documentazione", None)
+	f2.add_option ("blog-fcm-italia", "Blog FCM Italia", None)
+	f2.add_option ("noisiamoubuntu", "noisiamoubuntu", None)
+	f2.add_option ("ubuntu-it-promozione", "Canale Ubuntu-it Promozione", None)
+	f2.add_option ("diffondi-ubuntu", "Diffondi Ubuntu", None)
+	f2.add_option ("launchpad-answers-it", "Launchpad Answers in Italiano", None)
         filters.append (f2)
-        f3 = Unity.CheckOptionFilterCompact.new ("filter3", "CheckOptionCompact", None, False)
-        f3.add_option ("option1", "option 1", None)
-        f3.add_option ("option2", "option 2", None)
-        f3.add_option ("option3", "option 3", None)
-        filters.append (f3)
-        f4 = Unity.MultiRangeFilter.new ("filter4", "MultiRange", None, False)
-        f4.add_option ("option1", "option 1", None)
-        f4.add_option ("option2", "option 2", None)
-        f4.add_option ("option3", "option 3", None)
-        filters.append (f4)
-        f5 = Unity.RatingsFilter.new ("filter5", "Ratings", None, False)
-        filters.append (f5)
+	
         self._lens.props.filters = filters
         
         # The lens in now ready