From 9cc07b6170acbf94b287db777a73dc116b545435 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 3 Jan 2013 18:57:08 +0000
Subject: [PATCH] Moved and renamed the "Refresh avail:" button

---
 frontend/xorriso-tcltk      | 44 ++++++++++++++++++-------------------
 xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/frontend/xorriso-tcltk b/frontend/xorriso-tcltk
index 49e4f32c..9417fd93 100755
--- a/frontend/xorriso-tcltk
+++ b/frontend/xorriso-tcltk
@@ -1919,7 +1919,7 @@ proc iso_rollback {} {
 
 # Inquire an accurate prediction of free space after writing a session with
 # the pending changes of the ISO image.
-# Called when button "Avail:" is hit.
+# Called when button "Refresh avail:" is hit.
 #
 proc refresh_avail {} {
   global result_list highest_cmd_sev
@@ -3678,21 +3678,12 @@ proc init_isomanip {} {
   create_browser_button .isomanip_move_target_button \
                       "isomanip_move_target" "isofs" "Browse ISO (move target)"
 
-  button .avail_button -text "Avail:" \
-                             -command {refresh_avail}
-  bind_help .avail_button "Avail:"
-  frame .avail_label_frame -relief ridge -borderwidth 2
-  label .avail_label -width 10 -text ""
-  bind_help .avail_label "Avail:"
-  pack .avail_label -in .avail_label_frame
-
   pack .isomanip_prefix .isomanip_verify_button .isomanip_rm_r_button \
        .isomanip_move_button .isomanip_move_target \
        -in .isomanip_move -side left -expand 1 -fill both
   pack .isomanip_move_target_button -in .isomanip_move -side left
   pack .isomanip_mkdir_button \
        -in .isomanip_move -side left -expand 1 -fill both
-  pack .avail_label_frame .avail_button -in .isomanip_move -side right
   pack .isomanip_move \
        -in .isomanip -side top -expand 1 -fill both
 }
@@ -3702,15 +3693,15 @@ proc init_isomanip {} {
 #
 proc init_localfs {} {
   global borderwidth
-  global .localfs .extract_frame .localfs_aux_frame .insert_frame
+  global .localfs .extract_frame .aux_control_frame .insert_frame
 
   frame .localfs -borderwidth $borderwidth
 
   init_extract
-  init_localfs_aux
+  init_aux_control
   init_insert
 
-  pack .extract_frame .localfs_aux_frame .insert_frame \
+  pack .extract_frame .aux_control_frame .insert_frame \
        -in .localfs -side top -expand 1 -fill both
 }
 
@@ -3756,12 +3747,12 @@ proc init_extract {} {
 
 # Some controls which apply to insertion, extraction, or both.
 #
-proc init_localfs_aux {} {
+proc init_aux_control {} {
   global borderwidth have_bwidget permission_policy
-  global .localfs_aux_frame
+  global .aux_control_frame
   global .overwrite_iso_files_button .overwrite_dir_button .extract_auto_chmod
 
-  frame .localfs_aux_frame -borderwidth 0
+  frame .aux_control_frame -borderwidth 0
 
   menubutton .overwriting -text "Overwriting:" -width 16 -anchor w \
                           -direction above -relief ridge -indicatoron 1 \
@@ -3791,7 +3782,7 @@ proc init_localfs_aux {} {
                      -variable extract_auto_chmod \
                      -onvalue 1 -offvalue 0
 
-  pack .overwriting -in .localfs_aux_frame -side left
+  pack .overwriting -in .aux_control_frame -side left
 
   if {$have_bwidget == 1} {
     checkbutton .browse_select_is_setvar -text "File browser text field" \
@@ -3800,7 +3791,7 @@ proc init_localfs_aux {} {
                                         -variable "browse_select_is_setvar" \
                                         -onvalue 1 -offvalue 0
     bind_help .browse_select_is_setvar "File browser text field"
-    pack .browse_select_is_setvar -in .localfs_aux_frame -side left
+    pack .browse_select_is_setvar -in .aux_control_frame -side left
   }
 
   menubutton .perm_policy -text "Permissions: as is" -width 22 -anchor w \
@@ -3817,9 +3808,18 @@ proc init_localfs_aux {} {
   $m add radiobutton -label "mkisofs -r" -value "mkisofs_r" \
                     -variable permission_policy -command show_permission_policy
   show_permission_policy
-
   bind_help .perm_policy "Permissions:"
-  pack .perm_policy -in .localfs_aux_frame -side right
+
+  button .avail_button -text "Refresh avail:" \
+                             -command {refresh_avail}
+  bind_help .avail_button "Refresh avail:"
+  frame .avail_label_frame -relief ridge -borderwidth 2
+  label .avail_label -width 10 -text ""
+  bind_help .avail_label "Refresh avail:"
+  pack .avail_label -in .avail_label_frame
+
+  pack .avail_label_frame .avail_button .perm_policy \
+       -in .aux_control_frame -side right
 }
 
 
@@ -4671,9 +4671,9 @@ If there is any x-permission, then all three x get granted. s- and t-bits
 get removed.
 "
   }
-  if {$what == "Avail:"} {
+  if {$what == "Refresh avail:"} {
     return \
-"The \"Avail:\" button triggers command -tell_media_space. It makes
+"The \"Refresh avail:\" button triggers command -tell_media_space. It makes
 a time consuming exact prediction of the free space on the medium in the
 output drive. For this purpose, the size of an ISO session with the pending
 changes is computed.
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index b361ec51..71516ab8 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2013.01.03.182504"
+#define Xorriso_timestamP "2013.01.03.185545"