diff options
-rw-r--r-- | README.md | 9 | ||||
-rwxr-xr-x | lib/isodumper.py | 16 | ||||
-rw-r--r-- | share/isodumper/isodumper.glade | 8 |
3 files changed, 18 insertions, 15 deletions
@@ -1,7 +1,8 @@ isodumper ========= -A tool for writing ISO images on a USB stick. It's a fork of usb-imagewriter. +A tool for writing ISO images on a USB stick. It's a fork of usb-imagewriter. +We added also a formatting feature and a backup of USB device content. Requirements @@ -22,11 +23,7 @@ License -------- This software is distributed under the terms of the -[GNU General Public License version 2 (GPLv2+)](COPYING.GPL). - -The [isodumper icon](isodumper.svg) is licensed under the terms of the -[GNU Lesser General Public License version 2.1 (LGPLv2.1+)](COPYING.LGPL). -It is part of the Crystal Clear icon set by Everaldo Coelho. +[GNU Public License, v2](COPYING) Authors diff --git a/lib/isodumper.py b/lib/isodumper.py index d2a4629..bec50ca 100755 --- a/lib/isodumper.py +++ b/lib/isodumper.py @@ -73,7 +73,7 @@ class IsoDumper: # get glade tree self.gladefile = "/usr/share/isodumper/isodumper.glade" - self.gladefile = "/documents/isodumper-dev/share/isodumper/isodumper.glade" + #self.gladefile = "/documents/isodumper-dev/share/isodumper/isodumper.glade" self.wTree = gtk.glade.XML(self.gladefile) # get globally needed widgets @@ -109,7 +109,8 @@ class IsoDumper: # set callbacks - dict = { "on_main_dialog_destroy" : self.close, + dict = { "on_main_dialog_destroy_event" : self.confirm_close, + "on_main_dialog_delete_event" : self.confirm_close, "on_cancel_button_clicked" : self.confirm_close, "on_emergency_button_clicked" : self.restore, "on_success_button_clicked" : self.close, @@ -177,8 +178,11 @@ class IsoDumper: # Add .iso if not specified if not exit_dialog.lower().endswith('.iso'): exit_dialog=exit_dialog+".iso" - self.backup_select.set_label(exit_dialog) + head, tail = os.path.split(exit_dialog) + self.backup_select.set_label(tail) self.backup_button.set_sensitive(True) + self.backup_select.set_tooltip_text(exit_dialog) + self.logger(_('Backup in: ')+ exit_dialog) expander = self.wTree.get_widget("detail_expander") expander.set_sensitive(True) self.choose.hide() @@ -285,6 +289,8 @@ class IsoDumper: combo.set_sensitive(False) format_button=self.wTree.get_widget("format_button") format_button.set_sensitive(False) + backup_select=self.wTree.get_widget("backup_select") + backup_select.set_sensitive(False) source = self.chooser.get_filename() target = self.dev.split('(')[1].split(')')[0] dialog = self.wTree.get_widget("confirm_dialog") @@ -427,7 +433,7 @@ class IsoDumper: dialog.hide() - def confirm_close(self, widget): + def confirm_close(self, widget, *args): if self.operation==False: # no writing , backup nor format running self.close('dummy') else: # writing , backup or format running @@ -437,8 +443,10 @@ class IsoDumper: self.close('dummy') else: dialog.hide() + return True def emergency(self): + self.operation=False self.final_unsensitive() dialog = self.wTree.get_widget("emergency_dialog") expander = self.wTree.get_widget("detail_expander") diff --git a/share/isodumper/isodumper.glade b/share/isodumper/isodumper.glade index 8d2c7b4..9c465b0 100644 --- a/share/isodumper/isodumper.glade +++ b/share/isodumper/isodumper.glade @@ -12,8 +12,8 @@ <property name="skip_taskbar_hint">True</property> <property name="message_type">warning</property> <property name="buttons">ok-cancel</property> - <property name="text" translatable="yes">Writing is in progress. Exiting will occur that the device will be unusable. -Are you sure you want to quit during writing on the device?</property> + <property name="text" translatable="yes">Writing is in progress. Exiting during writing will occur that the device or the backup will be unusable. +Are you sure you want to quit during writing?</property> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox"> <property name="visible">True</property> @@ -913,7 +913,6 @@ Public License instead of this License. <property name="window_position">center-always</property> <property name="icon_name">isodumper</property> <property name="type_hint">dialog</property> - <property name="deletable">False</property> <signal name="delete_event" handler="on_main_dialog_delete_event"/> <child> <widget class="GtkVBox" id="vbox2"> @@ -1601,8 +1600,7 @@ Public License instead of this License. <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes"><b>Success</b> - The image was successfully written to the - target device. + The operation was successfully performed. You are free to unplug it now, a log isodumper.log of the operation will be saved in your homedir/.isodumper/ when |