From 88c4571160bb4a811e5f663d7a14b58a14e9d57a Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 6 Jan 2013 20:59:35 +0000 Subject: [PATCH] Promoted drive line labels to buttons --- frontend/xorriso-tcltk | 64 +++++++++++++++++++++---------------- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/frontend/xorriso-tcltk b/frontend/xorriso-tcltk index 0bdb3567..d27273f1 100755 --- a/frontend/xorriso-tcltk +++ b/frontend/xorriso-tcltk @@ -3845,9 +3845,12 @@ proc init_indev {} { button .indev_eject -text "Eject" -command {eject_indev} bind_help .indev_eject "Eject (indev)" - label .indev_label -width 16 -text "Input drive/image " + + button .indev_label -width 16 -text "Input drive/image " \ + -command {indev_return} + bind_help .indev_label "Input drive/image" - entry .indev_entry -width 36 -relief sunken -bd 1 \ + entry .indev_entry -width 34 -relief sunken -bd 1 \ -textvariable indev_adr bind_entry_keys .indev_entry {indev_return} @@ -3875,9 +3878,12 @@ proc init_outdev {} { button .outdev_eject -text "Eject" -command {eject_outdev} bind_help .outdev_eject "Eject (outdev)" - label .outdev_label -width 16 -text "Output drive/image" + + button .outdev_label -width 16 -text "Output drive/image" \ + -command {outdev_return} + bind_help .outdev_label "Output drive/image" - entry .outdev_entry -width 36 -relief sunken -bd 1 \ + entry .outdev_entry -width 34 -relief sunken -bd 1 \ -textvariable outdev_adr bind_entry_keys .outdev_entry {outdev_return} bind_help .outdev_entry "Output drive/image" @@ -4397,13 +4403,14 @@ The GUI window is separated into three main areas: Write a directory as only content to an ISO image data file on hard disk -- Go to the text field beneath \"Output drive/image\" and toggle - the address of the image file. Or click on the \"/\" button to the right - of the field to get a file browser. +- Go to the text field beside the \"Output drive/image\" button and toggle + the address of the image file. Click the button or hit the Return key + when the address is complete. + Or click on the \"/\" button to the right of the field to get a file browser. - You may click on a name in the browser and bring it into the text field by button \"Edit\". - When the intended file address is composed, hit the Return key in the - text field. + text field or click the \"Output drive/image\" button. - If the information field in the \"Output drive/image\" line begins by \"appendable\" or \"closed\" then you addressed an existing data file. Warning: Applying the \"Blank\" button to it would damage its content ! @@ -4421,7 +4428,7 @@ The GUI window is separated into three main areas: \"appendable\" or \"closed\" and if the medium is CD-RW, DVD-RW, DVD+RW, or BD-RE then click the \"Blank\" button to erase the old data. (Blanking of \"DVD-RW sequential recording\" will last very long.) -- Go to the text field beneath the \"Burn image file:\" button and toggle +- Go to the text field beside the \"Burn image file:\" button and toggle the address of the image file. Or click on the \"/\" button to the right of the field to get a file browser. - Hit the Return key in the text field or double click on a name in the @@ -4437,7 +4444,8 @@ The GUI window is separated into three main areas: - Like above, \"Scan for drives\" but click button \"Pick drive for both roles\" in order to load the directory tree of the existing ISO filesystem. For an ISO image data file, bring its name into the input fields of both - lines \"Input drive/image\" and \"Output drive/image\". + lines \"Input drive/image\" and \"Output drive/image\" and activate it + by clicking both buttons or hitting the Return key in both fields. You should now see in both info fields texts which begin by \"appendable\". - Go to the \"Insert from disk:\" line in the lower area. Use the means described in the first use case to add more directories or @@ -4606,7 +4614,7 @@ since last time the \"Clear\" button was hit. It will not clear automatically." if {$what == "Scan for drives"} { return \ "The \"Scan for drives\" button executes command -devices and puts the list -of found optical drives into the box beneath the button. +of found optical drives into the box beside the button. Scanning should be done before any ISO image manipulations because xorriso has to give up its aquired drives in order to perform the scan run. @@ -4634,7 +4642,7 @@ model of xorriso. If there is a valid ISO filesystem in the input drive then its directory tree gets loaded underneath that model root directory. The input drive may also be a data file on hard disk if that file contains -an ISO 9660 filesystem image. See field \"Input drive/image\"." +an ISO 9660 filesystem image. See the \"Input drive/image\" button." } if {$what == "Pick output drive"} { return \ @@ -4669,9 +4677,9 @@ an eventual ISO image, allows to manipulate it by insertion, deletion, and renaming. When this is done, the changes get written to the drive via button \"Write ISO session\". -The drive may also be a data file on hard disk. -See fields \"Input drive/image\" and \"Output drive/image\". -It is considered appendable if it contains an ISO 9660 filesystem image. +The drive may also be a data file on hard disk. See the fields beside +the \"Input drive/image\" and \"Output drive/image\" buttons. +A file is considered appendable if it contains an ISO 9660 filesystem image. It is considered blank if it is empty or marked as blank by button \"Blank\". It is considered closed if it contains other data." } @@ -4694,7 +4702,7 @@ aquired." } if {$what == "drivelist"} { return \ -"The box beneath the \"Scan for drives\" button shows the optical drives +"The box beside the \"Scan for drives\" button shows the optical drives which were found by the most recent scan run. A double-click on a drive item has the same effect as button @@ -4703,9 +4711,10 @@ A double-click on a drive item has the same effect as button } if {$what == "Input drive/image"} { return \ -"The \"Input drive/image\" field displays the address of the input drive. -Editing the drive address and pressing the Return key causes the execution -of command -indev with the field content as drive address. +"The field beside the \"Input drive/image\" button displays the address of +the input drive. You may edit this field. +Clicking the button or pressing the Return key causes the execution of +command -indev with the field content as drive address. Use this to load the model from an ISO image data file on hard disk. It is of course permissible that input image and output image are the @@ -4714,19 +4723,20 @@ same file. } if {$what == "input drive info"} { return \ -"The text field beneath the \"Input drive/image\" field displays the medium +"The text beside the \"Input drive/image\" field displays the medium status of the input drive. It tells about the writability, the medium type, the number of ISO sessions, and the amount of readable data." } if {$what == "Eject (indev)"} { return \ -"The \"Eject\" button beneath the \"Input drive/image\" field excutes +"The \"Eject\" button beside the \"Input drive/image\" button excutes command -eject \"in\"." } if {$what == "Output drive/image"} { return \ -"The \"Output drive/image\" field displays the address of the output drive. -Editing the drive address and pressing the Return key causes the execution +"The field beside the \"Output drive/image\" button displays the address +of the output drive. You may edit this field. +Clicking the button or pressing the Return key causes the execution of command -outdev with the field content as drive address. Use this to direct writing to an ISO image data file on hard disk. @@ -4736,13 +4746,13 @@ same file. } if {$what == "output drive info"} { return \ -"The text beneath the \"Output drive/image\" field displays the medium +"The text beside the \"Output drive/image\" field displays the medium status of the output drive. It tells about the writability, the medium type, the number of ISO sessions, and the amount of free space." } if {$what == "Eject (outdev)"} { return \ -"The \"Eject\" button beneath the \"Output drive/image\" field excutes +"The \"Eject\" button beside the \"Output drive/image\" button excutes command -eject \"out\"." } if {$what == "Blank"} { @@ -4886,14 +4896,14 @@ browser to select a target address in the hard disk filesystem. } if {$what == "Browse disk (burn image)"} { return \ -"The \"/\" button beneath the \"Burn image file\" field pops up a file +"The \"/\" button beside the \"Burn image file\" field pops up a file tree browser to select a source address in the hard disk filesystem. [tell_file_browser_help 1]" } if {$what == "Browse disk (insert)"} { return \ -"The \"/\" button beneath the \"Insert from disk\" field pops up a file +"The \"/\" button beside the \"Insert from disk\" field pops up a file tree browser to select a source address in the hard disk filesystem. [tell_file_browser_help 1]" diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index c2039c85..87ecc453 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2013.01.06.194655" +#define Xorriso_timestamP "2013.01.06.205810"