Imported Upstream version 0.9.2

20 files changed, 241 insertions, 487 deletions

diff --git a/ui/aboutdlg_base.py b/ui/aboutdlg_base.py
index 82e1334ab..c94b4cdc8 100644
--- a/ui/aboutdlg_base.py
+++ b/ui/aboutdlg_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/aboutdlg_base.ui'
 #
-# Created: Thu Jan 20 09:35:49 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.12
+# Created: Fri Apr 1 14:51:31 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -57,7 +57,7 @@ class AboutDlg_base(QDialog):
         self.resize(QSize(465,487).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
-        self.connect(self.pushButton15,SIGNAL("clicked()"),self,SLOT("close()"))
+        self.connect(self.pushButton15,SIGNAL("clicked()"),self.close)
 
 
     def languageChange(self):
diff --git a/ui/aligntype6form1_base.py b/ui/aligntype6form1_base.py
index bf80c58dc..28a615ce2 100644
--- a/ui/aligntype6form1_base.py
+++ b/ui/aligntype6form1_base.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/pparks/linux-imaging-and-printing/src/ui/aligntype6form1_base.ui'
+# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/aligntype6form1_base.ui'
 #
-# Created: Thu Jan 6 14:14:11 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:30 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -21,25 +21,21 @@ class AlignType6Form1_base(QDialog):
 
 
         AlignType6Form1_baseLayout = QGridLayout(self,1,1,11,6,"AlignType6Form1_baseLayout")
-        spacer2 = QSpacerItem(313,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        AlignType6Form1_baseLayout.addItem(spacer2,1,0)
 
-        self.printPageButton = QPushButton(self,"printPageButton")
+        self.textLabel1 = QLabel(self,"textLabel1")
+        self.textLabel1.setAlignment(QLabel.WordBreak | QLabel.AlignVCenter)
 
-        AlignType6Form1_baseLayout.addWidget(self.printPageButton,1,2)
+        AlignType6Form1_baseLayout.addMultiCellWidget(self.textLabel1,0,0,0,2)
 
         self.pushButton2 = QPushButton(self,"pushButton2")
 
-        AlignType6Form1_baseLayout.addWidget(self.pushButton2,1,3)
-
-        self.textLabel1 = QLabel(self,"textLabel1")
-        self.textLabel1.setAlignment(QLabel.WordBreak | QLabel.AlignVCenter)
-
-        AlignType6Form1_baseLayout.addMultiCellWidget(self.textLabel1,0,0,0,3)
+        AlignType6Form1_baseLayout.addWidget(self.pushButton2,1,2)
 
-        self.cancelButton = QPushButton(self,"cancelButton")
+        self.pushButton3 = QPushButton(self,"pushButton3")
 
-        AlignType6Form1_baseLayout.addWidget(self.cancelButton,1,1)
+        AlignType6Form1_baseLayout.addWidget(self.pushButton3,1,1)
+        spacer2 = QSpacerItem(351,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
+        AlignType6Form1_baseLayout.addItem(spacer2,1,0)
 
         self.languageChange()
 
@@ -47,24 +43,17 @@ class AlignType6Form1_base(QDialog):
         self.clearWState(Qt.WState_Polished)
 
         self.connect(self.pushButton2,SIGNAL("clicked()"),self.accept)
-        self.connect(self.cancelButton,SIGNAL("clicked()"),self.reject)
-        self.connect(self.printPageButton,SIGNAL("clicked()"),self.printPageButton_clicked)
+        self.connect(self.pushButton3,SIGNAL("clicked()"),self.reject)
 
 
     def languageChange(self):
         self.setCaption(self.__tr("HP Device Manager - Alignment"))
-        self.printPageButton.setText(self.__tr("Print Page"))
-        self.pushButton2.setText(self.__tr("Next >"))
         self.textLabel1.setText(self.__tr("To perform alignment, you will need the <b>alignment page</b> that is automatically printed after you install a print cartridge.\n"
 "<p> If you do <b>not</b> have this page, click <i>Print Page</i>.\n"
 "<p>If you already have this page, click <i>Next ></i>."))
-        self.cancelButton.setText(self.__tr("Cancel"))
-
-
-
+        self.pushButton2.setText(self.__tr("Next >"))
+        self.pushButton3.setText(self.__tr("Print Page"))
 
-    def printPageButton_clicked(self):
-        print "AlignType6Form1_base.printPageButton_clicked(): Not implemented yet"
 
     def __tr(self,s,c = None):
         return qApp.translate("AlignType6Form1_base",s,c)
diff --git a/ui/aligntype6form2_base.py b/ui/aligntype6form2_base.py
index 237cd7232..17a5ba7f0 100644
--- a/ui/aligntype6form2_base.py
+++ b/ui/aligntype6form2_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/aligntype6form2_base.ui'
 #
-# Created: Thu Jan 20 09:35:46 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.12
+# Created: Fri Apr 1 14:51:27 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -39,7 +39,7 @@ class AlignType6Form2_base(QDialog):
         self.resize(QSize(626,211).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
-        self.connect(self.pushButton4,SIGNAL("clicked()"),self,SLOT("accept()"))
+        self.connect(self.pushButton4,SIGNAL("clicked()"),self.accept)
 
 
     def languageChange(self):
diff --git a/ui/cleaningform2_base.py b/ui/cleaningform2_base.py
index 89850aa18..4b92c78c8 100644
--- a/ui/cleaningform2_base.py
+++ b/ui/cleaningform2_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/cleaningform2_base.ui'
 #
-# Created: Tue Jan 25 10:58:05 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:32 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -24,7 +24,7 @@ class CleaningForm2_base(QDialog):
         CleaningForm2_baseLayout = QGridLayout(self,1,1,6,6,"CleaningForm2_baseLayout")
 
         self.Icon = QLabel(self,"Icon")
-        self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
+        self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
         self.Icon.setMinimumSize(QSize(71,65))
         self.Icon.setMaximumSize(QSize(71,65))
         self.Icon.setScaledContents(1)
diff --git a/ui/cleaningform_base.py b/ui/cleaningform_base.py
index ba0c18dee..0b0df524c 100644
--- a/ui/cleaningform_base.py
+++ b/ui/cleaningform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/cleaningform_base.ui'
 #
-# Created: Tue Jan 25 10:49:06 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:32 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -24,7 +24,7 @@ class CleaningForm_base(QDialog):
         CleaningForm_baseLayout = QGridLayout(self,1,1,6,6,"CleaningForm_baseLayout")
 
         self.Icon = QLabel(self,"Icon")
-        self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
+        self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
         self.Icon.setMinimumSize(QSize(71,65))
         self.Icon.setMaximumSize(QSize(71,65))
         self.Icon.setScaledContents(1)
diff --git a/ui/coloradjform_base.py b/ui/coloradjform_base.py
index f81937074..a5a27e24b 100644
--- a/ui/coloradjform_base.py
+++ b/ui/coloradjform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/coloradjform_base.ui'
 #
-# Created: Tue Feb 8 11:05:13 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:28 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -44,7 +44,7 @@ class ColorAdjForm_base(QDialog):
         buttonGroupLayout.setAlignment(Qt.AlignTop)
 
         self.Icon = QLabel(self.buttonGroup,"Icon")
-        self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
+        self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
         self.Icon.setScaledContents(1)
 
         buttonGroupLayout.addWidget(self.Icon,0,0)
diff --git a/ui/colorcalform_base.py b/ui/colorcalform_base.py
index 1660d138c..4645a18f3 100644
--- a/ui/colorcalform_base.py
+++ b/ui/colorcalform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/colorcalform_base.ui'
 #
-# Created: Thu Jan 20 09:35:45 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.12
+# Created: Fri Apr 1 14:51:27 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -81,8 +81,8 @@ class ColorCalForm_base(QDialog):
         self.resize(QSize(610,220).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
-        self.connect(self.CancelButton,SIGNAL("clicked()"),self,SLOT("reject()"))
-        self.connect(self.ContinueButton,SIGNAL("clicked()"),self,SLOT("accept()"))
+        self.connect(self.CancelButton,SIGNAL("clicked()"),self.reject)
+        self.connect(self.ContinueButton,SIGNAL("clicked()"),self.accept)
         self.connect(self.ColorCalGroup,SIGNAL("clicked(int)"),self.ColorCalGroup_clicked)
 
 
diff --git a/ui/devmgr4.py b/ui/devmgr4.py
index f843814a8..a3d66f05e 100644
--- a/ui/devmgr4.py
+++ b/ui/devmgr4.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #
-# $Revision: 1.63 $ 
-# $Date: 2005/03/29 21:06:23 $
+# $Revision: 1.66 $ 
+# $Date: 2005/04/14 19:36:44 $
 # $Author: dwelch $
 #
 #
@@ -29,7 +29,6 @@ import sys
 import socket
 import time
 import os
-import cStringIO
 
 # Local
 from base.g import *
@@ -54,7 +53,6 @@ from colorcalform2 import ColorCalForm2 # Type 2 color cal
 
 # Misc forms
 from loadpaperform import LoadPaperForm
-#from advancedinfoform import AdvancedInfoForm
 from settingsdialog import SettingsDialog
 from nodevicesform import NoDevicesForm
 from aboutdlg import AboutDlg
@@ -89,9 +87,7 @@ class DummyDevice:
         self.ds = {}
         self.mq = {}
         self.cups_printers = []
-        #self.job_id = 0
         self.last_event = None
-        #self.last_event_code = 0
         self.types_cached = False
 
 
@@ -204,11 +200,13 @@ class IconViewItem( QIconViewItem ):
 
 
 class devmgr4(DevMgr4_base):
-    def __init__(self, initial_device_uri=None, parent=None, name=None, fl = 0 ):
+    def __init__(self, cleanup=None, initial_device_uri=None, parent=None, name=None, fl = 0 ):
         DevMgr4_base.__init__( self, parent, name, fl )
-
+        
+        
         log.debug( "Initializing toolbox UI" )
-
+        self.cleanup = cleanup
+        
         # Make some adjustments to the UI
         self.StatusHistoryList.setSorting( -1 ) 
         self.AdvInfoList.setSorting( -1 )
@@ -299,7 +297,6 @@ class devmgr4(DevMgr4_base):
         self.email_alerts = False
         self.email_address = ''
         self.smtp_server = ''
-        self.popup_alerts = True
 
         self.auto_refresh = True
         self.auto_refresh_rate = DEF_AUTO_REFRESH_RATE
@@ -322,7 +319,6 @@ class devmgr4(DevMgr4_base):
                     self.email_alerts  = config.getboolean( "alerts", 'email-alerts' )
                     self.email_address = config.get( "alerts", 'email-address'  )
                     self.smtp_server   = config.get( "alerts", 'smtp-server' )
-                    self.popup_alerts  = config.getboolean( "alerts", 'popup-alerts' )
 
                 if config.has_section( "refresh" ):
                     self.auto_refresh = config.getboolean( "refresh", "enable" )
@@ -354,7 +350,6 @@ class devmgr4(DevMgr4_base):
         log.debug( "Email alerts: %s" % self.email_alerts )
         log.debug( "Email address: %s" % self.email_address )
         log.debug( "SMTP server: %s" % self.smtp_server )
-        log.debug( "Popup alerts: %s" % self.popup_alerts )
         log.debug( "Auto refresh: %s" % self.auto_refresh )
         log.debug( "Auto refresh rate: %s" % self.auto_refresh_rate )
 
@@ -372,14 +367,8 @@ class devmgr4(DevMgr4_base):
         QTimer.singleShot( 0, self.InitialUpdate )
 
     def InitialUpdate( self ):
-        #print "initalUpdate()"
         self.RescanDevices( True )
 
-        #if self.initial_device_uri is not None:
-        #    self.ActivateDevice( self.initial_device_uri )
-        #    self.UpdateStatusTab()
-        #    self.Tabs.setCurrentPage( 1 )
-
         self.refresh_timer = QTimer(self, "RefreshTimer")
         self.connect( self.refresh_timer, SIGNAL('timeout()'), self.TimedRefresh )
 
@@ -389,6 +378,7 @@ class devmgr4(DevMgr4_base):
     def TimedRefresh( self ):
         if self.auto_refresh and self.cur_device.polling:
             log.debug( "Refresh timer..." )
+            self.CleanupChildren()
             self.UpdateDevice()
 
     def autoRefresh_toggled(self,a0):
@@ -400,25 +390,28 @@ class devmgr4(DevMgr4_base):
         event.accept()
 
     def RescanDevices( self, make_history ):
-        #print "RescanDevices()"
-        #self.ToggleFunctionButtons( False )
         self.deviceRefreshAll.setEnabled( False )
-
         self.DeviceListRefresh( make_history )
-
         self.deviceRescanAction.setEnabled( True )
         self.deviceRefreshAll.setEnabled( True )
-        #self.ToggleFunctionButtons( True )
 
     def Cleanup( self ):
-        pass
+        self.CleanupChildren()
+        if self.cleanup is not None:
+            self.cleanup()
 
+    def CleanupChildren( self ):
+        log.debug( "Cleaning up child processes." )
+        try:
+            os.waitpid(-1, os.WNOHANG )
+        except OSError:
+            pass
+    
     def DeviceList_currentChanged(self,a0):
         self.cur_device_uri = self.DeviceList.currentItem().device_uri
         self.cur_device = self.devices[ self.cur_device_uri ]
 
         self.UpdateDevice()
-        #self.UpdateTabs()
 
     def DeviceList_rightButtonClicked( self, item, pos ):
         popup = QPopupMenu( self )
@@ -448,18 +441,13 @@ class devmgr4(DevMgr4_base):
         popup.popup( pos )
 
     def UpdateDevice( self, check_state=True ): 
-        #log.debug( ''.join( [ 'Update device:', '*'*40, self.cur_device_uri, '*'*40 ] ) )
         log.debug( utils.bold( "Update: %s %s %s" % ( "*"*20, self.cur_device_uri, "*"*20 ) ) )
-        #print "UpdateDevice()"
         self.update_called = True
         cd = self.cur_device
-        #QApplication.setOverrideCursor( QCursor(Qt.WaitCursor) )
         self.setCaption( "%s - HP Device Manager" % cd.model_ui ) 
         log.debug( "Device URI=%s" % self.cur_device_uri )
 
         if check_state: # get "live" status of printer
-
-            #ds = self.cur_device.ds
             try:
                 # Check device status and create appropriate history
                 self.cur_device.ds = self.service.queryDevice( self.cur_device_uri, 
@@ -471,9 +459,6 @@ class devmgr4(DevMgr4_base):
 
             cd.device_state = self.cur_device.ds.get( 'device-state', DEVICE_STATE_NOT_FOUND )
 
-        #if cd.status_code in ( STATUS_PRINTER_IDLE, ):
-        #    cd.polling = True
-
         if not self.cur_device.types_cached:
             try:
                 self.cur_device.mq = self.service.queryModel( cd.model )
@@ -515,7 +500,6 @@ class devmgr4(DevMgr4_base):
                 'HOME'       : prop.home_dir,
                                }
 
-        #QApplication.restoreOverrideCursor()
 
     default_pics = { 'deskjet'    : 'default_deskjet.png',
                      'business'   : 'default_business_inkjet.png',
@@ -600,7 +584,7 @@ class devmgr4(DevMgr4_base):
 
     def ContinueDeviceListRefresh( self ):
         if self.printer_num == self.num_printers:
-            self.rescanning = False
+
             self.scan_timer.stop()
             self.disconnect( self.scan_timer, SIGNAL('timeout()'), 
                              self.ContinueDeviceListRefresh )
@@ -614,9 +598,14 @@ class devmgr4(DevMgr4_base):
             self.DeviceList.adjustItems()
             self.DeviceList.updateGeometry()
 
+            self.rescanning = False
+
             self.DeviceList.setCurrentItem( self.DeviceList.firstItem() )
 
-            if self.num_printers == 0:
+            if self.num_devices == 1:
+                self.UpdateDevice( False )
+
+            elif self.num_devices == 0:
                 dlg = NoDevicesForm( self, "", True )
                 dlg.show()
 
@@ -689,13 +678,11 @@ class devmgr4(DevMgr4_base):
         self.CancelPrintJobButton.setEnabled( num_jobs > 0 )
 
     def PrintJobList_currentChanged( self, item ):
-        #print item
         pass
 
     def CancelPrintJobButton_clicked(self):
         item = self.PrintJobList.currentItem()
         if item is not None:
-            #print item.job_id, item.printer
             self.service.cancelJob( item.job_id, self.cur_device_uri )
 
     def UpdateTabs( self ):
@@ -716,9 +703,7 @@ class devmgr4(DevMgr4_base):
         else:
             line1 = self.__tr( "Front panel display" )
             line2 = self.__tr( "unavailable" )
-            
-        #print line1, line2
-        
+
         pm = QPixmap( self.blank_lcd )
 
         p = QPainter()
@@ -763,12 +748,10 @@ class devmgr4(DevMgr4_base):
         except Error:
             log.error( "History query failed." )
             cd.last_event = None
-            #cd.job_id = 0
             cd.error_state = ERROR_STATE_ERROR
             cd.status_code = STATUS_UNKNOWN
         else:
             cd.last_event = cd.hist[-1]
-            #cd.job_id = cd.last_event[9]
             cd.status_code = int( cd.last_event[11] )
             cd.error_state = STATUS_TO_ERROR_STATE_MAP.get( cd.status_code, ERROR_STATE_CLEAR )
 
@@ -784,8 +767,6 @@ class devmgr4(DevMgr4_base):
             self.UpdateHistory()
             last_event = cd.last_event
 
-        #print last_event
-
         for x in cd.hist:
             job_id = x[9]
             code = x[11]
@@ -812,38 +793,23 @@ class devmgr4(DevMgr4_base):
         self.StatusText.setText( last_event[12] )
         self.StatusText2.setText( last_event[13] )
 
-        #self.StatusCode.setText( str( last_event[11] ) )
-
-        #self.StatusDateTime.setText( time.strftime( "%a, %d %b %Y, %H:%M:%S", 
-        #                             last_event[:9] ) )
-
-        #self.StatusTime.setText( time.strftime( "%H:%M:%S", 
-        #                         last_event[:9] ) )
-
-        #job_id = cd.job_id
-        #self.StatusJobID.setText( str( job_id ) )
-
-        #self.CancelJobButton.setEnabled( job_id != 0 )
+        if cd.error_state == ERROR_STATE_CLEAR:
+            self.StatusIcon.clear()
 
-        if 1:
+        elif cd.error_state == ERROR_STATE_OK:
+            self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "ok.png" ) ) )
 
-            if cd.error_state == ERROR_STATE_CLEAR:
-                self.StatusIcon.clear()
+        elif cd.error_state == ERROR_STATE_WARNING:
+            self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) )
 
-            elif cd.error_state == ERROR_STATE_OK:
-                self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "ok.png" ) ) )
+        elif cd.error_state == ERROR_STATE_LOW_SUPPLIES:
+            self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) )
 
-            elif cd.error_state == ERROR_STATE_WARNING:
-                self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) )
+        elif cd.error_state == ERROR_STATE_ERROR:
+            self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "error.png" ) ) )
 
-            elif cd.error_state == ERROR_STATE_LOW_SUPPLIES:
-                self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "warning.png" ) ) )
-
-            elif cd.error_state == ERROR_STATE_ERROR:
-                self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "error.png" ) ) )
-
-            elif cd.error_state == ERROR_STATE_BUSY:
-                self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "busy.png" ) ) )
+        elif cd.error_state == ERROR_STATE_BUSY:
+            self.StatusIcon.setPixmap( QPixmap( os.path.join( prop.image_dir, "busy.png" ) ) )
 
 
     def UpdateSuppliesTab( self ):
@@ -901,12 +867,10 @@ class devmgr4(DevMgr4_base):
             self.CleanPensButton.setEnabled( self.cur_device.clean_type )
             self.AlignPensButton.setEnabled( self.cur_device.align_type )
             self.ColorCalibrationButton.setEnabled( self.cur_device.color_cal_type )
-            #self.PrintTestPageButton.setEnabled( True )
         else:
             self.CleanPensButton.setEnabled( False )
             self.AlignPensButton.setEnabled( False )
             self.ColorCalibrationButton.setEnabled( False )
-            #self.PrintTestPageButton.setEnabled( False )
 
     def ToggleInfoButtons( self, toggle ):
         if toggle:
@@ -949,21 +913,16 @@ class devmgr4(DevMgr4_base):
         log.debug( "Event: code=%d type=%s string=%s timeout=%d id=%d uri=%s" % 
                  ( event_code, event_type,  error_string_short, retry_timeout, job_id, device_uri ) )
 
-        if event_code == EVENT_UI_SHOW_TOOLBOX:
-            #self.rescan( True ) 
-            pass
 
-        elif self.ActivateDevice( device_uri ):
+        if self.ActivateDevice( device_uri ):
             self.cur_device.status_code = event_code 
             self.UpdateDevice( False )
             self.Tabs.setCurrentPage( 1 )
 
 
-
     def settingsConfigure_activated(self, tab_to_show=0 ):
         dlg = SettingsDialog( self )
 
-        dlg.PopupCheckBox.setChecked( self.popup_alerts )
         dlg.EmailCheckBox.setChecked( self.email_alerts )
         dlg.EmailAddress.setText( self.email_address )
         dlg.SMTPServer.setText( self.smtp_server )
@@ -987,7 +946,6 @@ class devmgr4(DevMgr4_base):
             self.cmd_copy  = str( dlg.MakeCopiesCommand.text() )
 
             self.email_alerts = bool( dlg.EmailCheckBox.isChecked() )
-            self.popup_alerts = bool( dlg.PopupCheckBox.isChecked() )
             self.email_address = str( dlg.EmailAddress.text() )
             self.smtp_server = str( dlg.SMTPServer.text() )
 
@@ -1002,8 +960,7 @@ class devmgr4(DevMgr4_base):
 
 
     def SetAlerts( self ):
-        self.service.setAlerts( self.popup_alerts,
-                                self.email_alerts,
+        self.service.setAlerts( self.email_alerts,
                                 self.email_address,
                                 self.smtp_server,
                               )
@@ -1031,7 +988,6 @@ class devmgr4(DevMgr4_base):
         config.set( "alerts", 'email-alerts', self.email_alerts )
         config.set( "alerts", 'email-address', self.email_address  )
         config.set( "alerts", 'smtp-server', self.smtp_server )
-        config.set( "alerts", 'popup-alerts', self.popup_alerts )
 
         if not config.has_section( 'maint' ):
             config.add_section( 'maint' )
@@ -1274,9 +1230,6 @@ class devmgr4(DevMgr4_base):
         self.RescanDevices( True )
 
     def DeviceList_clicked(self,a0):
-        #if not self.update_called:
-        #    self.UpdateDevice()
-        #self.update_called = False
         pass
 
     def OpenEmbeddedBrowserButton_clicked(self):
@@ -1323,9 +1276,11 @@ class devmgr4(DevMgr4_base):
 
             log.debug( path )
             log.debug( args )
-
+            
+            self.CleanupChildren()
             os.spawnvp( os.P_NOWAIT, path, args )
-        #self.UpdateFunctionsTab()
+            
+            
         self.ToggleFunctionButtons( True )
 
 
diff --git a/ui/devmgr4_base.py b/ui/devmgr4_base.py
index e18731891..eeba6d0de 100644
--- a/ui/devmgr4_base.py
+++ b/ui/devmgr4_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/devmgr4_base.ui'
 #
-# Created: Wed Mar 23 13:02:51 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:30 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -28,7 +28,7 @@ class DevMgr4_base(QMainWindow):
         self.splitter2.setOrientation(QSplitter.Horizontal)
 
         self.DeviceList = QIconView(self.splitter2,"DeviceList")
-        self.DeviceList.setSizePolicy(QSizePolicy(5,5,0,0,self.DeviceList.sizePolicy().hasHeightForWidth()))
+        self.DeviceList.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred,0,0,self.DeviceList.sizePolicy().hasHeightForWidth()))
         self.DeviceList.setMaximumSize(QSize(32767,32767))
         self.DeviceList.setResizePolicy(QIconView.Manual)
         self.DeviceList.setArrangement(QIconView.TopToBottom)
@@ -73,7 +73,7 @@ class DevMgr4_base(QMainWindow):
         self.PrintButton.setEnabled(0)
 
         TabPageLayout.addMultiCellWidget(self.PrintButton,1,1,0,1)
-        self.Tabs.insertTab(self.TabPage,QString(""))
+        self.Tabs.insertTab(self.TabPage,QString.fromLatin1(""))
 
         self.StatusTab = QWidget(self.Tabs,"StatusTab")
         StatusTabLayout = QGridLayout(self.StatusTab,1,1,11,6,"StatusTabLayout")
@@ -94,7 +94,7 @@ class DevMgr4_base(QMainWindow):
         StatusGroupBoxLayout.addWidget(self.StatusText,0,0)
 
         self.StatusIcon = QLabel(self.StatusGroupBox,"StatusIcon")
-        self.StatusIcon.setSizePolicy(QSizePolicy(0,0,0,0,self.StatusIcon.sizePolicy().hasHeightForWidth()))
+        self.StatusIcon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.StatusIcon.sizePolicy().hasHeightForWidth()))
         self.StatusIcon.setMinimumSize(QSize(32,32))
         self.StatusIcon.setMaximumSize(QSize(32,32))
         self.StatusIcon.setScaledContents(1)
@@ -134,7 +134,7 @@ class DevMgr4_base(QMainWindow):
         groupBox3Layout.addWidget(self.StatusHistoryList,0,0)
 
         StatusTabLayout.addWidget(self.groupBox3,1,0)
-        self.Tabs.insertTab(self.StatusTab,QString(""))
+        self.Tabs.insertTab(self.StatusTab,QString.fromLatin1(""))
 
         self.TabPage_2 = QWidget(self.Tabs,"TabPage_2")
         TabPageLayout_2 = QGridLayout(self.TabPage_2,1,1,11,6,"TabPageLayout_2")
@@ -155,7 +155,7 @@ class DevMgr4_base(QMainWindow):
         TabPageLayout_2.addWidget(self.CancelPrintJobButton,1,1)
         spacer12_3 = QSpacerItem(471,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
         TabPageLayout_2.addItem(spacer12_3,1,0)
-        self.Tabs.insertTab(self.TabPage_2,QString(""))
+        self.Tabs.insertTab(self.TabPage_2,QString.fromLatin1(""))
 
         self.SuppliesTab = QWidget(self.Tabs,"SuppliesTab")
         SuppliesTabLayout = QGridLayout(self.SuppliesTab,1,1,11,6,"SuppliesTabLayout")
@@ -171,7 +171,7 @@ class DevMgr4_base(QMainWindow):
         self.textLabel1_2 = QLabel(self.SuppliesTab,"textLabel1_2")
 
         SuppliesTabLayout.addWidget(self.textLabel1_2,0,0)
-        self.Tabs.insertTab(self.SuppliesTab,QString(""))
+        self.Tabs.insertTab(self.SuppliesTab,QString.fromLatin1(""))
 
         self.MaintTab = QWidget(self.Tabs,"MaintTab")
         MaintTabLayout = QGridLayout(self.MaintTab,1,1,11,6,"MaintTabLayout")
@@ -241,7 +241,7 @@ class DevMgr4_base(QMainWindow):
         MaintTabLayout.addWidget(self.groupBox4,0,0)
         spacer13_2 = QSpacerItem(20,170,QSizePolicy.Minimum,QSizePolicy.Expanding)
         MaintTabLayout.addItem(spacer13_2,3,0)
-        self.Tabs.insertTab(self.MaintTab,QString(""))
+        self.Tabs.insertTab(self.MaintTab,QString.fromLatin1(""))
 
         self.TabPage_3 = QWidget(self.Tabs,"TabPage_3")
         TabPageLayout_3 = QGridLayout(self.TabPage_3,1,1,11,6,"TabPageLayout_3")
@@ -254,7 +254,7 @@ class DevMgr4_base(QMainWindow):
         groupBox9_2Layout.setAlignment(Qt.AlignTop)
 
         self.Panel = QLabel(self.groupBox9_2,"Panel")
-        self.Panel.setSizePolicy(QSizePolicy(0,0,0,0,self.Panel.sizePolicy().hasHeightForWidth()))
+        self.Panel.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Panel.sizePolicy().hasHeightForWidth()))
         self.Panel.setMinimumSize(QSize(254,40))
         self.Panel.setMaximumSize(QSize(254,40))
         self.Panel.setFrameShape(QLabel.NoFrame)
@@ -271,13 +271,13 @@ class DevMgr4_base(QMainWindow):
         groupBox9_2Layout.addItem(spacer14_2,1,0)
 
         TabPageLayout_3.addWidget(self.groupBox9_2,0,0)
-        self.Tabs.insertTab(self.TabPage_3,QString(""))
+        self.Tabs.insertTab(self.TabPage_3,QString.fromLatin1(""))
 
         self.InfoTab = QWidget(self.Tabs,"InfoTab")
         InfoTabLayout = QGridLayout(self.InfoTab,1,1,11,6,"InfoTabLayout")
 
         self.groupBox11 = QGroupBox(self.InfoTab,"groupBox11")
-        self.groupBox11.setSizePolicy(QSizePolicy(5,5,0,0,self.groupBox11.sizePolicy().hasHeightForWidth()))
+        self.groupBox11.setSizePolicy(QSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred,0,0,self.groupBox11.sizePolicy().hasHeightForWidth()))
         self.groupBox11.setColumnLayout(0,Qt.Vertical)
         self.groupBox11.layout().setSpacing(6)
         self.groupBox11.layout().setMargin(11)
@@ -287,7 +287,7 @@ class DevMgr4_base(QMainWindow):
         self.AdvInfoList = QListView(self.groupBox11,"AdvInfoList")
         self.AdvInfoList.addColumn(self.__tr("Key"))
         self.AdvInfoList.addColumn(self.__tr("Value"))
-        self.AdvInfoList.setSizePolicy(QSizePolicy(7,7,0,0,self.AdvInfoList.sizePolicy().hasHeightForWidth()))
+        self.AdvInfoList.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding,0,0,self.AdvInfoList.sizePolicy().hasHeightForWidth()))
         self.AdvInfoList.setAllColumnsShowFocus(1)
 
         groupBox11Layout.addWidget(self.AdvInfoList,0,0)
@@ -334,7 +334,7 @@ class DevMgr4_base(QMainWindow):
         groupBox9Layout.addWidget(self.OpenEmbeddedBrowserButton,1,1)
 
         InfoTabLayout.addWidget(self.groupBox9,2,0)
-        self.Tabs.insertTab(self.InfoTab,QString(""))
+        self.Tabs.insertTab(self.InfoTab,QString.fromLatin1(""))
 
         DevMgr4_baseLayout.addWidget(self.splitter2,0,0)
 
diff --git a/ui/form1.py b/ui/form1.py
deleted file mode 100644
index 3ec2fa2c3..000000000
--- a/ui/form1.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/form1.ui'
-#
-# Created: Thu Jan 20 09:35:46 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.12
-#
-# WARNING! All changes made in this file will be lost!
-
-
-import sys
-from qt import *
-
-
-class Form1(QDialog):
-    def __init__(self,parent = None,name = None,modal = 0,fl = 0):
-        QDialog.__init__(self,parent,name,modal,fl)
-
-        if not name:
-            self.setName("Form1")
-
-
-        Form1Layout = QGridLayout(self,1,1,11,6,"Form1Layout")
-
-        self.pushButton1 = QPushButton(self,"pushButton1")
-
-        Form1Layout.addWidget(self.pushButton1,0,0)
-
-        self.languageChange()
-
-        self.resize(QSize(124,53).expandedTo(self.minimumSizeHint()))
-        self.clearWState(Qt.WState_Polished)
-
-        self.connect(self.pushButton1,SIGNAL("clicked()"),self,SLOT("close()"))
-
-
-    def languageChange(self):
-        self.setCaption(self.__tr("hpguid"))
-        self.pushButton1.setText(self.__tr("Close"))
-
-
-    def __tr(self,s,c = None):
-        return qApp.translate("Form1",s,c)
-
-if __name__ == "__main__":
-    a = QApplication(sys.argv)
-    QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
-    w = Form1()
-    a.setMainWidget(w)
-    w.show()
-    a.exec_loop()
diff --git a/ui/form1.ui b/ui/form1.ui
deleted file mode 100644
index d10c38aa0..000000000
--- a/ui/form1.ui
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>Form1</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>Form1</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>53</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>hpguid</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QPushButton" row="0" column="0">
-            <property name="name">
-                <cstring>pushButton1</cstring>
-            </property>
-            <property name="text">
-                <string>Close</string>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>pushButton1</sender>
-        <signal>clicked()</signal>
-        <receiver>Form1</receiver>
-        <slot>close()</slot>
-    </connection>
-</connections>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/ui/imagepropertiesdlg_base.py b/ui/imagepropertiesdlg_base.py
index 8f5eab914..785a6d3bb 100644
--- a/ui/imagepropertiesdlg_base.py
+++ b/ui/imagepropertiesdlg_base.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/pparks/linux-imaging-and-printing/src/ui/imagepropertiesdlg_base.ui'
+# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/imagepropertiesdlg_base.ui'
 #
-# Created: Thu Mar 10 14:15:39 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:29 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -38,7 +38,7 @@ class ImagePropertiesDlg_base(QDialog):
         self.EXifDataListView.addColumn(self.__tr("EXIF Labels"))
         self.EXifDataListView.header().setResizeEnabled(0,self.EXifDataListView.header().count() - 1)
         self.EXifDataListView.addColumn(self.__tr("Contents "))
-        self.EXifDataListView.setSizePolicy(QSizePolicy(7,7,0,0,self.EXifDataListView.sizePolicy().hasHeightForWidth()))
+        self.EXifDataListView.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding,0,0,self.EXifDataListView.sizePolicy().hasHeightForWidth()))
         self.EXifDataListView.setMinimumSize(QSize(400,100))
         self.EXifDataListView.setFrameShadow(QListView.Sunken)
         self.EXifDataListView.setResizeMode(QListView.AllColumns)
diff --git a/ui/loadpaperform_base.py b/ui/loadpaperform_base.py
index 7b60604b2..265fd92a1 100644
--- a/ui/loadpaperform_base.py
+++ b/ui/loadpaperform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/loadpaperform_base.ui'
 #
-# Created: Thu Jan 20 09:35:47 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.12
+# Created: Fri Apr 1 14:51:29 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -38,7 +38,7 @@ class LoadPaperForm_base(QDialog):
         LoadPaperForm_baseLayout.addMultiCellWidget(self.textLabel7,0,0,1,3)
 
         self.Icon = QLabel(self,"Icon")
-        self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
+        self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
         self.Icon.setScaledContents(1)
 
         LoadPaperForm_baseLayout.addWidget(self.Icon,0,0)
@@ -48,8 +48,8 @@ class LoadPaperForm_base(QDialog):
         self.resize(QSize(621,178).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
-        self.connect(self.CancelButton,SIGNAL("clicked()"),self,SLOT("reject()"))
-        self.connect(self.ContinueButton,SIGNAL("clicked()"),self,SLOT("accept()"))
+        self.connect(self.CancelButton,SIGNAL("clicked()"),self.reject)
+        self.connect(self.ContinueButton,SIGNAL("clicked()"),self.accept)
 
 
     def languageChange(self):
diff --git a/ui/nodevicesform_base.py b/ui/nodevicesform_base.py
index 77499ba1b..93cf349f8 100644
--- a/ui/nodevicesform_base.py
+++ b/ui/nodevicesform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/nodevicesform_base.ui'
 #
-# Created: Thu Jan 20 09:35:48 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.12
+# Created: Fri Apr 1 14:51:29 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -23,7 +23,7 @@ class NoDevicesForm_base(QDialog):
         NoDevicesForm_baseLayout = QGridLayout(self,1,1,11,6,"NoDevicesForm_baseLayout")
 
         self.Icon = QLabel(self,"Icon")
-        self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
+        self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
         self.Icon.setFrameShape(QLabel.NoFrame)
         self.Icon.setScaledContents(1)
 
diff --git a/ui/paperedgealignform_base.py b/ui/paperedgealignform_base.py
index 01110fb20..dd5a4e3a2 100644
--- a/ui/paperedgealignform_base.py
+++ b/ui/paperedgealignform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/paperedgealignform_base.ui'
 #
-# Created: Thu Jan 20 09:35:46 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.12
+# Created: Fri Apr 1 14:51:28 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -37,7 +37,7 @@ class PaperEdgeAlignForm_base(QDialog):
         PaperEdgeAlignForm_baseLayout.addWidget(self.CancelButton,1,2)
 
         self.buttonGroup = QButtonGroup(self,"buttonGroup")
-        self.buttonGroup.setSizePolicy(QSizePolicy(1,5,0,0,self.buttonGroup.sizePolicy().hasHeightForWidth()))
+        self.buttonGroup.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Preferred,0,0,self.buttonGroup.sizePolicy().hasHeightForWidth()))
         self.buttonGroup.setColumnLayout(0,Qt.Vertical)
         self.buttonGroup.layout().setSpacing(6)
         self.buttonGroup.layout().setMargin(11)
@@ -89,7 +89,7 @@ class PaperEdgeAlignForm_base(QDialog):
         buttonGroupLayout.addMultiCellLayout(layout24,1,1,0,1)
 
         self.Icon = QLabel(self.buttonGroup,"Icon")
-        self.Icon.setSizePolicy(QSizePolicy(0,0,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
+        self.Icon.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.Icon.sizePolicy().hasHeightForWidth()))
         self.Icon.setScaledContents(1)
 
         buttonGroupLayout.addWidget(self.Icon,0,0)
@@ -106,8 +106,8 @@ class PaperEdgeAlignForm_base(QDialog):
         self.resize(QSize(618,233).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
-        self.connect(self.CancelButton,SIGNAL("clicked()"),self,SLOT("reject()"))
-        self.connect(self.ContinueButton,SIGNAL("clicked()"),self,SLOT("accept()"))
+        self.connect(self.CancelButton,SIGNAL("clicked()"),self.reject)
+        self.connect(self.ContinueButton,SIGNAL("clicked()"),self.accept)
         self.connect(self.buttonGroup,SIGNAL("clicked(int)"),self.buttonGroup_clicked)
 
 
diff --git a/ui/settingsdialog.py b/ui/settingsdialog.py
index 7616652ff..c4ed4daa8 100644
--- a/ui/settingsdialog.py
+++ b/ui/settingsdialog.py
@@ -28,34 +28,23 @@ from settingsdialog_base import SettingsDialog_base
 class SettingsDialog(SettingsDialog_base):
     def __init__(self, parent = None,name = None,modal = 0,fl = 0):
         SettingsDialog_base.__init__(self,parent,name,modal,fl)
-        #self.cleaning_level = cleaning_level
-        #self.CleaningLevel.setButton( self.cleaning_level )
         self.DefaultsButton.setEnabled( False )
-        
+
     def PrintCmdChangeButton_clicked(self):
-        #self.PrintCommand
         pass
-        
+
     def ScanCmdChangeButton_clicked(self):
-        #self.ScanCommand
         pass
-        
+
     def AccessPCardCmdChangeButton_clicked(self):
-        #self.AccessPCardCommand
         pass
-        
+
     def SendFaxCmdChangeButton_clicked(self):
-        #self.SendFaxCommand
         pass
-        
+
     def MakeCopiesCmdChangeButton_clicked(self):
-        #self.MakeCopiesCommand
         pass
-        
-    #def CleaningLevel_clicked(self,a0):
-        #self.cleaning_level = a0
-    #    pass
-        
+
     def DefaultsButton_clicked(self):
         cmd_print, cmd_scan, cmd_pcard, cmd_copy, cmd_fax = utils.deviceDefaultFunctions()
         self.PrintCommand.setText( cmd_print )
@@ -66,20 +55,19 @@ class SettingsDialog(SettingsDialog_base):
 
     def TabWidget_currentChanged(self,a0):
         name = str( a0.name() )
-        
+
         if name == 'FunctionCommands':
             self.DefaultsButton.setEnabled( True )
         else:
             self.DefaultsButton.setEnabled( False )
-      
-    
+
+
     def EmailTestButton_clicked(self): 
         email_address = str( self.EmailAddress.text() )
         smtp_server = str( self.SMTPServer.text() )
         s = service.Service()
         resultCode = s.testEmail(email_address, smtp_server)
         if resultCode != ERROR_SUCCESS:
-             log.debug( "Failure-Result_Code: %s" % resultCode )
-            # show success/failure dialog
+            log.debug( "Failure-Result_Code: %s" % resultCode )
         log.debug( "Success-Result_Code: %s" % resultCode )
         s.close()
diff --git a/ui/settingsdialog_base.py b/ui/settingsdialog_base.py
index 5a67355f2..e2e09e41f 100644
--- a/ui/settingsdialog_base.py
+++ b/ui/settingsdialog_base.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/pparks/linux-imaging-and-printing/src/ui/settingsdialog_base.ui'
+# Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/settingsdialog_base.ui'
 #
-# Created: Mon Jan 31 15:16:03 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Wed Apr 13 11:15:03 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -36,26 +36,47 @@ class SettingsDialog_base(QDialog):
 
         self.TabWidget = QTabWidget(self,"TabWidget")
 
-        self.PopupAlerts = QWidget(self.TabWidget,"PopupAlerts")
-        PopupAlertsLayout = QGridLayout(self.PopupAlerts,1,1,11,6,"PopupAlertsLayout")
+        self.CleaningLevels = QWidget(self.TabWidget,"CleaningLevels")
+        CleaningLevelsLayout = QGridLayout(self.CleaningLevels,1,1,11,6,"CleaningLevelsLayout")
+
+        self.textLabel3_2_2 = QLabel(self.CleaningLevels,"textLabel3_2_2")
+
+        CleaningLevelsLayout.addWidget(self.textLabel3_2_2,0,0)
+
+        self.line1_2_2 = QFrame(self.CleaningLevels,"line1_2_2")
+        self.line1_2_2.setFrameShape(QFrame.HLine)
+        self.line1_2_2.setFrameShadow(QFrame.Sunken)
+        self.line1_2_2.setFrameShape(QFrame.HLine)
 
-        self.textLabel3 = QLabel(self.PopupAlerts,"textLabel3")
+        CleaningLevelsLayout.addWidget(self.line1_2_2,1,0)
+        spacer8 = QSpacerItem(20,200,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        CleaningLevelsLayout.addItem(spacer8,3,0)
+
+        self.CleaningLevel = QButtonGroup(self.CleaningLevels,"CleaningLevel")
+        self.CleaningLevel.setColumnLayout(0,Qt.Vertical)
+        self.CleaningLevel.layout().setSpacing(6)
+        self.CleaningLevel.layout().setMargin(11)
+        CleaningLevelLayout = QGridLayout(self.CleaningLevel.layout())
+        CleaningLevelLayout.setAlignment(Qt.AlignTop)
+        spacer9_2 = QSpacerItem(181,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
+        CleaningLevelLayout.addItem(spacer9_2,0,1)
 
-        PopupAlertsLayout.addWidget(self.textLabel3,0,0)
+        layout7 = QHBoxLayout(None,0,6,"layout7")
 
-        self.line1 = QFrame(self.PopupAlerts,"line1")
-        self.line1.setFrameShape(QFrame.HLine)
-        self.line1.setFrameShadow(QFrame.Sunken)
-        self.line1.setFrameShape(QFrame.HLine)
+        self.AutoRefreshRate = QSpinBox(self.CleaningLevel,"AutoRefreshRate")
+        self.AutoRefreshRate.setWrapping(1)
+        self.AutoRefreshRate.setButtonSymbols(QSpinBox.PlusMinus)
+        self.AutoRefreshRate.setMaxValue(360)
+        self.AutoRefreshRate.setMinValue(5)
+        layout7.addWidget(self.AutoRefreshRate)
 
-        PopupAlertsLayout.addWidget(self.line1,1,0)
+        self.textLabel1_3 = QLabel(self.CleaningLevel,"textLabel1_3")
+        layout7.addWidget(self.textLabel1_3)
 
-        self.PopupCheckBox = QCheckBox(self.PopupAlerts,"PopupCheckBox")
+        CleaningLevelLayout.addLayout(layout7,0,0)
 
-        PopupAlertsLayout.addWidget(self.PopupCheckBox,2,0)
-        spacer7 = QSpacerItem(21,171,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        PopupAlertsLayout.addItem(spacer7,3,0)
-        self.TabWidget.insertTab(self.PopupAlerts,QString(""))
+        CleaningLevelsLayout.addWidget(self.CleaningLevel,2,0)
+        self.TabWidget.insertTab(self.CleaningLevels,QString.fromLatin1(""))
 
         self.EmailAlerts = QWidget(self.TabWidget,"EmailAlerts")
         EmailAlertsLayout = QGridLayout(self.EmailAlerts,1,1,11,6,"EmailAlertsLayout")
@@ -130,49 +151,7 @@ class SettingsDialog_base(QDialog):
         EmailAlertsLayout.addWidget(self.EmailTestButton,7,0)
         spacer12 = QSpacerItem(20,20,QSizePolicy.Minimum,QSizePolicy.Expanding)
         EmailAlertsLayout.addItem(spacer12,8,0)
-        self.TabWidget.insertTab(self.EmailAlerts,QString(""))
-
-        self.CleaningLevels = QWidget(self.TabWidget,"CleaningLevels")
-        CleaningLevelsLayout = QGridLayout(self.CleaningLevels,1,1,11,6,"CleaningLevelsLayout")
-
-        self.textLabel3_2_2 = QLabel(self.CleaningLevels,"textLabel3_2_2")
-
-        CleaningLevelsLayout.addWidget(self.textLabel3_2_2,0,0)
-
-        self.line1_2_2 = QFrame(self.CleaningLevels,"line1_2_2")
-        self.line1_2_2.setFrameShape(QFrame.HLine)
-        self.line1_2_2.setFrameShadow(QFrame.Sunken)
-        self.line1_2_2.setFrameShape(QFrame.HLine)
-
-        CleaningLevelsLayout.addWidget(self.line1_2_2,1,0)
-        spacer8 = QSpacerItem(20,200,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        CleaningLevelsLayout.addItem(spacer8,3,0)
-
-        self.CleaningLevel = QButtonGroup(self.CleaningLevels,"CleaningLevel")
-        self.CleaningLevel.setColumnLayout(0,Qt.Vertical)
-        self.CleaningLevel.layout().setSpacing(6)
-        self.CleaningLevel.layout().setMargin(11)
-        CleaningLevelLayout = QGridLayout(self.CleaningLevel.layout())
-        CleaningLevelLayout.setAlignment(Qt.AlignTop)
-        spacer9_2 = QSpacerItem(181,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        CleaningLevelLayout.addItem(spacer9_2,0,1)
-
-        layout7 = QHBoxLayout(None,0,6,"layout7")
-
-        self.AutoRefreshRate = QSpinBox(self.CleaningLevel,"AutoRefreshRate")
-        self.AutoRefreshRate.setWrapping(1)
-        self.AutoRefreshRate.setButtonSymbols(QSpinBox.PlusMinus)
-        self.AutoRefreshRate.setMaxValue(360)
-        self.AutoRefreshRate.setMinValue(5)
-        layout7.addWidget(self.AutoRefreshRate)
-
-        self.textLabel1_3 = QLabel(self.CleaningLevel,"textLabel1_3")
-        layout7.addWidget(self.textLabel1_3)
-
-        CleaningLevelLayout.addLayout(layout7,0,0)
-
-        CleaningLevelsLayout.addWidget(self.CleaningLevel,2,0)
-        self.TabWidget.insertTab(self.CleaningLevels,QString(""))
+        self.TabWidget.insertTab(self.EmailAlerts,QString.fromLatin1(""))
 
         self.FunctionCommands = QWidget(self.TabWidget,"FunctionCommands")
         FunctionCommandsLayout = QGridLayout(self.FunctionCommands,1,1,11,6,"FunctionCommandsLayout")
@@ -255,7 +234,7 @@ class SettingsDialog_base(QDialog):
         FunctionCommandsLayout.addItem(spacer8_2,13,1)
         spacer9 = QSpacerItem(20,81,QSizePolicy.Minimum,QSizePolicy.Expanding)
         FunctionCommandsLayout.addItem(spacer9,12,0)
-        self.TabWidget.insertTab(self.FunctionCommands,QString(""))
+        self.TabWidget.insertTab(self.FunctionCommands,QString.fromLatin1(""))
 
         SettingsDialog_baseLayout.addMultiCellWidget(self.TabWidget,0,0,0,3)
         spacer40 = QSpacerItem(430,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
@@ -280,8 +259,7 @@ class SettingsDialog_base(QDialog):
         self.setTabOrder(self.TabWidget,self.pushButton30)
         self.setTabOrder(self.pushButton30,self.pushButton32)
         self.setTabOrder(self.pushButton32,self.pushButton31)
-        self.setTabOrder(self.pushButton31,self.PopupCheckBox)
-        self.setTabOrder(self.PopupCheckBox,self.EmailAddress)
+        self.setTabOrder(self.pushButton31,self.EmailAddress)
         self.setTabOrder(self.EmailAddress,self.SMTPServer)
         self.setTabOrder(self.SMTPServer,self.Username)
         self.setTabOrder(self.Username,self.Password)
@@ -301,9 +279,10 @@ class SettingsDialog_base(QDialog):
         self.pushButton30.setText(self.__tr("OK"))
         self.pushButton32.setText(self.__tr("Help"))
         self.pushButton31.setText(self.__tr("Cancel"))
-        self.textLabel3.setText(self.__tr("<b>Configure if the HP Device Manager will popup on alerts</b>"))
-        self.PopupCheckBox.setText(self.__tr("Popup Device Manager when status alerts occur"))
-        self.TabWidget.changeTab(self.PopupAlerts,self.__tr("Popup Alerts"))
+        self.textLabel3_2_2.setText(self.__tr("<b>Configure the rate at which devices are automaically refreshed</b>"))
+        self.CleaningLevel.setTitle(self.__tr("Auto refresh rate"))
+        self.textLabel1_3.setText(self.__tr("seconds"))
+        self.TabWidget.changeTab(self.CleaningLevels,self.__tr("Auto Refresh"))
         self.textLabel3_2.setText(self.__tr("<b>Configure if the HP Device Manager will send email on alerts</b>"))
         self.textLabel21.setText(self.__tr("SMTP server name:"))
         self.textLabel20.setText(self.__tr("Email address(es):"))
@@ -313,10 +292,6 @@ class SettingsDialog_base(QDialog):
         self.EmailCheckBox.setText(self.__tr("Send email when status alerts occur:"))
         self.EmailTestButton.setText(self.__tr("Test"))
         self.TabWidget.changeTab(self.EmailAlerts,self.__tr("Email Alerts"))
-        self.textLabel3_2_2.setText(self.__tr("<b>Configure the rate at which devices are automaically refreshed</b>"))
-        self.CleaningLevel.setTitle(self.__tr("Auto refresh rate"))
-        self.textLabel1_3.setText(self.__tr("seconds"))
-        self.TabWidget.changeTab(self.CleaningLevels,self.__tr("Auto Refresh"))
         self.textLabel3_2_2_2.setText(self.__tr("<b>Configure what commands to run for device functions</b>"))
         self.textLabel1_2.setText(self.__tr("Print Command"))
         self.textLabel1_2_2.setText(self.__tr("Scan Command"))
diff --git a/ui/settingsdialog_base.ui b/ui/settingsdialog_base.ui
index 93d9f14ef..c9f03aee5 100644
--- a/ui/settingsdialog_base.ui
+++ b/ui/settingsdialog_base.ui
@@ -49,10 +49,10 @@
             </property>
             <widget class="QWidget">
                 <property name="name">
-                    <cstring>PopupAlerts</cstring>
+                    <cstring>CleaningLevels</cstring>
                 </property>
                 <attribute name="title">
-                    <string>Popup Alerts</string>
+                    <string>Auto Refresh</string>
                 </attribute>
                 <grid>
                     <property name="name">
@@ -60,15 +60,15 @@
                     </property>
                     <widget class="QLabel" row="0" column="0">
                         <property name="name">
-                            <cstring>textLabel3</cstring>
+                            <cstring>textLabel3_2_2</cstring>
                         </property>
                         <property name="text">
-                            <string>&lt;b&gt;Configure if the HP Device Manager will popup on alerts&lt;/b&gt;</string>
+                            <string>&lt;b&gt;Configure the rate at which devices are automaically refreshed&lt;/b&gt;</string>
                         </property>
                     </widget>
                     <widget class="Line" row="1" column="0">
                         <property name="name">
-                            <cstring>line1</cstring>
+                            <cstring>line1_2_2</cstring>
                         </property>
                         <property name="frameShape">
                             <enum>HLine</enum>
@@ -80,17 +80,9 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="2" column="0">
-                        <property name="name">
-                            <cstring>PopupCheckBox</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Popup Device Manager when status alerts occur</string>
-                        </property>
-                    </widget>
                     <spacer row="3" column="0">
                         <property name="name">
-                            <cstring>spacer7</cstring>
+                            <cstring>spacer8</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Vertical</enum>
@@ -100,11 +92,76 @@
                         </property>
                         <property name="sizeHint">
                             <size>
-                                <width>21</width>
-                                <height>171</height>
+                                <width>20</width>
+                                <height>200</height>
                             </size>
                         </property>
                     </spacer>
+                    <widget class="QButtonGroup" row="2" column="0">
+                        <property name="name">
+                            <cstring>CleaningLevel</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Auto refresh rate</string>
+                        </property>
+                        <grid>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <spacer row="0" column="1">
+                                <property name="name">
+                                    <cstring>spacer9_2</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>181</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="QLayoutWidget" row="0" column="0">
+                                <property name="name">
+                                    <cstring>layout7</cstring>
+                                </property>
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="QSpinBox">
+                                        <property name="name">
+                                            <cstring>AutoRefreshRate</cstring>
+                                        </property>
+                                        <property name="wrapping">
+                                            <bool>true</bool>
+                                        </property>
+                                        <property name="buttonSymbols">
+                                            <enum>PlusMinus</enum>
+                                        </property>
+                                        <property name="maxValue">
+                                            <number>360</number>
+                                        </property>
+                                        <property name="minValue">
+                                            <number>5</number>
+                                        </property>
+                                    </widget>
+                                    <widget class="QLabel">
+                                        <property name="name">
+                                            <cstring>textLabel1_3</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>seconds</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                        </grid>
+                    </widget>
                 </grid>
             </widget>
             <widget class="QWidget">
@@ -299,123 +356,6 @@
             </widget>
             <widget class="QWidget">
                 <property name="name">
-                    <cstring>CleaningLevels</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Auto Refresh</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textLabel3_2_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;b&gt;Configure the rate at which devices are automaically refreshed&lt;/b&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="Line" row="1" column="0">
-                        <property name="name">
-                            <cstring>line1_2_2</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <spacer row="3" column="0">
-                        <property name="name">
-                            <cstring>spacer8</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>200</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QButtonGroup" row="2" column="0">
-                        <property name="name">
-                            <cstring>CleaningLevel</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Auto refresh rate</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <spacer row="0" column="1">
-                                <property name="name">
-                                    <cstring>spacer9_2</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>181</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QLayoutWidget" row="0" column="0">
-                                <property name="name">
-                                    <cstring>layout7</cstring>
-                                </property>
-                                <hbox>
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="QSpinBox">
-                                        <property name="name">
-                                            <cstring>AutoRefreshRate</cstring>
-                                        </property>
-                                        <property name="wrapping">
-                                            <bool>true</bool>
-                                        </property>
-                                        <property name="buttonSymbols">
-                                            <enum>PlusMinus</enum>
-                                        </property>
-                                        <property name="maxValue">
-                                            <number>360</number>
-                                        </property>
-                                        <property name="minValue">
-                                            <number>5</number>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>textLabel1_3</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>seconds</string>
-                                        </property>
-                                    </widget>
-                                </hbox>
-                            </widget>
-                        </grid>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
                     <cstring>FunctionCommands</cstring>
                 </property>
                 <attribute name="title">
@@ -714,7 +654,6 @@
     <tabstop>pushButton30</tabstop>
     <tabstop>pushButton32</tabstop>
     <tabstop>pushButton31</tabstop>
-    <tabstop>PopupCheckBox</tabstop>
     <tabstop>EmailAddress</tabstop>
     <tabstop>SMTPServer</tabstop>
     <tabstop>Username</tabstop>
diff --git a/ui/unloadform_base.py b/ui/unloadform_base.py
index d44e7df5f..b8003f720 100644
--- a/ui/unloadform_base.py
+++ b/ui/unloadform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/unloadform_base.ui'
 #
-# Created: Wed Feb 23 13:21:57 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:29 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
diff --git a/ui/waitform_base.py b/ui/waitform_base.py
index 8614b670e..7319e3af7 100644
--- a/ui/waitform_base.py
+++ b/ui/waitform_base.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file '/home/dwelch/linux-imaging-and-printing/src/ui/waitform_base.ui'
 #
-# Created: Tue Jan 25 11:22:49 2005
-#      by: The PyQt User Interface Compiler (pyuic) 3.13
+# Created: Fri Apr 1 14:51:32 2005
+#      by: The PyQt User Interface Compiler (pyuic) 3.14.1
 #
 # WARNING! All changes made in this file will be lost!