Removed the ""File browser text field" switch

This commit is contained in:
Thomas Schmitt 2013-01-06 17:45:57 +00:00
parent 96b599470b
commit 1c59b20844
2 changed files with 13 additions and 55 deletions

View File

@ -1171,9 +1171,6 @@ set browse_iso_window_geometry ""
# Whether the window is grabbed # Whether the window is grabbed
set browse_iso_window_is_grabbed 0 set browse_iso_window_is_grabbed 0
# Whether to bring the selected browser item directly into the text field
set browse_select_is_setvar 0
# Whether to modify the ISO file permissions before writing the ISO session # Whether to modify the ISO file permissions before writing the ISO session
# Policies: as_is , readable , readonly , mkisofs_r # Policies: as_is , readable , readonly , mkisofs_r
set permission_policy "as_is" set permission_policy "as_is"
@ -2462,26 +2459,24 @@ proc browse_tree_fill_dir {tr parent children} {
foreach i $children { foreach i $children {
set name [string range $i 2 end] set name [string range $i 2 end]
# >>> Escape $|^!
set adr [combine_dir_and_name $parent $name] set adr [combine_dir_and_name $parent $name]
$tr insert end $parent_name $adr -text $name $tr insert end $parent_name $adr -text $name
if {[string range $i 0 0] == "d"} { if {[string range $i 0 0] == "d"} {
set dir_dummy [combine_dir_and_name $adr "_"] set dir_dummy [combine_dir_and_name $adr "_"]
$tr insert end $adr $dir_dummy -text " "
# <<<
catch {
# >>> Fails if the path contains $|^!
$tr insert end $adr $dir_dummy -text " "
}
} }
} }
} }
# The command to be executed when the user selects a node.
#
proc browse_tree_select {adr_var_name tr selected} {
global browse_select_is_setvar
if {$browse_select_is_setvar == 0} {return ""}
browse_tree_accept $adr_var_name 0 $tr $selected
}
# The command to be executed when the user double-clicks a node. # The command to be executed when the user double-clicks a node.
# #
proc browse_tree_accept {adr_var_name do_return tr selected} { proc browse_tree_accept {adr_var_name do_return tr selected} {
@ -2515,7 +2510,7 @@ proc browse_tree_accept {adr_var_name do_return tr selected} {
} }
if {$adr_var_name == "isodir_adr"} { if {$adr_var_name == "isodir_adr"} {
set isodir_adr $value set isodir_adr $value
if {$do_return == 1} {isodir_return "browse_tree_select"} if {$do_return == 1} {isodir_return "browse_tree_accept"}
} }
if {$adr_var_name == "isomanip_move_target"} { if {$adr_var_name == "isomanip_move_target"} {
set isomanip_move_target $value set isomanip_move_target $value
@ -2864,7 +2859,6 @@ proc browse_tree {adr_var which_fs} {
Tree $w.tree -width $tree_window_width -height $tree_window_lines \ Tree $w.tree -width $tree_window_width -height $tree_window_lines \
-opencmd "$open_dir_cmd $w.tree" \ -opencmd "$open_dir_cmd $w.tree" \
-closecmd "browse_tree_close_dir $w.tree" \ -closecmd "browse_tree_close_dir $w.tree" \
-selectcommand "browse_tree_select $adr_var" \
-selectfill 1 \ -selectfill 1 \
-yscrollcommand "browse_tree_yscrollcommand $w" \ -yscrollcommand "browse_tree_yscrollcommand $w" \
-xscrollcommand "$w.treescroll_x set" -xscrollcommand "$w.treescroll_x set"
@ -4142,16 +4136,6 @@ proc init_aux_control {} {
pack .overwriting -in .aux_control_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" \
-indicatoron 1 -selectcolor "" \
-relief ridge -borderwidth 2 \
-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 .aux_control_frame -side left
}
menubutton .perm_policy -text "Permissions: as is" -width 22 -anchor w \ menubutton .perm_policy -text "Permissions: as is" -width 22 -anchor w \
-direction above -relief ridge -indicatoron 1 \ -direction above -relief ridge -indicatoron 1 \
-menu .perm_policy.menu -menu .perm_policy.menu
@ -4172,7 +4156,7 @@ proc init_aux_control {} {
-command {refresh_avail} -command {refresh_avail}
bind_help .avail_button "Refresh avail:" bind_help .avail_button "Refresh avail:"
frame .avail_label_frame -relief ridge -borderwidth 2 frame .avail_label_frame -relief ridge -borderwidth 2
label .avail_label -width 10 -text "" label .avail_label -width 12 -text ""
bind_help .avail_label "Refresh avail:" bind_help .avail_label "Refresh avail:"
pack .avail_label -in .avail_label_frame pack .avail_label -in .avail_label_frame
@ -4879,10 +4863,7 @@ It works as if the item had been double clicked."
from the file browser tree into the associated text field. from the file browser tree into the associated text field.
It does not hit the Return key of the field, but gives you the opportunity It does not hit the Return key of the field, but gives you the opportunity
to edit the file address. to edit the file address."
(This is done automatically with every selection if the switch
\"File browser text field\" is enabled.)"
} }
if {$what == "Browse disk (extract)"} { if {$what == "Browse disk (extract)"} {
return \ return \
@ -5016,19 +4997,6 @@ Option \"sort_lba_on\" reduces head-moves of optical drives and thus can
speed up extraction substantially. It is bound to \"auto_chmod_on\" because speed up extraction substantially. It is bound to \"auto_chmod_on\" because
else it might get into trouble when restoring ISO directories which offer else it might get into trouble when restoring ISO directories which offer
no w-permission." no w-permission."
}
if {$what == "File browser text field"} {
return \
"The \"File browser text field\" switch controls whether a single click
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, 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. The same happens with the selected item
and button \"Accept\"."
} }
if {$what == "Permissions:"} { if {$what == "Permissions:"} {
return \ return \
@ -5303,16 +5271,6 @@ The \"Down\" button works like clicking the \"+\" node of the selected item.\n"
The \"Help\" button displays this help text window. The \"Help\" button displays this help text window.
The \"Close\" button closes the browser window.\n" The \"Close\" button closes the browser window.\n"
if {$have_bwidget == 1} {
set text "${text}
If the \"File browser text field\" switch is enabled then a single click
or a cursor movement by the arrow keys brings the selected item into
the associated text field, but does not hit the Return key."
}
return $text
} }

View File

@ -1 +1 @@
#define Xorriso_timestamP "2013.01.06.171902" #define Xorriso_timestamP "2013.01.06.174508"