Changeset 90

Timestamp:

15/04/07 00:57:06 (5 years ago)

Author:

andy

Message:

Added Josh Baraban's no-nautilusburn patches for testing, also updated the years of copyright

Location:

trunk/src/pybackpack

Files:

• gui.py (modified) (3 diffs)
• seteditor.py (modified) (2 diffs)
• version.py (modified) (1 diff)

trunk/src/pybackpack/gui.py

@@ -10 +10 @@
 import subprocess
 import time
-import nautilusburn
+try:
+        import nautilusburn
+except ImportError:
+        pass
+else:
+        pass
 import traceback
 
@@ -177 +182 @@
                         _("%(time)s: Starting backup of '%(backupname)s' to CD\n") % {'time':time.ctime(), 'backupname':set['name']})
                 # do we have a burner to use?
+                try:
+                        nautilusburn
+                except ImportError:
+                        error_string = _("No CD burner available, because you don't have the python module nautilusburn.")
+                        self.widgets.get_widget('lbl_backup_burner').set_text(error_string)
+                        self.widgets.get_widget('cmb_backup_burner').set_sensitive(False)
+
                 if self.widgets.get_widget('cmb_backup_burner').get_active() == -1:
                         ErrorDialog(_("There are no CD burners attached to this system."), self.widgets.get_widget('window_main'))
@@ -892 +904 @@
                 """Uses nautilusburn to detect CD burners and populate comboboxes"""
 
-                sel = nautilusburn.DriveSelection()
-                self.widgets.get_widget('cmb_backup_burner').set_model(sel.get_model())
-                if len(sel.get_model()) == 0:
-                        error_string = _("No CD burners were detected on your system.")
+                try:
+                        nautilusburn
+                except ImportError:
+                        error_string = _("No CD burners available, because you do not have the python module nautilusburn.")
                         self.widgets.get_widget('lbl_backup_burner').set_text(error_string)
                         self.widgets.get_widget('cmb_backup_burner').set_sensitive(False)
                 else:
-                        msg_string = _("Select which CD burner to use:")
-                        self.widgets.get_widget('lbl_backup_burner').set_text(msg_string)
-                        self.widgets.get_widget('cmb_backup_burner').set_active(0)
-                        self.widgets.get_widget('cmb_backup_burner').set_sensitive(True)
+                        sel = nautilusburn.DriveSelection()
+                        self.widgets.get_widget('cmb_backup_burner').set_model(sel.get_model())
+                        if len(sel.get_model()) == 0:
+                                error_string = _("No CD burners were detected on your system.")
+                                self.widgets.get_widget('lbl_backup_burner').set_text(error_string)
+                                self.widgets.get_widget('cmb_backup_burner').set_sensitive(False)
+                        else:
+                                msg_string = _("Select which CD burner to use:")
+                                self.widgets.get_widget('lbl_backup_burner').set_text(msg_string)
+                                self.widgets.get_widget('cmb_backup_burner').set_active(0)
+                                self.widgets.get_widget('cmb_backup_burner').set_sensitive(True)
                         
         def refresh_set_list(self, set_sel=None):

trunk/src/pybackpack/seteditor.py

@@ -5 +5 @@
 import gtk.glade
 import gobject
-import nautilusburn
+try:
+        import nautilusburn
+except ImportError:
+        pass
+else:
+        pass
 
 import version
@@ -348 +353 @@
 
         """ Populate a combo box with the names of available CD/DVD drives """
-
-        sel = nautilusburn.DriveSelection()
-        self.widgets.get_widget('cmb_dst_burner').set_model(sel.get_model())
-
-        if len(sel.get_model()) == 0:
-            error_string = _("No CD burners were detected on your system.")
+        try:
+            nautilusburn
+        except ImportError:
+            error_string = _("No CD burners available, because you do not have the python module \
+nautilusburn.")
             self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
             self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
         else:
-            msg_string = _("Select which CD burner to use:")
-            self.widgets.get_widget('lbl_cd_burner').set_text(msg_string)
-            self.widgets.get_widget('cmb_dst_burner').set_active(0)
-            self.widgets.get_widget('cmb_dst_burner').set_sensitive(True)
-
+            sel = nautilusburn.DriveSelection()
+            self.widgets.get_widget('cmb_dst_burner').set_model(sel.get_model())
+
+            if len(sel.get_model()) == 0:
+                error_string = _("No CD burners were detected on your system.")
+                self.widgets.get_widget('lbl_cd_burner').set_text(error_string)
+                self.widgets.get_widget('cmb_dst_burner').set_sensitive(False)
+            else:
+                msg_string = _("Select which CD burner to use:")
+                self.widgets.get_widget('lbl_cd_burner').set_text(msg_string)
+                self.widgets.get_widget('cmb_dst_burner').set_active(0)
+                self.widgets.get_widget('cmb_dst_burner').set_sensitive(True)
+

trunk/src/pybackpack/version.py

@@ -4 +4 @@
 APPPATH = "pybackpack" # used for accessing files (eg. ~/.pybackpack)
 AUTHORS = ["Andy Price <andy@andrewprice.me.uk>", "Dave Arter <davea@sucs.org>", "Logo by Graham Cole <chckens@sucs.org>"]
-COPYRIGHT = "Copyright (c) 2006 Andy Price, 2005-2006 Dave Arter"
+COPYRIGHT = "Copyright (c) 2006-2007 Andy Price, 2005-2006 Dave Arter"
 ABOUT = ("%s " % APPNAME) + _("is a tool for backing up user data for the GNOME Desktop")