Small adjustments in xorriso-tcltk

This commit is contained in:
Thomas Schmitt 2013-01-06 15:41:23 +00:00
parent 293fb55909
commit 048c7dee5a
2 changed files with 18 additions and 11 deletions

View File

@ -1773,16 +1773,20 @@ proc isomanip_rm_r {} {
# Called when the "Blank" button is hit. # Called when the "Blank" button is hit.
# #
proc burn_blank {} { proc burn_blank {} {
global outdev_adr outdev_profile global outdev_profile eff_outdev_adr eff_indev_adr
refresh_outdev
if {[assert_outdev blanking] <= 0} {return ""} if {[assert_outdev blanking] <= 0} {return ""}
if {$eff_outdev_adr == $eff_indev_adr} {
if {[assert_no_changes] <= 0} {return ""}
}
set victim "medium in" set victim "medium in"
if {[string first "stdio" $outdev_profile] == 0} { if {[string first "stdio" $outdev_profile] == 0} {
set victim "image file" set victim "image file"
} }
if {[window_yesno \ if {[window_yesno \
"Really blank the $victim [make_text_shellsafe $outdev_adr] ?"] \ "Really blank the $victim [make_text_shellsafe $eff_outdev_adr] ?"] \
!= 1} { return "" } != 1} { return "" }
reset_highest_cmd_sev reset_highest_cmd_sev
send_loggable_cmd "-blank as_needed" send_loggable_cmd "-blank as_needed"
@ -1795,16 +1799,20 @@ proc burn_blank {} {
# Called when the "Format" button is hit. # Called when the "Format" button is hit.
# #
proc burn_format {} { proc burn_format {} {
global outdev_adr outdev_profile global outdev_profile eff_outdev_adr eff_indev_adr
refresh_outdev
if {[assert_outdev formatting] <= 0} {return ""} if {[assert_outdev formatting] <= 0} {return ""}
if {$eff_outdev_adr == $eff_indev_adr} {
if {[assert_no_changes] <= 0} {return ""}
}
if {[string first "stdio" $outdev_profile] == 0} { if {[string first "stdio" $outdev_profile] == 0} {
xorriso_tcltk_errmsg \ xorriso_tcltk_errmsg \
"xorriso-tcltk : SORRY : Image files cannot be formatted" "xorriso-tcltk : SORRY : Image files cannot be formatted"
return "" return ""
} }
if {[window_yesno "Really format the medium in $outdev_adr ?"] \ if {[window_yesno "Really format the medium in $eff_outdev_adr ?"] \
!= 1} { return "" } != 1} { return "" }
reset_highest_cmd_sev reset_highest_cmd_sev
@ -2183,7 +2191,7 @@ proc extract_to {} {
if {$osirrox_allowed != 1} { if {$osirrox_allowed != 1} {
xorriso_tcltk_errmsg \ xorriso_tcltk_errmsg \
"xorriso-tcltk : SORRY : Extraction from ISO to hard disk is irrevocably banned." "xorriso-tcltk : SORRY : Extraction from ISO to hard disk is already irrevocably banned."
return "" return ""
} }
@ -2311,9 +2319,10 @@ proc end_xorriso {} {
# Called by procedures which are about to use the output drive. # Called by procedures which are about to use the output drive.
# #
proc assert_outdev {purpose} { proc assert_outdev {purpose} {
global outdev_adr global eff_outdev_adr
if {$outdev_adr == ""} { inquire_dev
if {$eff_outdev_adr == ""} {
xorriso_tcltk_errmsg \ xorriso_tcltk_errmsg \
"xorriso-tcltk : SORRY : You must choose an output drive before $purpose" "xorriso-tcltk : SORRY : You must choose an output drive before $purpose"
return "0" return "0"
@ -5153,9 +5162,7 @@ this feature on startup."
This removes the affected files and directory trees from the ISO model. This removes the affected files and directory trees from the ISO model.
They will not show up in the directory tree of the next session that They will not show up in the directory tree of the next session that
is written via \"Write ISO session\". Nevertheless they will stay present is written via \"Write ISO session\". Nevertheless they will stay present
in earlier sessions if they were not freshly inserted after loading the in earlier sessions beginning from the session where they were inserted."
ISO model from the input drive.
"
} }
if {$what == "Move to:"} { if {$what == "Move to:"} {
return \ return \

View File

@ -1 +1 @@
#define Xorriso_timestamP "2013.01.06.102339" #define Xorriso_timestamP "2013.01.06.154027"