Merge lp:~roignac/software-center/bug-630731-free-software-view into lp:software-center

[Vadim Rutkovsky]

This changes adds a Free Software view. The packages, which have non-'Open Source' license (including 'None') are filtered

[lp:~roignac/software-center/bug-630731-free-software-view]

1980. By Vadim Rutkovsky on 2011-07-23

Updated gtk3 files

1981. By Vadim Rutkovsky on 2011-07-23

Another fix for gtk3

[Matthew Paul Thomas (mpt)]

Two typos: "counterd" and "UNRELAED".

There are larger issues with the design, but I'll address those in the bug report.

review: Needs Fixing

[dobey (dobey)]

Could you please check http://www.canonical.com/contributors and sign the
Canonical's contributor agreement ? That would be great as this is a requirement for branches to get merged into the software-center.

Thanks.

Unmerged revisions

1981. By Vadim Rutkovsky on 2011-07-23

Another fix for gtk3

1980. By Vadim Rutkovsky on 2011-07-23

Updated gtk3 files

1979. By Vadim Rutkovsky on 2011-07-23

Adding a new view - Free Software Only

=== modified file 'data/ui/gtk/SoftwareCenter.ui'
--- data/ui/gtk/SoftwareCenter.ui	2011-07-05 07:59:13 +0000
+++ data/ui/gtk/SoftwareCenter.ui	2011-07-23 14:41:45 +0000
@@ -242,6 +242,16 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkRadioMenuItem" id="menuitem_view_free_software_only">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Free Software</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_as_radio">True</property>
+                        <property name="group">menuitem_view_supported_only</property>
+                        <signal name="activate" handler="on_menuitem_view_free_software_only_activate"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkRadioMenuItem" id="menuitem_view_supported_only">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Canonical-Maintained Software</property>

=== modified file 'data/ui/gtk3/SoftwareCenter.ui'
--- data/ui/gtk3/SoftwareCenter.ui	2011-07-05 09:53:26 +0000
+++ data/ui/gtk3/SoftwareCenter.ui	2011-07-23 14:41:45 +0000
@@ -394,6 +394,18 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkRadioMenuItem" id="menuitem_view_free_software_only">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">_Free Software</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_as_radio">True</property>
+                        <property name="group">menuitem_view_supported_only</property>
+                        <signal name="activate" handler="on_menuitem_view_free_software_only_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkRadioMenuItem" id="menuitem_view_supported_only">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>

=== modified file 'po/software-center.pot'
--- po/software-center.pot	2011-07-21 15:28:53 +0000
+++ po/software-center.pot	2011-07-23 14:41:45 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-21 17:04+0200\n"
+"POT-Creation-Date: 2011-07-23 15:23+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -199,7 +199,7 @@
 #. located directly beneath a label asking 'Why is this review inappropriate?'.
 #. This text refers to a possible reason for why the corresponding
 #. review is being flagged as inappropriate.
-#: ../utils/submit_review.py:1201 ../softwarecenter/backend/channel.py:424
+#: ../utils/submit_review.py:1201 ../softwarecenter/backend/channel.py:431
 msgid "Other"
 msgstr ""
 
@@ -278,34 +278,38 @@
 msgstr ""
 
 #: ../data/ui/gtk/SoftwareCenter.ui.h:12
+msgid "_Free Software"
+msgstr ""
+
+#: ../data/ui/gtk/SoftwareCenter.ui.h:13
 msgid "_Go Back"
 msgstr ""
 
-#: ../data/ui/gtk/SoftwareCenter.ui.h:13
+#: ../data/ui/gtk/SoftwareCenter.ui.h:14
 msgid "_Go Forward"
 msgstr ""
 
-#: ../data/ui/gtk/SoftwareCenter.ui.h:14
+#: ../data/ui/gtk/SoftwareCenter.ui.h:15
 msgid "_Help"
 msgstr ""
 
-#: ../data/ui/gtk/SoftwareCenter.ui.h:15
+#: ../data/ui/gtk/SoftwareCenter.ui.h:16
 msgid "_Install"
 msgstr ""
 
-#: ../data/ui/gtk/SoftwareCenter.ui.h:16
+#: ../data/ui/gtk/SoftwareCenter.ui.h:17
 msgid "_Software Sources…"
 msgstr ""
 
-#: ../data/ui/gtk/SoftwareCenter.ui.h:17
+#: ../data/ui/gtk/SoftwareCenter.ui.h:18
 msgid "_View"
 msgstr ""
 
-#: ../data/ui/gtk/SoftwareCenter.ui.h:18
+#: ../data/ui/gtk/SoftwareCenter.ui.h:19
 msgid "translator-credits"
 msgstr ""
 
-#: ../data/ui/gtk/SoftwareCenter.ui.h:19
+#: ../data/ui/gtk/SoftwareCenter.ui.h:20
 msgid "©2009-2011 Canonical"
 msgstr ""
 
@@ -447,7 +451,7 @@
 #. aquired for purchase in utils/submit_review.py
 #. the other one in softwarecenter/app.py
 #: ../data/ubuntu-software-center.desktop.in.h:3
-#: ../softwarecenter/ui/gtk/app.py:756 ../softwarecenter/distro/Ubuntu.py:58
+#: ../softwarecenter/ui/gtk/app.py:760 ../softwarecenter/distro/Ubuntu.py:58
 msgid "Ubuntu Software Center"
 msgstr ""
 
@@ -456,11 +460,11 @@
 "Lets you choose from thousands of applications available for your system "
 msgstr ""
 
-#: ../data/featured.menu.in.h:1 ../softwarecenter/ui/gtk/catview_gtk.py:426
+#: ../data/featured.menu.in.h:1 ../softwarecenter/ui/gtk/catview_gtk.py:450
 msgid "Featured"
 msgstr ""
 
-#: ../data/new.menu.in.h:1 ../softwarecenter/ui/gtk/catview_gtk.py:462
+#: ../data/new.menu.in.h:1 ../softwarecenter/ui/gtk/catview_gtk.py:486
 msgid "What’s New"
 msgstr ""
 
@@ -704,13 +708,13 @@
 msgid "Please re-install the 'software-center' package."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/app.py:757
+#: ../softwarecenter/ui/gtk/app.py:761
 msgid "Ubuntu Software Center Store"
 msgstr ""
 
 #. display a "Loading" spinner until we actually display the
 #. details view for the deb file
-#: ../softwarecenter/ui/gtk/app.py:1159
+#: ../softwarecenter/ui/gtk/app.py:1183
 #: ../softwarecenter/ui/gtk/availablepane.py:116
 msgid "Loading"
 msgstr ""
@@ -724,26 +728,34 @@
 msgid "_Ignore and install"
 msgstr ""
 
-#: ../softwarecenter/backend/channel.py:414
+#: ../softwarecenter/backend/channel.py:421
 msgid "Canonical Partners"
 msgstr ""
 
-#: ../softwarecenter/backend/channel.py:416
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1320
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1326
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1330
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1748
+#: ../softwarecenter/backend/channel.py:423
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1322
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1328
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1332
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1750
 msgid "Unknown"
 msgstr ""
 
-#: ../softwarecenter/backend/channel.py:420
+#: ../softwarecenter/backend/channel.py:427
 msgid "For Purchase"
 msgstr ""
 
-#: ../softwarecenter/backend/channel.py:422
+#: ../softwarecenter/backend/channel.py:429
 msgid "Independent"
 msgstr ""
 
+#: ../softwarecenter/backend/channel.py:508
+msgid "All Software"
+msgstr ""
+
+#: ../softwarecenter/backend/channel.py:514
+msgid "All Installed"
+msgstr ""
+
 #: ../softwarecenter/db/application.py:198
 #: ../softwarecenter/db/application.py:298
 #: ../softwarecenter/db/application.py:425
@@ -792,7 +804,7 @@
 #. provide a list of words in your language that people are likely
 #. to include in a search but that should normally be ignored in
 #. the search.
-#: ../softwarecenter/db/database.py:104
+#: ../softwarecenter/db/database.py:118
 msgid "app;application;package;program;programme;suite;tool"
 msgstr ""
 
@@ -1197,52 +1209,52 @@
 msgstr ""
 
 #. Update total size label
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1347
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1349
 msgid "Calculating..."
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1419
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1421
 msgid "This program is run from a terminal: "
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1420
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1422
 msgid "These programs are run from a terminal: "
 msgstr ""
 
 #. display launcher location
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1442
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1444
 msgid "Find it in the menu: "
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1731
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1733
 #, python-format
 msgid "%sB to download, "
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1734
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1736
 #, python-format
 msgid "%sB when installed"
 msgstr ""
 
 #. FIXME: this is not really a good indication of the size on disk
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1742
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1744
 #, python-format
 msgid "%sB on disk"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1745
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1747
 #, python-format
 msgid "%sB to be freed"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1770
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1772
 #, python-format
 msgid "Used: one time"
 msgid_plural "Used: %(amount)s times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1774
+#: ../softwarecenter/ui/gtk/appdetailsview_gtk.py:1776
 msgid "Used: over 100 times"
 msgstr ""
 
@@ -1385,13 +1397,13 @@
 msgstr ""
 
 #: ../softwarecenter/ui/gtk/catview_gtk.py:100
-#: ../softwarecenter/ui/gtk/catview_gtk.py:524
+#: ../softwarecenter/ui/gtk/catview_gtk.py:552
 #: ../softwarecenter/ui/gtk/catview_webkit.py:62
 #: ../softwarecenter/ui/gtk/catview_webkit.py:72
 msgid "Departments"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/catview_gtk.py:305
+#: ../softwarecenter/ui/gtk/catview_gtk.py:329
 #, python-format
 msgid "Welcome back! There is <a href=\"\">%i new recommendation</a> for you."
 msgid_plural ""
@@ -1399,18 +1411,18 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../softwarecenter/ui/gtk/catview_gtk.py:316
+#: ../softwarecenter/ui/gtk/catview_gtk.py:340
 msgid "Recommendations"
 msgstr ""
 
-#: ../softwarecenter/ui/gtk/catview_gtk.py:385
+#: ../softwarecenter/ui/gtk/catview_gtk.py:409
 msgid "Top Rated"
 msgstr ""
 
 #. append an additional button to show all of the items in the category
 #. an AppStore
-#: ../softwarecenter/ui/gtk/catview_gtk.py:614
-#: ../softwarecenter/ui/gtk/catview_gtk.py:616
+#: ../softwarecenter/ui/gtk/catview_gtk.py:642
+#: ../softwarecenter/ui/gtk/catview_gtk.py:644
 #: ../softwarecenter/ui/gtk/widgets/carousel.py:72
 msgid "All"
 msgstr ""

=== modified file 'softwarecenter/ui/gtk/app.py'
--- softwarecenter/ui/gtk/app.py	2011-07-20 21:31:07 +0000
+++ softwarecenter/ui/gtk/app.py	2011-07-23 14:41:45 +0000
@@ -522,14 +522,18 @@
         # set menu sensitve
         self.menuitem_view_supported_only.set_sensitive(self.active_pane != None)
         self.menuitem_view_all.set_sensitive(self.active_pane != None)
+        self.menuitem_view_free_software_only.set_sensitive(self.active_pane != None)
         # set menu state
         if self.active_pane:
             self._block_menuitem_view = True
             if not self.active_pane.apps_filter:
                 self.menuitem_view_all.set_sensitive(False)
+                self.menuitem_view_free_software_only.set_sensitive(False)
                 self.menuitem_view_supported_only.set_sensitive(False)
             elif self.active_pane.apps_filter.get_supported_only():
                 self.menuitem_view_supported_only.activate()
+            elif self.active_pane.apps_filter.get_free_software_only():
+                self.menuitem_view_free_software_only.activate()
             else:
                 self.menuitem_view_all.activate()
             self._block_menuitem_view = False
@@ -938,6 +942,26 @@
                     self.available_pane.subcategories_view.current_category,
                     len(self.available_pane.app_view.get_model()))
 
+    def on_menuitem_view_free_software_only_activate(self, widget):
+        if (not self._block_menuitem_view and
+            self.active_pane.apps_filter and
+            not self.active_pane.apps_filter.get_free_software_only()):
+            self.active_pane.apps_filter.set_free_software_only(True)
+            self.active_pane.refresh_apps()
+
+            # update recommended widget counterd
+            if self.available_pane and self.available_pane.cat_view:
+                self.available_pane.cat_view._append_recommendations()
+
+            # update subcategory view
+            if (self.available_pane and
+                self.available_pane == self.active_pane and
+                self.available_pane.subcategories_view and
+                self.available_pane.subcategories_view.current_category):
+                self.available_pane.subcategories_view._append_subcat_departments(
+                    self.available_pane.subcategories_view.current_category,
+                    len(self.available_pane.app_view.get_model()))
+
     def on_menuitem_view_supported_only_activate(self, widget):
         if (not self._block_menuitem_view and
             self.active_pane.apps_filter and

=== modified file 'softwarecenter/ui/gtk/appview.py'
--- softwarecenter/ui/gtk/appview.py	2011-07-15 14:24:08 +0000
+++ softwarecenter/ui/gtk/appview.py	2011-07-23 14:41:45 +0000
@@ -1113,6 +1113,7 @@
             self.lowlevel_cache = None
         self.available_only = False
         self.supported_only = False
+        self.free_software_only = False
         self.installed_only = False
         self.not_installed_only = False
     @property
@@ -1120,18 +1121,23 @@
         """ True if the filter is in a state that it should be part of a query """
         return (self.available_only or
                 self.supported_only or
-                self.installed_only or 
+                self.installed_only or
+                self.free_software_only or 
                 self.not_installed_only)
     def set_available_only(self, v):
         self.available_only = v
     def set_supported_only(self, v):
         self.supported_only = v
+    def set_free_software_only(self, v):
+        self.free_software_only = v
     def set_installed_only(self, v):
         self.installed_only = v
     def set_not_installed_only(self, v):
         self.not_installed_only = v
     def get_supported_only(self):
         return self.supported_only
+    def get_free_software_only(self):
+        return self.free_software_only
     def __eq__(self, other):
         if self is None and other is not None: 
             return True
@@ -1139,16 +1145,17 @@
             return False
         return (self.installed_only == other.installed_only and
                 self.not_installed_only == other.not_installed_only and
-                self.supported_only == other.supported_only)
+                self.supported_only == other.supported_only and
+                self.free_software_only == other.free_software_only)
     def __ne__(self, other):
         return not self.__eq__(other)
     def __call__(self, doc):
         """return True if the package should be displayed"""
         # get pkgname from document
         pkgname =  self.db.get_pkgname(doc)
-        #LOG.debug(
-        #    "filter: supported_only: %s installed_only: %s '%s'" % (
-        #        self.supported_only, self.installed_only, pkgname))
+        #LOG.warn(
+        #    "filter: supported_only: %s installed_only: %s free only %s '%s'" % (
+        #        self.supported_only, self.installed_only, self.free_software_only, pkgname))
         if self.available_only:
             # an item is considered available if it is either found
             # in the cache or is available for purchase
@@ -1169,6 +1176,10 @@
             if (pkgname in self.cache and
                 self.cache[pkgname].is_installed):
                 return False
+        if self.free_software_only:
+            component = doc.get_value(XapianValues.ARCHIVE_SECTION)
+            if self.distro.get_license_text(component) != "Open source":
+                return False
         if self.supported_only:
             if not self.distro.is_supported(self.cache, doc, pkgname):
                 return False

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2011-07-20 12:05:57 +0000
+++ softwarecenter/ui/gtk3/app.py	2011-07-23 14:41:45 +0000
@@ -579,14 +579,18 @@
         # set menu sensitve
         self.menuitem_view_supported_only.set_sensitive(self.active_pane != None)
         self.menuitem_view_all.set_sensitive(self.active_pane != None)
+        self.menuitem_view_free_software_only.set_sensitive(self.active_pane != None)
         # set menu state
         if self.active_pane:
             self._block_menuitem_view = True
             if not self.active_pane.apps_filter:
                 self.menuitem_view_all.set_sensitive(False)
+                self.menuitem_view_free_software_only.set_sensitive(False)
                 self.menuitem_view_supported_only.set_sensitive(False)
             elif self.active_pane.apps_filter.get_supported_only():
                 self.menuitem_view_supported_only.activate()
+            elif self.active_pane.apps_filter.get_free_software_only():
+                self.menuitem_view_free_software_only.activate()
             else:
                 self.menuitem_view_all.activate()
             self._block_menuitem_view = False
@@ -1000,6 +1004,26 @@
                     self.available_pane.subcategories_view.current_category,
                     len(self.available_pane.app_view.get_model()))
 
+    def on_menuitem_view_free_software_only_activate(self, widget):
+        if (not self._block_menuitem_view and
+            self.active_pane.state and
+            not self.active_pane.state.filter.get_free_software_only()):
+            self.active_pane.state.filter.set_free_software_only(True)
+            self.active_pane.refresh_apps()
+
+            # update recommended widget counter
+            if self.available_pane and self.available_pane.cat_view:
+                self.available_pane.cat_view._append_recommendations()
+
+            # update subcategory view
+            if (self.available_pane and
+                self.available_pane == self.active_pane and
+                self.available_pane.subcategories_view and
+                self.available_pane.subcategories_view.current_category):
+                self.available_pane.subcategories_view._append_subcat_departments(
+                    self.available_pane.subcategories_view.current_category,
+                    len(self.available_pane.app_view.get_model()))
+
     def on_menuitem_view_supported_only_activate(self, widget):
         if (not self._block_menuitem_view and
             self.active_pane.state and

=== modified file 'softwarecenter/ui/gtk3/views/appview.py'
--- softwarecenter/ui/gtk3/views/appview.py	2011-07-20 12:05:57 +0000
+++ softwarecenter/ui/gtk3/views/appview.py	2011-07-23 14:41:45 +0000
@@ -563,6 +563,7 @@
         self.db = db
         self.cache = cache
         self.available_only = False
+        self.free_software_only = False
         self.supported_only = False
         self.installed_only = False
         self.not_installed_only = False
@@ -571,18 +572,23 @@
         """ True if the filter is in a state that it should be part of a query """
         return (self.available_only or
                 self.supported_only or
+                self.free_software_only or
                 self.installed_only or 
                 self.not_installed_only)
     def set_available_only(self, v):
         self.available_only = v
     def set_supported_only(self, v):
         self.supported_only = v
+    def set_free_software_only(self, v):
+        self.free_software_only = v
     def set_installed_only(self, v):
         self.installed_only = v
     def set_not_installed_only(self, v):
         self.not_installed_only = v
     def get_supported_only(self):
         return self.supported_only
+    def get_free_software_only(self):
+        return self.free_software_only
     def __eq__(self, other):
         if self is None and other is not None: 
             return True
@@ -590,6 +596,7 @@
             return False
         return (self.installed_only == other.installed_only and
                 self.not_installed_only == other.not_installed_only and
+                self.free_software_only == other.free_software_only and
                 self.supported_only == other.supported_only)
     def __ne__(self, other):
         return not self.__eq__(other)
@@ -616,6 +623,10 @@
             if (pkgname in self.cache and
                 self.cache[pkgname].is_installed):
                 return False
+        if self.free_software_only:
+            component = doc.get_value(XapianValues.ARCHIVE_SECTION)
+            if self.distro.get_license_text(component) != "Open source":
+                return False
         if self.supported_only:
             if not self.distro.is_supported(self.cache, doc, pkgname):
                 return False

=== modified file 'softwarecenter/version.py'
--- softwarecenter/version.py	2011-07-21 15:28:53 +0000
+++ softwarecenter/version.py	2011-07-23 14:41:45 +0000
@@ -1,5 +1,5 @@
 
-VERSION='4.1.10'
-CODENAME='UNRELEASED'
+VERSION='4.1.11'
+CODENAME='UNRELAED'
 DISTRO='Ubuntu'
 RELEASE='11.10'