From 978827abf343bc8329f2fcbd0e2e0dbe3717869f Mon Sep 17 00:00:00 2001
From: papoteur-mga <yves.brungard_git@gadz.org>
Date: Sun, 6 Jul 2014 10:35:40 +0200
Subject: Supressed the closing cross in the main window graying "format"
 option when writing Enabling expander when formating.

---
 lib/isodumper.py                |  8 +++++---
 share/isodumper/isodumper.glade | 14 ++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/isodumper.py b/lib/isodumper.py
index edffd71..61e8b6f 100755
--- a/lib/isodumper.py
+++ b/lib/isodumper.py
@@ -73,7 +73,6 @@ class IsoDumper:
 
         # get glade tree
         self.gladefile = "/usr/share/isodumper/isodumper.glade"
-        #self.gladefile = "/documents/isodumper-dev/share/isodumper/isodumper.glade"
         self.wTree = gtk.glade.XML(self.gladefile)
 
         # get globally needed widgets
@@ -127,7 +126,6 @@ class IsoDumper:
                  "on_format_cancel_clicked" : self.format_cancel,
                  "on_format_go_clicked" : self.do_format,
                  "on_write_button_clicked" : self.do_write,
-                 "on_main_dialog_delete_event" : gtk.main_quit,
                  }
         self.wTree.signal_autoconnect(dict)
 
@@ -201,6 +199,8 @@ class IsoDumper:
     def do_format(self, widget)            :
         target = self.dev.split('(')[1].split(')')[0]
         dialog = self.wTree.get_widget("confirm_dialog")
+        expander = self.wTree.get_widget("detail_expander")
+        expander.set_sensitive(True)
         resp = dialog.run()
         dev_name=self.wTree.get_widget("format_name").get_text()
         if resp:
@@ -280,6 +280,8 @@ class IsoDumper:
         write_button.set_sensitive(False)
         combo = self.wTree.get_widget("device_combobox")
         combo.set_sensitive(False)
+        format_button=self.wTree.get_widget("format_button")
+        format_button.set_sensitive(False)
         source = self.chooser.get_filename()
         target = self.dev.split('(')[1].split(')')[0]
         dialog = self.wTree.get_widget("confirm_dialog")
@@ -425,7 +427,7 @@ class IsoDumper:
     def confirm_close(self, widget):
         if self.operation==False:    # no writing , backup nor format running
             self.close('dummy')
-        else:   # writing , backup nor format running
+        else:   # writing , backup or format running
             dialog=self.wTree.get_widget("Quit_warning")
             resp = dialog.run()
             if resp==-5 :   # GTK_RESPONSE_OK
diff --git a/share/isodumper/isodumper.glade b/share/isodumper/isodumper.glade
index b63a158..fb1d6f0 100644
--- a/share/isodumper/isodumper.glade
+++ b/share/isodumper/isodumper.glade
@@ -5,9 +5,6 @@
   <widget class="GtkMessageDialog" id="Quit_warning">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">IsoDumper</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon_name">isodumper</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
@@ -452,9 +449,8 @@ Public License instead of this License.
     <property name="can_focus">False</property>
     <property name="no_show_all">True</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">IsoDumper</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon_name">isodumper</property>
+    <property name="title" translatable="yes">Isodumper</property>
+    <property name="icon">isodumper</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox6">
@@ -703,7 +699,7 @@ Public License instead of this License.
  Something went wrong, please see the details
  window for the exact error.
 
- The application will be closed with this window, and a logfile
+The application will be closed with this window, and a logfile
  isodumper.log  will be saved in your homedir/.isodumper </property>
                 <property name="use_markup">True</property>
               </widget>
@@ -726,9 +722,6 @@ Public License instead of this License.
   <widget class="GtkDialog" id="format">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">IsoDumper</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon_name">isodumper</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox8">
@@ -913,6 +906,7 @@ 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" swapped="no"/>
     <child>
       <widget class="GtkVBox" id="vbox2">
-- 
cgit v1.2.1