Changed layout of drive list and drive buttons

libisoburn/trunk/frontend/xorriso-tcltk

@@ -1205,7 +1205,7 @@ proc refresh_outdev {} {
 # Called when the "Scan for drives button" is hit.
 #
 proc scan_for_drives {} {
-  global .drivelist
+  global .drivelist .drive_drop_both .drive_scan
   global sieve_ret result_list devlist devices_scanned indev_adr outdev_adr
 
   if {[assert_no_changes] == 0} {return ""}
@@ -1242,6 +1242,8 @@ proc scan_for_drives {} {
     }
   }
   set devices_scanned 1
+  set normal_color [.drive_drop_both cget -background]
+  .drive_scan configure -background "$normal_color"
   update idletasks
 
   # Command -devices drops all aquired drives
@@ -3125,7 +3127,14 @@ proc init_drivebox {} {
   pack .drivescroll -in .drivelistbox -side right -fill y 
 
   frame .drive_picker -borderwidth $borderwidth
+  frame .drive_picker_line_1 -borderwidth 0
+  frame .drive_picker_line_2 -borderwidth 0
+  frame .drive_aux_buttons_line_1 -borderwidth 0
+  frame .drive_aux_buttons_line_2 -borderwidth 0
+  frame .drive_aux_buttons -borderwidth 0
+
   button .drive_scan -text "Scan for drives" \
+                     -background "grey" \
                      -command "scan_for_drives"
   bind_help .drive_scan "Scan for drives"
   button .drive_pick_in -text "Pick input drive" \
@@ -3143,17 +3152,26 @@ proc init_drivebox {} {
   button .drive_calm -text "Calm drives" \
                          -command "calm_drives"
   bind_help .drive_calm "Calm drives"
-  button .iso_rollback_button -text "Rollback" -command {iso_rollback}
+  button .iso_rollback_button -text "Rollback" -width 9 \
+                              -command {iso_rollback}
   bind_help .iso_rollback_button "Rollback"
 
-  pack .drive_scan \
+  # One button block left, one right
-       .drive_pick_in .drive_pick_out .drive_pick_both \
+  pack .drive_pick_in .drive_pick_out \
-       .drive_drop_both .drive_calm .iso_rollback_button \
+       -in .drive_picker_line_1 -side left -expand 1 -fill none
-       -in .drive_picker -side left -expand 1 -fill none 
+  pack .drive_pick_both \
-  pack .drive_picker -in .drivebox \
+       -in .drive_picker_line_2 -side left -expand 1 -fill x
-       -side top -expand 1 -fill none
+  pack .drive_picker_line_1 .drive_picker_line_2 \
-  pack .drivelistbox -in .drivebox \
+       -in .drive_picker -side top -expand 1 -fill x -anchor w
-       -side top -expand 1 -fill both
+  pack .drive_scan .drive_drop_both \
+       -in .drive_aux_buttons_line_1 -side left -expand 1 -fill none
+  pack .drive_calm .iso_rollback_button \
+       -in .drive_aux_buttons_line_2 -side left -expand 1 -fill x
+  pack .drive_aux_buttons_line_1 .drive_aux_buttons_line_2 \
+       -in .drive_aux_buttons -side top -expand 1 -fill x -anchor w
+  pack .drive_picker -in .drivebox -side left -expand 0 -fill none
+  pack .drivelistbox -in .drivebox  -side left -expand 1 -fill both
+  pack .drive_aux_buttons -in .drivebox -side left -expand 0 -fill none
 
   bind .drivelist <Double-Button-1> {
     pick_dev
@@ -3691,7 +3709,7 @@ The GUI window is separated into three main areas:
 
 - Click the \"Scan for drives\" button in the middle area.
 - Select a drive and click the \"Pick output drive\" button.
-- If the information field in the \"Output drive or Image\" line begins by
+- If the information field in the \"Output drive or image\" line begins by
   \"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.)
@@ -3699,8 +3717,8 @@ The GUI window is separated into three main areas:
   Either toggle in the address of the hard disk directory,
   or click on the \"/\" button to the right of the text field to get
   a file browser.
-- Hit the Return key or click on a name in the browser to schedule
+- Hit the Return key in the text field or double click on a name in the
-  the disk directory for writing to the medium.
+  browser to schedule the disk directory for writing to the medium.
   (You may of course insert several directories or files that way.)
 - Click the \"Write ISO session\" button in the middle area.
   Confirm in the \"yes/no\" window that pops up.
@@ -3712,9 +3730,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
 
-- Toggle the name of the intended data file in the text field of the
+- Go to the text field beneath \"Output drive or image\" and toggle
-  \"Output drive or image\" line and hit the Return key.
+  the address of the image file. Or click on the \"/\" button to the right
-- If the information field in the \"Output drive or Image\" line begins by
+  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.
+- If the information field in the \"Output drive or 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 !
   You probably do not want this in this special use case.
@@ -3727,15 +3750,15 @@ The GUI window is separated into three main areas:
 
 - Click the \"Scan for drives\" button in the middle area.
 - Select a drive and click the \"Pick output drive\" button.
-- If the information field in the \"Output drive or Image\" line begins by
+- If the information field in the \"Output drive or image\" line begins by
   \"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
   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 click on a name in the browser
+- Hit the Return key in the text field or double click on a name in the
-  to initiate the burn run.
+  browser to initiate the burn run.
   Confirm in the \"yes/no\" window that pops up.
 - When the \"busy\" field displays \"ready\" again, you may click \"Eject\".
   Desktop drives should then put out the tray with the medium.
@@ -3770,14 +3793,14 @@ The GUI window is separated into three main areas:
 - Go to the \"ISO directory:\" line in the lower area.
   Either toggle in the address of the directory you want to extract or
   click the \"/\" button to get a file browser.
-- Hit the Return key or click on a name in the browser to determine
+- Hit the Return key in the text field or double click on a name in the
-  the ISO directory for writing to the medium.
+  browser to determine the ISO directory for writing to the medium.
 - Go to the \"Extract to disk:\" line in the lower area.
   Either toggle in the address of the hard disk directory,
   or click on the \"/\" button to the right of the text field to get
   a file browser.
-- Hit the Return key or click on a name in the browser to initiate the
+- Hit the Return key in the text field or double click on a name in the
-  extraction run.
+  browser to initiate the extraction run.
   If a \"yes/no\" window pops up, consider well whether you are up to
   to shooting your own foot right now.
   Enable the \"Overwrite disk files\" switch only if you are really
@@ -3795,7 +3818,7 @@ Dependencies:
   xorriso, Tcl language, Tk GUI toolkit, optionally Tcl/Tk package BWidget
 
 Copyright (C) 2012, Thomas Schmitt <scdbackup@gmx.net>, libburnia-project.org
-Provided under GNU GPL version 3 or later."
+Provided under GNU GPL version 2 or later."
   }
   if {"$what" == "End"} {
     return \
@@ -3889,7 +3912,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 underneath the button.
+of found optical drives into the box beneath 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.
@@ -3977,7 +4000,7 @@ aquired."
   }
   if {"$what" == "drivelist"} {
     return \
-"The box underneath the \"Scan for drives\" button shows the optical drives
+"The box beneath 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
@@ -4305,10 +4328,11 @@ or cursor movement in the file browser shall bring the selected file
 address into the associated text input field. 
 
 If the switch is disabled, then the address gets written into the field
-only if double clicked.
+only if double clicked, of by button \"Accept\", or by button \"Edit\".
 
 In any case, double clicked addresses get treated as if the Return key
-had been hit in the text field."
+had been hit in the text field. The same happens with the selected item
+and button \"Accept\"."
   }
   if {"$what" == "Refresh avail:"} {
     return \

libisoburn/trunk/xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2012.12.31.100509"
+#define Xorriso_timestamP "2012.12.31.120152"