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

[Hans P. Möller]

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

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

[Simon Quigley (tsimonq2)]

Could you please add a changelog entry?

[lp:~hmollercl/software-properties/software-properties]

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

=== modified file 'data/designer/main.ui'
--- data/designer/main.ui	2018-12-29 02:11:03 +0000
+++ data/designer/main.ui	2019-02-24 16:52:14 +0000
@@ -558,7 +558,7 @@
             <x>0</x>
             <y>0</y>
             <width>670</width>
-            <height>244</height>
+            <height>255</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -611,7 +611,7 @@
           <item>
            <widget class="QLabel" name="label_driver_action">
             <property name="text">
-             <string>No propietary drivers are in use.</string>
+             <string>No proprietary drivers are in use.</string>
             </property>
            </widget>
           </item>
 
=== added file 'data/software-properties-drivers-qt.desktop.in'
--- data/software-properties-drivers-qt.desktop.in	1970-01-01 00:00:00 +0000
+++ data/software-properties-drivers-qt.desktop.in	2019-02-24 16:52:14 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Keywords=Drivers;
+Exec=lxqt-sudo /usr/bin/software-properties-qt --open-tab=4
+Icon=jockey
+Terminal=false
+Type=Application
+OnlyShowIn=LXQt;
+Categories=Settings;HardwareSettings;System;
+X-AppStream-Ignore=true
+Name=Additional Drivers
+Name[es]=Controladores adicionales
+Comment=Configure third-party and proprietary drivers
+Comment[es]=Configure controladores privativos y de terceros
 
=== modified file 'data/software-properties-qt.desktop.in'
--- data/software-properties-qt.desktop.in	2018-07-14 10:11:32 +0000
+++ data/software-properties-qt.desktop.in	2019-02-24 16:52:14 +0000
@@ -2,9 +2,9 @@
 _Name=Software Sources
 _GenericName=Software Sources
 _Comment=Configure the sources for installable software and updates
-Exec=software-properties-qt
+Exec=lxqt-sudo software-properties-qt
 Icon=applications-other
-NoDisplay=true
+OnlyShowIn=LXQt;
 Terminal=false
 X-MultipleArgs=false
 Type=Application
 
=== modified file 'debian/changelog'
--- debian/changelog	2019-02-19 09:39:44 +0000
+++ debian/changelog	2019-02-24 16:52:14 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 software-properties (0.97.6) disco; urgency=medium
 
   * debian/control:
@@ -31,6 +32,19 @@
 
  -- Andrea Azzarone <[e-mail]>  Tue, 29 Jan 2019 18:29:18 +0000
 
+=======
+software-properties (0.97.3) disco; urgency=medium
+
+  [ Hans P. Möller ]
+  * Change debconf frontend to kde for software-properties-qt.
+  * Change Qt Desktop Entry to be shown in LXQt.
+  * Add Drivers Qt Desktop Entry to be shown in LXQt.
+  * Solve Bug 1801439
+  * Fixed typos in Qt Additional Driver tab.
+
+ -- Hans P. Moller <[e-mail]>  Thu, 21 Feb 2019 22:49:39 -0300
+
+>>>>>>> MERGE-SOURCE
 software-properties (0.97.2) disco; urgency=medium
 
   * Install python3-aptdaemon with software-properties-qt.
 
=== modified file 'debian/control'
--- debian/control	2019-02-19 09:39:32 +0000
+++ debian/control	2019-02-24 16:52:14 +0000
@@ -83,7 +83,7 @@
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}, python3, python3-pyqt5,
  python3-software-properties (= ${binary:Version}), python3-aptdaemon,
- qapt-batch, software-properties-common
+ qapt-batch, software-properties-common, debconf-kde-helper
 Conflicts: software-properties-kde (<< 0.96.25)
 Replaces: software-properties-kde (<< 0.96.25)
 Description: manage the repositories that you install software from (Qt)
 
=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2019-01-29 18:24:52 +0000
+++ softwareproperties/SoftwareProperties.py	2019-02-24 16:52:14 +0000
@@ -694,8 +694,7 @@
       keyp = "%s/%s.key" % (self.CHANNEL_PATH, channel)
       self.add_key(keyp)
 
-    cdata = (shortcut.add_key, {'keyserver': (self.options and
-                                              self.options.keyserver)})
+    cdata = (shortcut.add_key, {'keyserver': (self.options)})
     def addkey_func():
         func, kwargs = cdata
         msg = "Added key."
 
=== modified file 'softwareproperties/qt/SoftwarePropertiesQt.py'
--- softwareproperties/qt/SoftwarePropertiesQt.py	2019-02-09 23:11:11 +0000
+++ softwareproperties/qt/SoftwarePropertiesQt.py	2019-02-24 16:52:14 +0000
@@ -125,7 +125,7 @@
     self.show_cdrom_sources()
     # Setup and show the Additonal Drivers tab
     self.init_drivers()
-    
+
     # Connect to switch-page before setting initial tab. Otherwise the
     # first switch goes unnoticed.
     self.userinterface.tabWidget.currentChanged.connect(self.tab_switched)
@@ -145,7 +145,7 @@
     self.userinterface.treeview_sources.itemClicked.connect(self.on_treeview_sources_cursor_changed)
     self.userinterface.treeview_cdroms.itemChanged.connect(self.on_cdrom_source_toggled)
     self.userinterface.treeview2.itemClicked.connect(self.on_treeview_keys_cursor_changed)
-    
+
     self.button_close = self.userinterface.buttonBox.button(QDialogButtonBox.Close)
     self.button_close.setIcon(QIcon.fromTheme("dialog-close"))
     self.button_revert = self.userinterface.buttonBox.button(QDialogButtonBox.Reset)
@@ -154,27 +154,27 @@
 
     self.init_distro()
     self.show_distro()
-    
+
     self.apt_client = client.AptClient()
-    
+
     if options and options.open_tab:
       self.userinterface.tabWidget.setCurrentIndex(int(options.open_tab))
-    
+
   def tab_switched(self):
     # On the additional drivers page, don't show the backend revert button.
     if self.userinterface.tabWidget.currentIndex() == 4: #vbox_drivers is 4
       self.button_revert.setVisible(False)
       if not self.detect_called:
-        #WARNING detect_drivers() runs in separate thread 
+        #WARNING detect_drivers() runs in separate thread
         #in DetectDriverThread class so GUI won't freeze
         #after finish show_drivers() has to run in main thread because it updates the GUI
         self.detect_driver_thread = DetectDriverThread(self)
         self.detect_driver_thread.finished.connect(self.show_drivers)
         self.detect_driver_thread.start()
-        
+
     else:
       self.button_revert.setVisible(True)
-            
+
   def init_popcon(self):
     """ If popcon is enabled show the statistics tab and an explanation
         corresponding to the used distro """
@@ -186,7 +186,7 @@
       self.userinterface.checkbutton_popcon.setChecked(is_helpful)
     else:
       self.userinterface.tabWidget.removeTab(5)
-      
+
   def init_server_chooser(self):
     """ Set up the widgets that allow to choose an alternate download site """
     # nothing to do here, set up signal in show_distro()
@@ -855,7 +855,7 @@
       self.transaction.connect('cancellable-changed', self.on_driver_changes_cancellable_changed)
       self.transaction.connect('finished', self.on_driver_changes_finish)
       self.transaction.connect('error', self.on_driver_changes_error)
-      self.transaction.set_debconf_frontend("gnome")
+      self.transaction.set_debconf_frontend("kde")
       self.transaction.run()
       self.button_driver_revert.setEnabled(False)
       self.button_driver_apply.setEnabled(False)
@@ -902,26 +902,26 @@
   def clear_changes(self):
     self.orig_selection = {}
     self.driver_changes = []
-        
+
   def init_drivers(self):
     """Additional Drivers tab"""
     self.button_driver_revert = QPushButton("Revert")
     self.button_driver_apply = QPushButton("Apply Changes")
     self.button_driver_cancel = QPushButton("Cancel")
     self.button_driver_restart = QPushButton("Restart...")
-    
+
     self.button_driver_revert.clicked.connect(self.on_driver_changes_revert)
     self.button_driver_apply.clicked.connect(self.on_driver_changes_apply)
     self.button_driver_cancel.clicked.connect(self.on_driver_changes_cancel)
     self.button_driver_restart.clicked.connect(self.on_driver_restart_clicked)
-        
+
     self.button_driver_revert.setEnabled(False)
     self.button_driver_revert.setVisible(True)
     self.button_driver_apply.setEnabled(False)
     self.button_driver_apply.setVisible(True)
     self.button_driver_cancel.setVisible(False)
     self.button_driver_restart.setVisible(False)
-    
+
     #self.userinterface.box_driver_action.addWidget(self.userinterface.label_driver_action)
     self.userinterface.box_driver_action.addStretch()
     self.userinterface.box_driver_action.addWidget(self.button_driver_apply)
@@ -934,7 +934,7 @@
     self.userinterface.box_driver_detail.addWidget(self.label_driver_detail)
 
     self.progress_bar = QProgressBar()
-     
+
     self.userinterface.box_driver_action.addWidget(self.progress_bar)
     self.progress_bar.setVisible(False)
 
@@ -950,7 +950,7 @@
     self.no_drv = []
     self.nonfree_drivers = 0
     self.ui_building = False
-    
+
   def detect_drivers(self):
     # WARNING: This is run in a separate thread.
     self.detect_called = True
@@ -969,7 +969,7 @@
     button = self.userinterface.sender()
     #print(modalias)
     #print(pkg_name)
-    
+
     if self.ui_building:
       return
 
@@ -1017,31 +1017,31 @@
           the drivers dict is using this form:
             {"recommended/alternative": {pkg_name: {
                                                       'selected': True/False
-                                                      'description': 
+                                                      'description':
 'description'
                                                       'builtin': True/False
                                                     }
                                          }}
-             "manually_installed": {"manual": {'selected': True, 'description': 
+             "manually_installed": {"manual": {'selected': True, 'description':
 description_string}}
-             "no_driver": {"no_driver": {'selected': True/False, 'description': 
+             "no_driver": {"no_driver": {'selected': True/False, 'description':
 description_string}}
 
-             Please note that either manually_installed and no_driver are set to 
+             Please note that either manually_installed and no_driver are set to
 None if not applicable
              (no_driver isn't present if there are builtins)
         '''
 
     possible_overall_status = {
-            'recommended': (_("This device is using the recommended driver."), 
+            'recommended': (_("This device is using the recommended driver."),
 "recommended-driver"),
-            'alternative': (_("This device is using an alternative driver."), 
+            'alternative': (_("This device is using an alternative driver."),
 "other-driver"),
             'manually_installed': (_("This device is using a manually-installed driver."), "other-driver"),
             'no_driver': (_("This device is not working."), "disable-device")
         }
 
-    returned_drivers = {'recommended': {}, 'alternative': {}, 
+    returned_drivers = {'recommended': {}, 'alternative': {},
 'manually_installed': {}, 'no_driver': {}}
     have_builtin = False
     one_selected = False
@@ -1091,7 +1091,7 @@
         base_string = _("{base_description} ({licence}, tested)")
       else:
         base_string = _("{base_description} ({licence})")
-      description = base_string.format(base_description=description, 
+      description = base_string.format(base_description=description,
 licence=licence)
 
       selected = False
@@ -1132,9 +1132,9 @@
       return
     else:
       self.label_driver_detail.hide()
-    
+
     self.option_group = {}
-    self.radio_button = {}  
+    self.radio_button = {}
     self.ui_building = True
     self.dynamic_device_status = {}
     for device in sorted(self.devices.keys()):
@@ -1170,7 +1170,7 @@
           else:
             self.option_group[device] = QButtonGroup()
             self.option_group[device].addButton(self.radio_button)
-            
+
           device_detail.addWidget(self.radio_button)
           self.radio_button.setChecked(drivers[section][driver]['selected'])
 
@@ -1216,7 +1216,7 @@
           self.nonfree_drivers = self.nonfree_drivers + 1
 
     if self.nonfree_drivers > 0:
-      text = "%s proprietary driver in use." % ( self.nonfree_drivers)
+      text = "%s proprietary driver(s) in use." % ( self.nonfree_drivers)
       self.userinterface.label_driver_action.setText(text)
     else:
       self.userinterface.label_driver_action.setText(_("No proprietary drivers are in use."))