Software Properties

Merge lp:~mvo/software-properties/remove-popcon into lp:software-properties

  1. remove-popcon
  2. Merge into main
Proposed by Michael Vogt
Status: Merged
Merged at revision: 789
Proposed branch: lp:~mvo/software-properties/remove-popcon
Merge into: lp:software-properties
Diff against target: 141 lines (+1/-91)
2 files modified
data/gtkbuilder/main.ui (+1/-78)
softwareproperties/gtk/SoftwarePropertiesGtk.py (+0/-13)
To merge this branch: bzr merge lp:~mvo/software-properties/remove-popcon
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+119679@code.launchpad.net

Description of the change

This branch removes the "Statistics" tab that controls sending popcon data. We don't really use the popcon data much and the software-center recommendations data submits the installed package list as well for generating the recommendations so there is uneeded overlap here.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/gtkbuilder/main.ui'
--- data/gtkbuilder/main.ui 2012-08-11 10:08:39 +0000
+++ data/gtkbuilder/main.ui 2012-08-15 07:20:25 +0000
@@ -952,83 +952,6 @@
952 </packing>952 </packing>
953 </child>953 </child>
954 <child>954 <child>
955 <object class="GtkVBox" id="vbox_popcon">
956 <property name="can_focus">False</property>
957 <property name="border_width">12</property>
958 <property name="spacing">6</property>
959 <child>
960 <object class="GtkCheckButton" id="checkbutton_popcon">
961 <property name="label" translatable="yes">Submit statistical information</property>
962 <property name="use_action_appearance">False</property>
963 <property name="visible">True</property>
964 <property name="can_focus">True</property>
965 <property name="receives_default">False</property>
966 <property name="use_action_appearance">False</property>
967 <property name="use_underline">True</property>
968 <property name="xalign">0</property>
969 <property name="draw_indicator">True</property>
970 <signal name="toggled" handler="on_checkbutton_popcon_toggled" swapped="no"/>
971 </object>
972 <packing>
973 <property name="expand">False</property>
974 <property name="fill">True</property>
975 <property name="position">0</property>
976 </packing>
977 </child>
978 <child>
979 <object class="GtkHBox" id="hbox16">
980 <property name="visible">True</property>
981 <property name="can_focus">False</property>
982 <child>
983 <object class="GtkLabel" id="label25">
984 <property name="visible">True</property>
985 <property name="can_focus">False</property>
986 <property name="label" translatable="yes"> </property>
987 </object>
988 <packing>
989 <property name="expand">False</property>
990 <property name="fill">False</property>
991 <property name="position">0</property>
992 </packing>
993 </child>
994 <child>
995 <object class="GtkLabel" id="label_popcon_desc">
996 <property name="visible">True</property>
997 <property name="can_focus">False</property>
998 <property name="xalign">0</property>
999 <property name="use_markup">True</property>
1000 <property name="wrap">True</property>
1001 </object>
1002 <packing>
1003 <property name="expand">False</property>
1004 <property name="fill">False</property>
1005 <property name="position">1</property>
1006 </packing>
1007 </child>
1008 </object>
1009 <packing>
1010 <property name="expand">False</property>
1011 <property name="fill">False</property>
1012 <property name="position">1</property>
1013 </packing>
1014 </child>
1015 </object>
1016 <packing>
1017 <property name="position">4</property>
1018 </packing>
1019 </child>
1020 <child type="tab">
1021 <object class="GtkLabel" id="label19">
1022 <property name="visible">True</property>
1023 <property name="can_focus">False</property>
1024 <property name="label" translatable="yes">Statistics</property>
1025 </object>
1026 <packing>
1027 <property name="position">4</property>
1028 <property name="tab_fill">False</property>
1029 </packing>
1030 </child>
1031 <child>
1032 <object class="GtkBox" id="vbox_drivers">955 <object class="GtkBox" id="vbox_drivers">
1033 <property name="visible">True</property>956 <property name="visible">True</property>
1034 <property name="can_focus">False</property>957 <property name="can_focus">False</property>
@@ -1110,7 +1033,7 @@
1110 </child>1033 </child>
1111 </object>1034 </object>
1112 <packing>1035 <packing>
1113 <property name="position">5</property>1036 <property name="position">4</property>
1114 </packing>1037 </packing>
1115 </child>1038 </child>
1116 <child type="tab">1039 <child type="tab">
11171040
=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-07-18 09:25:06 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-08-15 07:20:25 +0000
@@ -30,7 +30,6 @@
30from gettext import gettext as _30from gettext import gettext as _
31import os31import os
32import subprocess32import subprocess
33from struct import unpack
34from aptdaemon import client33from aptdaemon import client
35from aptdaemon.errors import NotAuthorizedError, TransactionFailed34from aptdaemon.errors import NotAuthorizedError, TransactionFailed
3635
@@ -161,7 +160,6 @@
161 self.apt_client = client.AptClient()160 self.apt_client = client.AptClient()
162161
163 # Put some life into the user interface:162 # Put some life into the user interface:
164 self.init_popcon()
165 self.init_auto_update()163 self.init_auto_update()
166 self.init_release_upgrades()164 self.init_release_upgrades()
167 self.show_auto_update_level()165 self.show_auto_update_level()
@@ -204,16 +202,6 @@
204 while Gtk.events_pending():202 while Gtk.events_pending():
205 Gtk.main_iteration()203 Gtk.main_iteration()
206204
207 def init_popcon(self):
208 """ If popcon is enabled show the statistics tab and an explanation
209 corresponding to the used distro """
210 is_helpful = self.get_popcon_participation()
211 if is_helpful != None:
212 self.label_popcon_desc.set_label(
213 softwareproperties.distro.get_popcon_description(self.distro))
214 self.vbox_popcon.show()
215 self.checkbutton_popcon.set_active(is_helpful)
216
217 def init_release_upgrades(self):205 def init_release_upgrades(self):
218 " setup the widgets that allow configuring the release upgrades "206 " setup the widgets that allow configuring the release upgrades "
219 i = self.get_release_upgrades_policy()207 i = self.get_release_upgrades_policy()
@@ -792,7 +780,6 @@
792 def on_auth_failed(self):780 def on_auth_failed(self):
793 """ send when the authentication failed """781 """ send when the authentication failed """
794 # reread the current config782 # reread the current config
795 self.init_popcon()
796 self.on_sources_list_modified()783 self.on_sources_list_modified()
797 self.on_config_modified()784 self.on_config_modified()
798 self.on_keys_modified()785 self.on_keys_modified()

Subscribers

People subscribed via source and target branches

to status/vote changes: