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
1=== modified file 'data/gtkbuilder/main.ui'
2--- data/gtkbuilder/main.ui 2012-08-11 10:08:39 +0000
3+++ data/gtkbuilder/main.ui 2012-08-15 07:20:25 +0000
4@@ -952,83 +952,6 @@
5 </packing>
6 </child>
7 <child>
8- <object class="GtkVBox" id="vbox_popcon">
9- <property name="can_focus">False</property>
10- <property name="border_width">12</property>
11- <property name="spacing">6</property>
12- <child>
13- <object class="GtkCheckButton" id="checkbutton_popcon">
14- <property name="label" translatable="yes">Submit statistical information</property>
15- <property name="use_action_appearance">False</property>
16- <property name="visible">True</property>
17- <property name="can_focus">True</property>
18- <property name="receives_default">False</property>
19- <property name="use_action_appearance">False</property>
20- <property name="use_underline">True</property>
21- <property name="xalign">0</property>
22- <property name="draw_indicator">True</property>
23- <signal name="toggled" handler="on_checkbutton_popcon_toggled" swapped="no"/>
24- </object>
25- <packing>
26- <property name="expand">False</property>
27- <property name="fill">True</property>
28- <property name="position">0</property>
29- </packing>
30- </child>
31- <child>
32- <object class="GtkHBox" id="hbox16">
33- <property name="visible">True</property>
34- <property name="can_focus">False</property>
35- <child>
36- <object class="GtkLabel" id="label25">
37- <property name="visible">True</property>
38- <property name="can_focus">False</property>
39- <property name="label" translatable="yes"> </property>
40- </object>
41- <packing>
42- <property name="expand">False</property>
43- <property name="fill">False</property>
44- <property name="position">0</property>
45- </packing>
46- </child>
47- <child>
48- <object class="GtkLabel" id="label_popcon_desc">
49- <property name="visible">True</property>
50- <property name="can_focus">False</property>
51- <property name="xalign">0</property>
52- <property name="use_markup">True</property>
53- <property name="wrap">True</property>
54- </object>
55- <packing>
56- <property name="expand">False</property>
57- <property name="fill">False</property>
58- <property name="position">1</property>
59- </packing>
60- </child>
61- </object>
62- <packing>
63- <property name="expand">False</property>
64- <property name="fill">False</property>
65- <property name="position">1</property>
66- </packing>
67- </child>
68- </object>
69- <packing>
70- <property name="position">4</property>
71- </packing>
72- </child>
73- <child type="tab">
74- <object class="GtkLabel" id="label19">
75- <property name="visible">True</property>
76- <property name="can_focus">False</property>
77- <property name="label" translatable="yes">Statistics</property>
78- </object>
79- <packing>
80- <property name="position">4</property>
81- <property name="tab_fill">False</property>
82- </packing>
83- </child>
84- <child>
85 <object class="GtkBox" id="vbox_drivers">
86 <property name="visible">True</property>
87 <property name="can_focus">False</property>
88@@ -1110,7 +1033,7 @@
89 </child>
90 </object>
91 <packing>
92- <property name="position">5</property>
93+ <property name="position">4</property>
94 </packing>
95 </child>
96 <child type="tab">
97
98=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
99--- softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-07-18 09:25:06 +0000
100+++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2012-08-15 07:20:25 +0000
101@@ -30,7 +30,6 @@
102 from gettext import gettext as _
103 import os
104 import subprocess
105-from struct import unpack
106 from aptdaemon import client
107 from aptdaemon.errors import NotAuthorizedError, TransactionFailed
108
109@@ -161,7 +160,6 @@
110 self.apt_client = client.AptClient()
111
112 # Put some life into the user interface:
113- self.init_popcon()
114 self.init_auto_update()
115 self.init_release_upgrades()
116 self.show_auto_update_level()
117@@ -204,16 +202,6 @@
118 while Gtk.events_pending():
119 Gtk.main_iteration()
120
121- def init_popcon(self):
122- """ If popcon is enabled show the statistics tab and an explanation
123- corresponding to the used distro """
124- is_helpful = self.get_popcon_participation()
125- if is_helpful != None:
126- self.label_popcon_desc.set_label(
127- softwareproperties.distro.get_popcon_description(self.distro))
128- self.vbox_popcon.show()
129- self.checkbutton_popcon.set_active(is_helpful)
130-
131 def init_release_upgrades(self):
132 " setup the widgets that allow configuring the release upgrades "
133 i = self.get_release_upgrades_policy()
134@@ -792,7 +780,6 @@
135 def on_auth_failed(self):
136 """ send when the authentication failed """
137 # reread the current config
138- self.init_popcon()
139 self.on_sources_list_modified()
140 self.on_config_modified()
141 self.on_keys_modified()

Subscribers

People subscribed via source and target branches

to status/vote changes: