Merge lp:~hmollercl/software-properties/software-properties into lp:software-properties

Proposed by Hans P. Möller on 2019-02-17
Status: Merged
Merged at revision: 1078
Proposed branch: lp:~hmollercl/software-properties/software-properties
Merge into: lp:software-properties
Diff against target: 321 lines (+62/-36) (has conflicts)
7 files modified
data/designer/main.ui (+2/-2)
data/software-properties-drivers-qt.desktop.in (+13/-0)
data/software-properties-qt.desktop.in (+2/-2)
debian/changelog (+14/-0)
debian/control (+1/-1)
softwareproperties/SoftwareProperties.py (+1/-2)
softwareproperties/qt/SoftwarePropertiesQt.py (+29/-29)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~hmollercl/software-properties/software-properties
Reviewer Review Type Date Requested Status
Walter Lapchynski 2019-02-17 Pending
Simon Quigley 2019-02-17 Pending
Review via email: mp+363293@code.launchpad.net

Commit message

Change debconf frontend of software-properties-qt from gnome to kde.
Added debconf-kde-helper as requiered dependency for software-properties-qt.

Description of the change

Gnome debconf frontend doesn't work easily on Qt DE. On the other hand kde debconf frontend works perfect when debconf-kde-helper is in place

To post a comment you must log in.
Simon Quigley (tsimonq2) wrote :

Could you please add a changelog entry?

1069. By Hans P. Möller on 2019-02-18

added changes to changelog

1070. By Hans P. Möller on 2019-02-22

added/changed desktop entries for LXQt

1071. By Hans P. Möller on 2019-02-22

Solve bug 1801439

1072. By Hans P. Möller on 2019-02-24

fixing typos

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/designer/main.ui'
2--- data/designer/main.ui 2018-12-29 02:11:03 +0000
3+++ data/designer/main.ui 2019-02-24 16:52:14 +0000
4@@ -558,7 +558,7 @@
5 <x>0</x>
6 <y>0</y>
7 <width>670</width>
8- <height>244</height>
9+ <height>255</height>
10 </rect>
11 </property>
12 <layout class="QVBoxLayout" name="verticalLayout_3">
13@@ -611,7 +611,7 @@
14 <item>
15 <widget class="QLabel" name="label_driver_action">
16 <property name="text">
17- <string>No propietary drivers are in use.</string>
18+ <string>No proprietary drivers are in use.</string>
19 </property>
20 </widget>
21 </item>
22
23=== added file 'data/software-properties-drivers-qt.desktop.in'
24--- data/software-properties-drivers-qt.desktop.in 1970-01-01 00:00:00 +0000
25+++ data/software-properties-drivers-qt.desktop.in 2019-02-24 16:52:14 +0000
26@@ -0,0 +1,13 @@
27+[Desktop Entry]
28+Keywords=Drivers;
29+Exec=lxqt-sudo /usr/bin/software-properties-qt --open-tab=4
30+Icon=jockey
31+Terminal=false
32+Type=Application
33+OnlyShowIn=LXQt;
34+Categories=Settings;HardwareSettings;System;
35+X-AppStream-Ignore=true
36+Name=Additional Drivers
37+Name[es]=Controladores adicionales
38+Comment=Configure third-party and proprietary drivers
39+Comment[es]=Configure controladores privativos y de terceros
40
41=== modified file 'data/software-properties-qt.desktop.in'
42--- data/software-properties-qt.desktop.in 2018-07-14 10:11:32 +0000
43+++ data/software-properties-qt.desktop.in 2019-02-24 16:52:14 +0000
44@@ -2,9 +2,9 @@
45 _Name=Software Sources
46 _GenericName=Software Sources
47 _Comment=Configure the sources for installable software and updates
48-Exec=software-properties-qt
49+Exec=lxqt-sudo software-properties-qt
50 Icon=applications-other
51-NoDisplay=true
52+OnlyShowIn=LXQt;
53 Terminal=false
54 X-MultipleArgs=false
55 Type=Application
56
57=== modified file 'debian/changelog'
58--- debian/changelog 2019-02-19 09:39:44 +0000
59+++ debian/changelog 2019-02-24 16:52:14 +0000
60@@ -1,3 +1,4 @@
61+<<<<<<< TREE
62 software-properties (0.97.6) disco; urgency=medium
63
64 * debian/control:
65@@ -31,6 +32,19 @@
66
67 -- Andrea Azzarone <andrea.azzarone@canonical.com> Tue, 29 Jan 2019 18:29:18 +0000
68
69+=======
70+software-properties (0.97.3) disco; urgency=medium
71+
72+ [ Hans P. Möller ]
73+ * Change debconf frontend to kde for software-properties-qt.
74+ * Change Qt Desktop Entry to be shown in LXQt.
75+ * Add Drivers Qt Desktop Entry to be shown in LXQt.
76+ * Solve Bug 1801439
77+ * Fixed typos in Qt Additional Driver tab.
78+
79+ -- Hans P. Moller <hmoller@gmail.com> Thu, 21 Feb 2019 22:49:39 -0300
80+
81+>>>>>>> MERGE-SOURCE
82 software-properties (0.97.2) disco; urgency=medium
83
84 * Install python3-aptdaemon with software-properties-qt.
85
86=== modified file 'debian/control'
87--- debian/control 2019-02-19 09:39:32 +0000
88+++ debian/control 2019-02-24 16:52:14 +0000
89@@ -83,7 +83,7 @@
90 Architecture: all
91 Depends: ${python3:Depends}, ${misc:Depends}, python3, python3-pyqt5,
92 python3-software-properties (= ${binary:Version}), python3-aptdaemon,
93- qapt-batch, software-properties-common
94+ qapt-batch, software-properties-common, debconf-kde-helper
95 Conflicts: software-properties-kde (<< 0.96.25)
96 Replaces: software-properties-kde (<< 0.96.25)
97 Description: manage the repositories that you install software from (Qt)
98
99=== modified file 'softwareproperties/SoftwareProperties.py'
100--- softwareproperties/SoftwareProperties.py 2019-01-29 18:24:52 +0000
101+++ softwareproperties/SoftwareProperties.py 2019-02-24 16:52:14 +0000
102@@ -694,8 +694,7 @@
103 keyp = "%s/%s.key" % (self.CHANNEL_PATH, channel)
104 self.add_key(keyp)
105
106- cdata = (shortcut.add_key, {'keyserver': (self.options and
107- self.options.keyserver)})
108+ cdata = (shortcut.add_key, {'keyserver': (self.options)})
109 def addkey_func():
110 func, kwargs = cdata
111 msg = "Added key."
112
113=== modified file 'softwareproperties/qt/SoftwarePropertiesQt.py'
114--- softwareproperties/qt/SoftwarePropertiesQt.py 2019-02-09 23:11:11 +0000
115+++ softwareproperties/qt/SoftwarePropertiesQt.py 2019-02-24 16:52:14 +0000
116@@ -125,7 +125,7 @@
117 self.show_cdrom_sources()
118 # Setup and show the Additonal Drivers tab
119 self.init_drivers()
120-
121+
122 # Connect to switch-page before setting initial tab. Otherwise the
123 # first switch goes unnoticed.
124 self.userinterface.tabWidget.currentChanged.connect(self.tab_switched)
125@@ -145,7 +145,7 @@
126 self.userinterface.treeview_sources.itemClicked.connect(self.on_treeview_sources_cursor_changed)
127 self.userinterface.treeview_cdroms.itemChanged.connect(self.on_cdrom_source_toggled)
128 self.userinterface.treeview2.itemClicked.connect(self.on_treeview_keys_cursor_changed)
129-
130+
131 self.button_close = self.userinterface.buttonBox.button(QDialogButtonBox.Close)
132 self.button_close.setIcon(QIcon.fromTheme("dialog-close"))
133 self.button_revert = self.userinterface.buttonBox.button(QDialogButtonBox.Reset)
134@@ -154,27 +154,27 @@
135
136 self.init_distro()
137 self.show_distro()
138-
139+
140 self.apt_client = client.AptClient()
141-
142+
143 if options and options.open_tab:
144 self.userinterface.tabWidget.setCurrentIndex(int(options.open_tab))
145-
146+
147 def tab_switched(self):
148 # On the additional drivers page, don't show the backend revert button.
149 if self.userinterface.tabWidget.currentIndex() == 4: #vbox_drivers is 4
150 self.button_revert.setVisible(False)
151 if not self.detect_called:
152- #WARNING detect_drivers() runs in separate thread
153+ #WARNING detect_drivers() runs in separate thread
154 #in DetectDriverThread class so GUI won't freeze
155 #after finish show_drivers() has to run in main thread because it updates the GUI
156 self.detect_driver_thread = DetectDriverThread(self)
157 self.detect_driver_thread.finished.connect(self.show_drivers)
158 self.detect_driver_thread.start()
159-
160+
161 else:
162 self.button_revert.setVisible(True)
163-
164+
165 def init_popcon(self):
166 """ If popcon is enabled show the statistics tab and an explanation
167 corresponding to the used distro """
168@@ -186,7 +186,7 @@
169 self.userinterface.checkbutton_popcon.setChecked(is_helpful)
170 else:
171 self.userinterface.tabWidget.removeTab(5)
172-
173+
174 def init_server_chooser(self):
175 """ Set up the widgets that allow to choose an alternate download site """
176 # nothing to do here, set up signal in show_distro()
177@@ -855,7 +855,7 @@
178 self.transaction.connect('cancellable-changed', self.on_driver_changes_cancellable_changed)
179 self.transaction.connect('finished', self.on_driver_changes_finish)
180 self.transaction.connect('error', self.on_driver_changes_error)
181- self.transaction.set_debconf_frontend("gnome")
182+ self.transaction.set_debconf_frontend("kde")
183 self.transaction.run()
184 self.button_driver_revert.setEnabled(False)
185 self.button_driver_apply.setEnabled(False)
186@@ -902,26 +902,26 @@
187 def clear_changes(self):
188 self.orig_selection = {}
189 self.driver_changes = []
190-
191+
192 def init_drivers(self):
193 """Additional Drivers tab"""
194 self.button_driver_revert = QPushButton("Revert")
195 self.button_driver_apply = QPushButton("Apply Changes")
196 self.button_driver_cancel = QPushButton("Cancel")
197 self.button_driver_restart = QPushButton("Restart...")
198-
199+
200 self.button_driver_revert.clicked.connect(self.on_driver_changes_revert)
201 self.button_driver_apply.clicked.connect(self.on_driver_changes_apply)
202 self.button_driver_cancel.clicked.connect(self.on_driver_changes_cancel)
203 self.button_driver_restart.clicked.connect(self.on_driver_restart_clicked)
204-
205+
206 self.button_driver_revert.setEnabled(False)
207 self.button_driver_revert.setVisible(True)
208 self.button_driver_apply.setEnabled(False)
209 self.button_driver_apply.setVisible(True)
210 self.button_driver_cancel.setVisible(False)
211 self.button_driver_restart.setVisible(False)
212-
213+
214 #self.userinterface.box_driver_action.addWidget(self.userinterface.label_driver_action)
215 self.userinterface.box_driver_action.addStretch()
216 self.userinterface.box_driver_action.addWidget(self.button_driver_apply)
217@@ -934,7 +934,7 @@
218 self.userinterface.box_driver_detail.addWidget(self.label_driver_detail)
219
220 self.progress_bar = QProgressBar()
221-
222+
223 self.userinterface.box_driver_action.addWidget(self.progress_bar)
224 self.progress_bar.setVisible(False)
225
226@@ -950,7 +950,7 @@
227 self.no_drv = []
228 self.nonfree_drivers = 0
229 self.ui_building = False
230-
231+
232 def detect_drivers(self):
233 # WARNING: This is run in a separate thread.
234 self.detect_called = True
235@@ -969,7 +969,7 @@
236 button = self.userinterface.sender()
237 #print(modalias)
238 #print(pkg_name)
239-
240+
241 if self.ui_building:
242 return
243
244@@ -1017,31 +1017,31 @@
245 the drivers dict is using this form:
246 {"recommended/alternative": {pkg_name: {
247 'selected': True/False
248- 'description':
249+ 'description':
250 'description'
251 'builtin': True/False
252 }
253 }}
254- "manually_installed": {"manual": {'selected': True, 'description':
255+ "manually_installed": {"manual": {'selected': True, 'description':
256 description_string}}
257- "no_driver": {"no_driver": {'selected': True/False, 'description':
258+ "no_driver": {"no_driver": {'selected': True/False, 'description':
259 description_string}}
260
261- Please note that either manually_installed and no_driver are set to
262+ Please note that either manually_installed and no_driver are set to
263 None if not applicable
264 (no_driver isn't present if there are builtins)
265 '''
266
267 possible_overall_status = {
268- 'recommended': (_("This device is using the recommended driver."),
269+ 'recommended': (_("This device is using the recommended driver."),
270 "recommended-driver"),
271- 'alternative': (_("This device is using an alternative driver."),
272+ 'alternative': (_("This device is using an alternative driver."),
273 "other-driver"),
274 'manually_installed': (_("This device is using a manually-installed driver."), "other-driver"),
275 'no_driver': (_("This device is not working."), "disable-device")
276 }
277
278- returned_drivers = {'recommended': {}, 'alternative': {},
279+ returned_drivers = {'recommended': {}, 'alternative': {},
280 'manually_installed': {}, 'no_driver': {}}
281 have_builtin = False
282 one_selected = False
283@@ -1091,7 +1091,7 @@
284 base_string = _("{base_description} ({licence}, tested)")
285 else:
286 base_string = _("{base_description} ({licence})")
287- description = base_string.format(base_description=description,
288+ description = base_string.format(base_description=description,
289 licence=licence)
290
291 selected = False
292@@ -1132,9 +1132,9 @@
293 return
294 else:
295 self.label_driver_detail.hide()
296-
297+
298 self.option_group = {}
299- self.radio_button = {}
300+ self.radio_button = {}
301 self.ui_building = True
302 self.dynamic_device_status = {}
303 for device in sorted(self.devices.keys()):
304@@ -1170,7 +1170,7 @@
305 else:
306 self.option_group[device] = QButtonGroup()
307 self.option_group[device].addButton(self.radio_button)
308-
309+
310 device_detail.addWidget(self.radio_button)
311 self.radio_button.setChecked(drivers[section][driver]['selected'])
312
313@@ -1216,7 +1216,7 @@
314 self.nonfree_drivers = self.nonfree_drivers + 1
315
316 if self.nonfree_drivers > 0:
317- text = "%s proprietary driver in use." % ( self.nonfree_drivers)
318+ text = "%s proprietary driver(s) in use." % ( self.nonfree_drivers)
319 self.userinterface.label_driver_action.setText(text)
320 else:
321 self.userinterface.label_driver_action.setText(_("No proprietary drivers are in use."))

Subscribers

People subscribed via source and target branches

to status/vote changes: