@@ -31,10 +31,11 @@ (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") +;; tdb is the tasks database (monitor.db) (define (control-panel db tdb keys) (let* ((var-params (make-hash-table)) ;; register all the widgets here for querying on run, rollup, remove? (key-params (make-hash-table)) (monitordat '()) ;; list of monitor records (keyentries (iup:frame @@ -126,11 +127,11 @@ (tasks:reset-stuck-tasks tdb) (set! monitorsdat (tasks:get-monitors tdb)) (set! next-touch (+ (current-seconds) 10)) ))))) (topdialog #f)) - (set! topdialog (iup:dialog + (set! topdialog (iup:vbox ;; iup:dialog #:close_cb (lambda (a)(exit)) #:title "Run Controls" (iup:vbox (iup:hbox keyentries othervars) controls @@ -155,16 +156,17 @@ ; monitors) ; (iup:frame ; #:title "Actions" ; actions)))) - (iup:show topdialog) + ;; (iup:show topdialog) (iup:callback-set! *tim* "ACTION_CB" (lambda (x) (refreshdat) (if *exit-started* - (set! *exit-started* 'ok)))))) + (set! *exit-started* 'ok)))) + topdialog)) (define (main-window setuptab fsltab collateraltab toolstab) (iup:show (iup:dialog #:title "FSL Power Window" #:size "290x190" ; #:expand "YES" (let ((tabtop (iup:tabs setuptab collateraltab fsltab toolstab)))