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

[Hans P. Möller]

Added "additional driver" tab for the Qt version

Added "additional driver" tab for the qt version
To maintain same numbers as gtk version it will be tab 4.
Also added --open-tab commandline option so you can open directly in one tab (same as gtk)
Added lxqt-sudo mention (along with pkexec) when not run with root privileges.
Migrate some GridLayout to BoxLayout in Qt version so windows resizing still makes things look good.

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

1059. By Sebastien Bacher on 2019-01-15

[ Carlo Vanini ]
Fix removal of signing keys in the Authentication tab always failing.
(lp: #1656100)

1060. By Sebastien Bacher on 2019-01-15

releasing package software-properties version 0.96.30

1061. By Sebastien Bacher on 2019-01-16

Remove the migration script, it was online needed until bionic

1062. By Andrea Azzarone on 2019-01-22

[ Andrea Azzarone ]
* data/gtkbuilder/dialog-auth.ui: Update design of the authentication
  dialog.
* softwareproperties/gtk/DialogAuth.py: Implement new design of the
  authentication dialog.

1063. By Sebastien Bacher on 2019-01-22

releasing package software-properties version 0.96.31

1064. By Sebastien Bacher on 2019-01-24

* softwareproperties/gtk/DialogAuth.py:
  - Log call_ensure_credentials_finish errors, fixes the build failing
    due to pyflakes warning about an unused variable

1065. By Sebastien Bacher on 2019-01-24

releasing package software-properties version 0.96.32

1066. By Simon Quigley on 2019-02-09

Merge lp:~hmollercl/software-properties/software-properties into lp:software-properties and add changelog entry.

[Hans P. Möller (hmollercl)]

for testing run software-properties-qt with the --data-dir modifier to use the modified UI.
lxqt-sudo ./software-properties-qt --data-dir ./data

=== modified file 'data/designer/main.ui'
--- data/designer/main.ui	2018-07-14 10:32:29 +0000
+++ data/designer/main.ui	2018-12-29 13:41:58 +0000
@@ -6,21 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>605</width>
+    <width>706</width>
     <height>408</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Software Sources</string>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -30,7 +24,16 @@
        <string>Software &amp; Updates</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
        <property name="spacing">
@@ -42,7 +45,16 @@
           <string>&lt;b&gt;Downloadable from the Internet&lt;/b&gt;</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
            <number>9</number>
           </property>
           <property name="spacing">
@@ -57,7 +69,16 @@
              <enum>QFrame::Raised</enum>
             </property>
             <layout class="QGridLayout">
-             <property name="margin">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
               <number>0</number>
              </property>
              <property name="spacing">
@@ -68,7 +89,16 @@
                <property name="spacing">
                 <number>6</number>
                </property>
-               <property name="margin">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
                 <number>0</number>
                </property>
               </layout>
@@ -105,7 +135,16 @@
           <string>Installable from CD-ROM/DVD</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
            <number>9</number>
           </property>
           <property name="spacing">
@@ -168,7 +207,16 @@
        <string>Other Software</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
        <property name="spacing">
@@ -233,7 +281,16 @@
        <string>Updates</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
        <property name="spacing">
@@ -245,7 +302,16 @@
           <string>&lt;b&gt;Ubuntu updates&lt;/b&gt;</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
            <number>9</number>
           </property>
           <property name="spacing">
@@ -256,7 +322,16 @@
             <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
              <number>0</number>
             </property>
             <item>
@@ -268,7 +343,16 @@
                <enum>QFrame::Raised</enum>
               </property>
               <layout class="QGridLayout">
-               <property name="margin">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
                 <number>0</number>
                </property>
                <property name="spacing">
@@ -288,7 +372,16 @@
           <string>&lt;b&gt;Automatic updates&lt;/b&gt;</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
+           <number>9</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
            <number>9</number>
           </property>
           <property name="spacing">
@@ -370,7 +463,16 @@
        <string>Authentication</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
        <property name="spacing">
@@ -437,12 +539,112 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="vbox_drivers">
+      <attribute name="title">
+       <string>Additional Drivers</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QScrollArea" name="scrollArea">
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="scrollAreaWidgetContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>670</width>
+            <height>244</height>
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_3">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <layout class="QVBoxLayout" name="box_driver_detail"/>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_driver_action">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <layout class="QHBoxLayout" name="box_driver_action">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label_driver_action">
+            <property name="text">
+             <string>No propietary drivers are in use.</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_disc">
+         <property name="text">
+          <string>&lt;small&gt;A proprietary driver has private code that Ubuntu developers can't review or improve. Security and other updates are dependent on the driver vendor.&lt;/small&gt;</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_5">
       <attribute name="title">
        <string>Statistics</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>9</number>
+       </property>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
         <number>9</number>
        </property>
        <property name="spacing">
@@ -482,7 +684,7 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
 
=== modified file 'software-properties-qt'
--- software-properties-qt	2018-07-14 10:11:32 +0000
+++ software-properties-qt	2018-12-29 13:41:58 +0000
@@ -82,6 +82,10 @@
                                          _("Enable the specified component of the distro's repositories"),
                                          "name");
     parser.addOption(componentOption);
+    openTabOption = QCommandLineOption("open-tab",
+                                         _("Open specific tab number on startup"),
+                                         "open_tab");
+    parser.addOption(openTabOption);
     ppaOption = QCommandLineOption("enable-ppa",
                                    _("Enable PPA with the given name"),
                                    "name");
@@ -100,7 +104,7 @@
 
     # Check for root permissions
     if os.geteuid() != 0:
-        text = "Please run this software with administrative rights. To do so, run this program with pkexec."
+        text = "Please run this software with administrative rights. To do so, run this program with lxqt-sudo or pkexec."
         title = "Need administrative powers"
         msgbox = QMessageBox.critical(None, title, text)
         sys.exit(1)
@@ -119,6 +123,7 @@
     options.debug = parser.isSet(debugOption)
     options.debug = parser.isSet(massiveDebugOption)
     options.no_update = parser.isSet(noUpdateOption)
+    options.open_tab = parser.value(openTabOption)
 
     attachWinID = None
     if parser.isSet(winidOption):
 
=== modified file 'softwareproperties/qt/SoftwarePropertiesQt.py'
--- softwareproperties/qt/SoftwarePropertiesQt.py	2018-07-14 10:45:16 +0000
+++ softwareproperties/qt/SoftwarePropertiesQt.py	2018-12-29 13:41:58 +0000
@@ -49,6 +49,28 @@
 from .DialogMirror import DialogMirror
 from .CdromProgress import CdromProgress
 
+from UbuntuDrivers import detect
+import sys
+import apt
+from functools import partial
+from aptdaemon import client
+from aptdaemon.errors import NotAuthorizedError, TransactionFailed
+import aptsources.distro
+import logging
+
+class DetectDriverThread(QThread):
+  #WARNING class to run detect_drivers() in separate thread
+  #so GUI won't freeze.
+  def __init__(self, swprop):
+    QThread.__init__(self)
+    self.swprop = swprop
+
+  def __del__(self):
+    self.wait()
+
+  def run(self):
+    self.swprop.detect_drivers()
+
 class SoftwarePropertiesQtUI(QWidget):
   def __init__(self, datadir):
       QWidget.__init__(self)
@@ -101,6 +123,12 @@
     self.init_isv_sources()
     self.show_isv_sources()
     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)
 
     self.userinterface.checkbutton_source_code.clicked.connect(self.on_checkbutton_source_code_toggled)
     self.userinterface.button_auth_restore.clicked.connect(self.on_restore_clicked)
@@ -117,15 +145,36 @@
     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)
-    button_close = self.userinterface.buttonBox.button(QDialogButtonBox.Close)
-    button_close.setIcon(QIcon.fromTheme("dialog-close"))
-    button_revert = self.userinterface.buttonBox.button(QDialogButtonBox.Reset)
-    button_revert.setIcon(QIcon.fromTheme("edit-undo"))
-    button_revert.clicked.connect(self.on_button_revert_clicked)
+    
+    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)
+    self.button_revert.setIcon(QIcon.fromTheme("edit-undo"))
+    self.button_revert.clicked.connect(self.on_button_revert_clicked)
 
     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 
+        #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 """
@@ -136,8 +185,8 @@
       self.userinterface.label_popcon_desc.setText(text)
       self.userinterface.checkbutton_popcon.setChecked(is_helpful)
     else:
-      self.userinterface.tabWidget.removeTab(4)
-
+      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()
@@ -747,3 +796,427 @@
 
   def run(self):
     kapp.exec_()
+
+  def on_driver_changes_progress(self, transaction, progress):
+    self.button_driver_revert.setVisible(False)
+    self.button_driver_apply.setVisible(False)
+    self.button_driver_restart.setVisible(False)
+    self.button_driver_cancel.setVisible(True)
+    self.progress_bar.setVisible(True)
+
+    self.userinterface.label_driver_action.setText("Applying changes...")
+    self.progress_bar.setValue(progress)
+
+  def on_driver_changes_finish(self, transaction, exit_state):
+    self.progress_bar.setVisible(False)
+    self.clear_changes()
+    self.apt_cache = apt.Cache()
+    self.set_driver_action_status()
+    self.update_label_and_icons_from_status()
+    self.button_driver_revert.setVisible(True)
+    self.button_driver_apply.setVisible(True)
+    self.button_driver_cancel.setVisible(False)
+    #self.scrolled_window_drivers.set_sensitive(True)
+
+  def on_driver_changes_error(self, transaction, error_code, error_details):
+    self.on_driver_changes_revert()
+    self.set_driver_action_status()
+    self.update_label_and_icons_from_status()
+    self.button_driver_revert.setVisible(True)
+    self.button_driver_apply.setVisible(True)
+    self.button_driver_cancel.setVisible(False)
+    #self.scrolled_window_drivers.set_sensitive(True)
+
+  def on_driver_changes_cancellable_changed(self, transaction, cancellable):
+    self.button_driver_cancel.setEnabled(cancellable)
+
+  def on_driver_changes_apply(self, button):
+    button = self.userinterface.sender()
+    installs = []
+    removals = []
+
+    for pkg in self.driver_changes:
+      if pkg.is_installed:
+          removals.append(pkg.shortname)
+          # The main NVIDIA package is only a metapackage.
+          # We need to collect its dependencies, so that
+          # we can uninstall the driver properly.
+          if 'nvidia' in pkg.shortname:
+            for dep in get_dependencies(self.apt_cache, pkg.shortname, 'nvidia'):
+              dep_pkg = self.apt_cache[dep]
+              if dep_pkg.is_installed:
+                removals.append(dep_pkg.shortname)
+      else:
+        installs.append(pkg.shortname)
+
+    try:
+      self.transaction = self.apt_client.commit_packages(install=installs, remove=removals, reinstall=[], purge=[], upgrade=[], downgrade=[])
+      self.transaction.connect('progress-changed', self.on_driver_changes_progress)
+      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.run()
+      self.button_driver_revert.setEnabled(False)
+      self.button_driver_apply.setEnabled(False)
+      #self.scrolled_window_drivers.set_sensitive(False)
+    except (NotAuthorizedError, TransactionFailed) as e:
+      print("Warning: install transaction not completed successfully: {}".format(e))
+
+  def on_driver_changes_revert(self, button_revert=None):
+    # HACK: set all the "Do not use" first; then go through the list of the
+    #       actually selected drivers.
+    for button in self.no_drv:
+      button.setChecked(True)
+
+    for alias in self.orig_selection:
+      button = self.orig_selection[alias]
+      button.setChecked(True)
+
+    self.clear_changes()
+
+    self.button_driver_revert.setEnabled(False)
+    self.button_driver_apply.setEnabled(False)
+
+  def on_driver_changes_cancel(self, button_cancel):
+    self.transaction.cancel()
+    self.clear_changes()
+
+  def on_driver_restart_clicked(self, button_restart):
+    if 'XDG_CURRENT_DESKTOP' in os.environ:
+      desktop = os.environ['XDG_CURRENT_DESKTOP']
+    else:
+      desktop = 'Unknown'
+
+    if (desktop == 'ubuntu:GNOME' and os.path.exists('/usr/bin/gnome-session-quit')):
+      # argument presents a dialog to cancel reboot
+      subprocess.call(['gnome-session-quit', '--reboot'])
+    elif (desktop == 'XFCE' and
+      os.path.exists('/usr/bin/xfce4-session-logout')):
+      subprocess.call(['xfce4-session-logout'])
+    elif (desktop == 'LXDE' and os.path.exists('/usr/bin/lubuntu-logout')):
+      subprocess.call(['lubuntu-logout'])
+    elif (desktop == 'LXQt' and os.path.exists('/usr/bin/lxqt-leave')):
+      subprocess.call(['lxqt-leave'])
+
+  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)
+    self.userinterface.box_driver_action.addWidget(self.button_driver_revert)
+    self.userinterface.box_driver_action.addWidget(self.button_driver_restart)
+    self.userinterface.box_driver_action.addWidget(self.button_driver_cancel)
+
+    self.label_driver_detail = QLabel("Searching for available drivers...")
+    self.label_driver_detail.setAlignment(Qt.AlignCenter)
+    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)
+
+    self.devices = {}
+    self.detect_called = False
+    self.driver_changes = []
+    self.orig_selection = {}
+        # HACK: the case where the selection is actually "Do not use"; is a little
+        #       tricky to implement because you can't check for whether a package is
+        #       installed or any such thing. So let's keep a list of all the
+        #       "Do not use" radios, set those active first, then iterate through
+        #       orig_selection when doing a Reset.
+    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
+    try:
+      self.apt_cache = apt.Cache()
+      self.devices = detect.system_device_drivers(self.apt_cache)
+    except:
+      # Catch all exceptions and feed them to apport.
+      #GLib.idle_add(self.label_driver_detail.set_text, _("An error occurred while searching for drivers."))
+      self.label_driver_detail.setText("An error occurred while searching for drivers.")
+      # For apport to catch this exception. See
+      # http://bugs.python.org/issue1230540
+      sys.excepthook(*sys.exc_info())
+      return
+  def on_driver_selection_changed(self, modalias, pkg_name=None):
+    button = self.userinterface.sender()
+    #print(modalias)
+    #print(pkg_name)
+    
+    if self.ui_building:
+      return
+
+    pkg = None
+    try:
+      if pkg_name:
+        pkg = self.apt_cache[pkg_name]
+        # If the package depends on dkms
+        # we need to install the correct linux metapackage
+        # so that users get the latest headers
+        if 'dkms' in pkg.candidate.record['Depends']:
+          linux_meta = detect.get_linux(self.apt_cache)
+          if (linux_meta and linux_meta not in self.driver_changes):
+            # Install the linux metapackage
+            lmp = self.apt_cache[linux_meta]
+            if not lmp.is_installed:
+              self.driver_changes.append(lmp)
+    except KeyError:
+      pass
+
+    if button.isChecked():
+      if pkg in self.driver_changes:
+        self.driver_changes.remove(pkg)
+
+      if (pkg is not None and modalias in self.orig_selection and button is not self.orig_selection[modalias]):
+        self.driver_changes.append(pkg)
+    else:
+      if pkg in self.driver_changes:
+        self.driver_changes.remove(pkg)
+
+      # for revert; to re-activate the original radio buttons.
+      if modalias not in self.orig_selection:
+          self.orig_selection[modalias] = button
+
+      if (pkg is not None and pkg not in self.driver_changes and pkg.is_installed):
+          self.driver_changes.append(pkg)
+
+    self.button_driver_revert.setEnabled(bool(self.driver_changes))
+    self.button_driver_apply.setEnabled(bool(self.driver_changes))
+
+  def gather_device_data(self, device):
+    '''Get various device data used to build the GUI.
+
+          return a tuple of (overall_status string, icon, drivers dict).
+          the drivers dict is using this form:
+            {"recommended/alternative": {pkg_name: {
+                                                      'selected': True/False
+                                                      'description': 
+'description'
+                                                      'builtin': True/False
+                                                    }
+                                         }}
+             "manually_installed": {"manual": {'selected': True, 'description': 
+description_string}}
+             "no_driver": {"no_driver": {'selected': True/False, 'description': 
+description_string}}
+
+             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-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': {}, 
+'manually_installed': {}, 'no_driver': {}}
+    have_builtin = False
+    one_selected = False
+    try:
+      if device['manual_install']:
+        returned_drivers['manually_installed'] = {True: {'selected': True,'description': _("Continue using a manually installed driver")}}
+    except KeyError:
+      pass
+
+    for pkg_driver_name in device['drivers']:
+      current_driver = device['drivers'][pkg_driver_name]
+
+      # get general status
+      driver_status = 'alternative'
+      try:
+        if current_driver['recommended'] and current_driver['from_distro']:
+          driver_status = 'recommended'
+      except KeyError:
+        pass
+
+      builtin = False
+      try:
+        if current_driver['builtin']:
+          builtin = True
+          have_builtin = True
+      except KeyError:
+        pass
+
+      try:
+        pkg = self.apt_cache[pkg_driver_name]
+        installed = pkg.is_installed
+        if pkg.candidate is not None:
+          description = _("Using {} from {}").format(pkg.candidate.summary, pkg.shortname)
+        else:
+          description = _("Using {}").format(pkg.shortname)
+      except KeyError:
+        print("WARNING: a driver ({}) doesn't have any available package associated: {}".format(pkg_driver_name, current_driver))
+        continue
+
+      # gather driver description
+      if current_driver['free']:
+        licence = _("open source")
+      else:
+        licence = _("proprietary")
+
+      if driver_status == 'recommended':
+        base_string = _("{base_description} ({licence}, tested)")
+      else:
+        base_string = _("{base_description} ({licence})")
+      description = base_string.format(base_description=description, 
+licence=licence)
+
+      selected = False
+      if not builtin and not returned_drivers['manually_installed']:
+        selected = installed
+        if installed:
+          selected = True
+          one_selected = True
+
+      returned_drivers[driver_status].setdefault(pkg_driver_name, {'selected': selected,'description': description,'builtin': builtin})
+
+    # adjust making the needed addition
+    if not have_builtin:
+      selected = False
+      if not one_selected:
+        selected = True
+      returned_drivers["no_driver"] = {True: {'selected': selected, 'description': _("Do not use the device")}}
+    else:
+      # we have a builtin and no selection: builtin is the selected one then
+      if not one_selected:
+        for section in ('recommended', 'alternative'):
+          for pkg_name in returned_drivers[section]:
+            if returned_drivers[section][pkg_name]['builtin']:
+              returned_drivers[section][pkg_name]['selected'] = True
+
+    # compute overall status
+    for section in returned_drivers:
+      for keys in returned_drivers[section]:
+        if returned_drivers[section][keys]['selected']:
+          (overall_status, icon) = possible_overall_status[section]
+
+    return (overall_status, icon, returned_drivers)
+
+  def show_drivers(self):
+    if not self.devices:
+      # No drivers found.
+      self.label_driver_detail.setText("No additional drivers available.")
+      return
+    else:
+      self.label_driver_detail.hide()
+    
+    self.option_group = {}
+    self.radio_button = {}  
+    self.ui_building = True
+    self.dynamic_device_status = {}
+    for device in sorted(self.devices.keys()):
+      (overall_status, icon, drivers) = self.gather_device_data(self.devices[device])
+
+      driver_status = QLabel()
+      driver_status.setAlignment(Qt.AlignTop)
+      driver_status.setAlignment(Qt.AlignHCenter)
+      pixmap = QIcon.fromTheme(icon).pixmap(QSize(16, 16))
+      driver_status.setPixmap(pixmap)
+
+      device_box = QHBoxLayout()
+      device_box.addWidget(driver_status)
+      device_detail = QVBoxLayout()
+      device_box.addLayout(device_detail,1)#1 for priority over the icon to stretch
+
+      widget = QLabel("{}: {}".format(self.devices[device].get('vendor', _('Unknown')), self.devices[device].get('model', _('Unknown'))))
+      widget.setAlignment(Qt.AlignLeft)
+      device_detail.addWidget(widget)
+      widget = QLabel("<small>{}</small>".format(overall_status))
+      widget.setAlignment(Qt.AlignLeft)
+      #widget.set_use_markup(True)
+      device_detail.addWidget(widget)
+      self.dynamic_device_status[device] = (driver_status, widget)
+
+      self.option_group[device] = None
+      # define the order of introspection
+      for section in ('recommended', 'alternative', 'manually_installed', 'no_driver'):
+        for driver in drivers[section]:
+          self.radio_button = QRadioButton(drivers[section][driver]['description'])
+          if self.option_group[device]:
+            self.option_group[device].addButton(self.radio_button)
+          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'])
+
+          if section == 'no_driver':
+            self.no_drv.append(self.radio_button)
+          if section in ('manually_install', 'no_driver') or ('builtin' in drivers[section][driver] and drivers[section][driver]['builtin']):
+            self.radio_button.toggled.connect(partial( self.on_driver_selection_changed, device))
+          else:
+            self.radio_button.toggled.connect(partial( self.on_driver_selection_changed, device, driver))
+          if drivers['manually_installed'] and section != 'manually_installed':
+            self.radio_button.setEnabled(False)
+
+      self.userinterface.box_driver_detail.addLayout(device_box)
+
+    self.userinterface.box_driver_detail.addStretch()
+    self.ui_building = False
+    #self.userinterface.box_driver_detail.show_all()
+    self.set_driver_action_status()
+
+  def update_label_and_icons_from_status(self):
+    '''Update the current label and icon, computing the new device status'''
+
+    for device in self.devices:
+      (overall_status, icon, drivers) = self.gather_device_data(self.devices[device])
+      (driver_status, widget) = self.dynamic_device_status[device]
+
+      pixmap = QIcon.fromTheme(icon).pixmap(QSize(16, 16))
+      driver_status.setPixmap(pixmap)
+      widget.setText("<small>{}</small>".format(overall_status))
+
+  def set_driver_action_status(self):
+    # Update the label in case we end up having some kind of proprietary driver in use.
+    if (os.path.exists('/var/run/reboot-required')):
+      self.userinterface.label_driver_action.setText("You need to restart the computer to complete the driver changes.")
+      self.button_driver_restart.setVisible(True)
+      return
+
+    self.nonfree_drivers = 0
+    for device in self.devices:
+      for pkg_name in self.devices[device]['drivers']:
+        pkg = self.apt_cache[pkg_name]
+        if not self.devices[device]['drivers'][pkg_name]['free'] and pkg.is_installed:
+          self.nonfree_drivers = self.nonfree_drivers + 1
+
+    if self.nonfree_drivers > 0:
+      text = "%s proprietary driver 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."))