diff --git a/gui/filemgmt.tcl b/gui/filemgmt.tcl index 75a3e30c..9cf7c2f1 100755 --- a/gui/filemgmt.tcl +++ b/gui/filemgmt.tcl @@ -1,5 +1,5 @@ # -# Copyright 2005-2013 the Boeing Company. +# Copyright 2005-2014 the Boeing Company. # See the LICENSE file included in this distribution. # @@ -148,7 +148,7 @@ proc openFile {} { global canvas_list curcanvas systype global changed - if { [file extension $currentFile] == ".py" } { + if { [lindex [file extension $currentFile] 0] == ".py" } { set flags 0x10 ;# status request flag sendRegMessage -1 $flags [list "exec" $currentFile] addFileToMrulist $currentFile @@ -465,9 +465,9 @@ proc savePrefsFile { } { } # helper for most-recently-used file list menu items -proc mrufile { f } { +proc mrufile { f args } { global currentFile - set currentFile $f + set currentFile "$f $args" openFile } @@ -476,7 +476,7 @@ proc mrufile { f } { # the length of this list; if no file specified, erase the list proc addFileToMrulist { f } { global g_mrulist g_prefs - set MRUI 13 ;# index of MRU list -- update when adding to File menu! + set MRUI 14 ;# index of MRU list -- update when adding to File menu! set oldlength [llength $g_mrulist] set maxlength $g_prefs(num_recent) diff --git a/gui/initgui.tcl b/gui/initgui.tcl index 60f73b47..2f965f15 100755 --- a/gui/initgui.tcl +++ b/gui/initgui.tcl @@ -1,5 +1,5 @@ # -# Copyright 2005-2013 the Boeing Company. +# Copyright 2005-2014 the Boeing Company. # See the LICENSE file included in this distribution. # @@ -241,7 +241,9 @@ bind . "fileSaveDialogBox {}" .menubar.file add separator .menubar.file add command -label "Export Python script..." -command exportPython .menubar.file add command -label "Execute XML or Python script..." \ - -command execPython + -command { execPython false } +.menubar.file add command -label "Execute Python script with options..." \ + -command { execPython true } .menubar.file add separator .menubar.file add command -label "Open current file in editor..." \ @@ -294,7 +296,7 @@ bind . "fileSaveDialogBox {}" } .menubar.file add separator foreach f $g_mrulist { - .menubar.file add command -label "$f" -command "mrufile \"$f\"" + .menubar.file add command -label "$f" -command "mrufile {$f}" } # end Boeing changes .menubar.file add separator diff --git a/gui/util.tcl b/gui/util.tcl index feed39e8..eebc10c9 100644 --- a/gui/util.tcl +++ b/gui/util.tcl @@ -1,5 +1,5 @@ # -# Copyright 2005-2013 the Boeing Company. +# Copyright 2005-2014 the Boeing Company. # See the LICENSE file included in this distribution. # @@ -981,7 +981,7 @@ proc exportPython { } { } # ask the daemon to execute the selected file -proc execPython { } { +proc execPython { with_options } { global fileDialogBox_initial g_prefs set ft {{ "CORE XML or Python scripts" {.py .xml} } { "All files" {*}}} @@ -993,11 +993,58 @@ proc execPython { } { set fn [tk_getOpenFile -filetypes $ft] } if { $fn == "" } { return } + if { $with_options } { + set prompt "Append any command-line options for running the Python" + set prompt "$prompt script:" + set fn [tk_inputBox "Python Script Options" $prompt $fn . 50] + if { $fn == "" } { return } + } set flags 0x10 ;# status request flag sendRegMessage -1 $flags [list "exec" $fn] addFileToMrulist $fn } +# open a dialog that prompts the user with a text entry +# this is a blocking dialog that returns "" for cancel, or the entry text for OK +proc tk_inputBox { title prompt default_text parent width} { + set w .input_box + catch {destroy $w} + toplevel $w + + global g_input_box_btn_state + set g_input_box_btn_state 0 + global g_input_box_text + set g_input_box_text $default_text + + wm title $w $title + wm transient $w $parent + wm attributes $w -type dialog + + ttk::frame $w.f + ttk::label $w.f.top -text $prompt + ttk::entry $w.f.ent -width $width -textvariable g_input_box_text + pack $w.f.top $w.f.ent -side top -padx 4 -pady 4 + pack $w.f -side top + + ttk::frame $w.btn + ttk::button $w.btn.ok -text "OK" -command { + global g_input_box_btn_state + set g_input_box_btn_state 1 + } + ttk::button $w.btn.cancel -text "Cancel" -command { + global g_input_box_text + global g_input_box_btn_state + set g_input_box_text "" + set g_input_box_btn_state 2 + } + pack $w.btn.ok $w.btn.cancel -side left -padx 4 -pady 4 + pack $w.btn -side top + + vwait g_input_box_btn_state + destroy $w + return $g_input_box_text +} + # from Practical Programming in Tcl and Tk, page 190 proc Call_Trace {{file stdout}} { puts $file "*** Tcl Call Trace:"