Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -5,13 +5,13 @@
 SRCFILES = common.scm items.scm launch.scm \
            ods.scm runconfig.scm server.scm configf.scm \
            db.scm keys.scm margs.scm megatest-version.scm \
            process.scm runs.scm tasks.scm tests.scm genexample.scm \
 	   fs-transport.scm zmq-transport.scm http-transport.scm \
-           client.scm
+           client.scm gutils.scm
 
-GUISRCF  = dashboard-tests.scm dashboard-guimonitor.scm dashboard-main.scm
+GUISRCF  = dashboard-tests.scm dashboard-guimonitor.scm 
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
@@ -24,12 +24,12 @@
 	csc $(CSCOPTS) $(OFILES) megatest.o -o mtest
 
 dboard : $(OFILES) $(GOFILES) dashboard.scm
 	csc $(OFILES) dashboard.scm $(GOFILES) -o dboard
 
-newdashboard : newdashboard.scm $(OFILES) $(GUISRCF)
-	csc $(OFILES) $(GUISRCF) newdashboard.scm -o newdashboard
+newdashboard : newdashboard.scm $(OFILES)
+	csc $(OFILES) newdashboard.scm -o newdashboard
 
 $(DEPLOYTARG)/megatest : $(OFILES) megatest.o
 	csc -deployed $(CSCOPTS) $(OFILES) megatest.o -o $(DEPLOYTARG)/megatest
 
 $(DEPLOYTARG)/dashboard :  $(OFILES) $(GOFILES)

DELETED dashboard-main.scm
Index: dashboard-main.scm
==================================================================
--- dashboard-main.scm
+++ /dev/null
@@ -1,287 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-;;======================================================================
-
-;;======================================================================
-;; Main Megatest Panel
-;;======================================================================
-
-(use format)
-(require-library iup)
-(import (prefix iup iup:))
-
-(use canvas-draw)
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit dashboard-main))
-(declare (uses common))
-(declare (uses keys))
-(declare (uses db))
-(declare (uses tasks))
-
-(include "common_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
-(include "task_records.scm")
-
-(define (main-menu)
-  (iup:menu ;; a menu is a special attribute to a dialog (think Gnome putting the menu at screen top)
-   (iup:menu-item "Files" (iup:menu   ;; Note that you can use either #:action or action: for options
-		       (iup:menu-item "Open"  action: (lambda (obj)
-							(show (iup:file-dialog))
-							(print "File->open " obj)))
-		       (iup:menu-item "Save"  #:action (lambda (obj)(print "File->save " obj)))
-		       (iup:menu-item "Exit"  #:action (lambda (obj)(exit)))))
-   (iup:menu-item "Tools" (iup:menu
-		       (iup:menu-item "Create new blah" #:action (lambda (obj)(print "Tools->new blah")))
-		       ;; (iup:menu-item "Show dialog"     #:action (lambda (obj)
-		       ;;  					   (show message-window
-		       ;;  					     #:modal? #t
-		       ;;  					     ;; set positon using coordinates or center, start, top, left, end, bottom, right, parent-center, current
-		       ;;  					     ;; #:x 'mouse
-		       ;;  					     ;; #:y 'mouse
-		       ;;  )					     
-		       ))))
-
-
-
-(define (mtest)
-  (let* ((curr-row-num     0)
-	 (rawconfig        (read-config (conc *toppath* "/megatest.config") #f 'return-string))
-	 (keys-matrix      (iup:matrix
-		            #:expand "VERTICAL"
-		            ;; #:scrollbar "YES"
-		            #:numcol 1
-		            #:numlin 20
-		            #:numcol-visible 1
-		            #:numlin-visible 5
-		            #:click-cb (lambda (obj lin col status)
-					 (print "obj: " obj " lin: " lin " col: " col " status: " status))))
-	 (setup-matrix     (iup:matrix
-		            #:expand "YES"
-		            #:numcol 1
-		            #:numlin 5
-		            #:numcol-visible 1
-		            #:numlin-visible 3))
-	 (jobtools-matrix  (iup:matrix
-			    #:expand "YES"
-			    #:numcol 1
-			    #:numlin 5
-			    #:numcol-visible 1
-			    #:numlin-visible 3))
-	 (validvals-matrix (iup:matrix
-			    #:expand "YES"
-			    #:numcol 1
-			    #:numlin 2
-			    #:numcol-visible 1
-			    #:numlin-visible 2))
-	 (envovrd-matrix   (iup:matrix
-			    #:expand "YES"
-			    #:numcol 1
-			    #:numlin 20
-			    #:numcol-visible 1
-			    #:numlin-visible 8))
-	 (disks-matrix     (iup:matrix
-			    #:expand "YES"
-			    #:numcol 1
-			    #:numlin 20
-			    #:numcol-visible 1
-			    #:numlin-visible 8))
-	 )
-    (iup:attribute-set! keys-matrix "0:0" "Field Num")
-    (iup:attribute-set! keys-matrix "0:1" "Field Name")
-    (iup:attribute-set! keys-matrix "WIDTH1" "100")
-    (iup:attribute-set! disks-matrix "0:0" "Disk Name")
-    (iup:attribute-set! disks-matrix "0:1" "Disk Path")
-    (iup:attribute-set! disks-matrix "WIDTH1" "120")
-    (iup:attribute-set! disks-matrix "WIDTH0" "100")
-    (iup:attribute-set! disks-matrix "ALIGNMENT1" "ALEFT")
-    (iup:attribute-set! disks-matrix "FIXTOTEXT" "C1")
-    (iup:attribute-set! disks-matrix "RESIZEMATRIX" "YES")
-    ;; fill in keys
-    (set! curr-row-num 1)
-    (for-each 
-     (lambda (var)
-       (iup:attribute-set! keys-matrix (conc curr-row-num ":0") curr-row-num)
-       (iup:attribute-set! keys-matrix (conc curr-row-num ":1") var)
-       (set! curr-row-num (+ 1 curr-row-num))) ;; (config-lookup *configdat* "fields" var)))
-     (configf:section-vars rawconfig "fields"))
-
-    ;; fill in existing info
-    (for-each 
-     (lambda (mat fname)
-       (set! curr-row-num 1)
-       (for-each
-	(lambda (var)
-	  (iup:attribute-set! mat (conc curr-row-num ":0") var)
-	  (iup:attribute-set! mat (conc curr-row-num ":1") (config-lookup rawconfig fname var))
-	  (set! curr-row-num (+ curr-row-num 1)))
-	(configf:section-vars rawconfig fname)))
-     (list setup-matrix jobtools-matrix validvals-matrix envovrd-matrix disks-matrix)
-     (list "setup"      "jobtools"      "validvalues"      "env-override" "disks"))
-
-    (for-each
-     (lambda (mat)
-       (iup:attribute-set! mat "0:1" "Value")
-       (iup:attribute-set! mat "0:0" "Var")
-       (iup:attribute-set! mat "ALIGNMENT1" "ALEFT")
-       (iup:attribute-set! mat "FIXTOTEXT" "C1")
-       (iup:attribute-set! mat "RESIZEMATRIX" "YES")
-       (iup:attribute-set! mat "WIDTH1" "120")
-       (iup:attribute-set! mat "WIDTH0" "100")
-       )
-     (list setup-matrix jobtools-matrix validvals-matrix envovrd-matrix))
-
-    (iup:attribute-set! validvals-matrix "WIDTH1" "290")
-    (iup:attribute-set! envovrd-matrix   "WIDTH1" "290")
-
-    (iup:vbox
-     (iup:hbox
-       
-      (iup:vbox
-       (let ((tabs (iup:tabs 
-		    ;; The required tab
-		    (iup:hbox
-		     ;; The keys
-		     (iup:frame 
-		      #:title "Keys (required)"
-		      (iup:vbox
-		       (iup:label (conc "Set the fields for organising your runs\n"
-					"here. Note: can only be changed before\n"
-					"running the first run when megatest.db\n"
-					"is created."))
-		       keys-matrix))
-		     (iup:vbox
-		      ;; The setup section
-		      (iup:frame
-		       #:title "Setup"
-		       (iup:vbox
-			(iup:label (conc "max_concurrent_jobs : limits total concurrent jobs (optional)\n"
-					 "linktree : directory where linktree will be created."))
-			setup-matrix))
-		      ;; The jobtools
-		      (iup:frame
-		       #:title "Jobtools"
-		       (iup:vbox 
-			(iup:label (conc "launcher : tool or script to run jobs (try nbfake)\n"
-					 "useshell : use system to run your launcher\n"
-					 "workhosts : spread jobs out on these hosts"))
-			jobtools-matrix))
-		      ;; The disks
-		      (iup:frame
-		       #:title "Disks"
-		       (iup:vbox
-			(iup:label (conc "Enter names and existing paths of locations to run tests")) 
-			disks-matrix))))
-		    ;; The optional tab
-		    (iup:vbox
-		     ;; The Environment Overrides
-		     (iup:frame 
-		      #:title "Env override"
-		      envovrd-matrix)
-		     ;; The valid values
-		     (iup:frame
-		      #:title "Validvalues"
-		      validvals-matrix)
-		     ))))
-	 (iup:attribute-set! tabs "TABTITLE0" "Required settings")
-	 (iup:attribute-set! tabs "TABTITLE1" "Optional settings")
-	 tabs))
-       ))))
-
-(define (rconfig)
-  (iup:vbox
-   (iup:frame #:title "Default")))
-
-(define (tests)
-  (iup:hbox 
-   (iup:frame #:title "Tests browser")))
-
-(define (runs)
-  (let* ((runs-matrix     (iup:matrix
-			   #:expand "YES"
-			   ;; #:fittosize "YES"
-			   #:scrollbar "YES"
-			   #:numcol 100
-			   #:numlin 100
-			   #:numcol-visible 7
-			   #:numlin-visible 7
-			   #:click-cb (lambda (obj lin col status)
-					(print "obj: " obj " lin: " lin " col: " col " status: " status)))))
-;;     (iup:attribute-set! keys-matrix "0:0" "Field Num")
-;;     (iup:attribute-set! keys-matrix "0:1" "Field Name")
-;;     (iup:attribute-set! keys-matrix "WIDTH1" "100")
-;;     (iup:attribute-set! disks-matrix "0:0" "Disk Name")
-;;     (iup:attribute-set! disks-matrix "0:1" "Disk Path")
-;;     (iup:attribute-set! disks-matrix "WIDTH1" "120")
-;;     (iup:attribute-set! disks-matrix "WIDTH0" "100")
-;;     (iup:attribute-set! disks-matrix "ALIGNMENT1" "ALEFT")
-;;     (iup:attribute-set! disks-matrix "FIXTOTEXT" "C1")
-;;     (iup:attribute-set! disks-matrix "RESIZEMATRIX" "YES")
-    ;; fill in keys
-;;     (set! curr-row-num 1)
-;;     (for-each 
-;;      (lambda (var)
-;;        (iup:attribute-set! keys-matrix (conc curr-row-num ":0") curr-row-num)
-;;        (iup:attribute-set! keys-matrix (conc curr-row-num ":1") var)
-;;        (set! curr-row-num (+ 1 curr-row-num))) ;; (config-lookup *configdat* "fields" var)))
-;;      (configf:section-vars rawconfig "fields"))
-
-    ;; fill in existing info
-;;    (for-each 
-;;     (lambda (mat fname)
-;;       (set! curr-row-num 1)
-;;       (for-each
-;;	(lambda (var)
-;;	  (iup:attribute-set! mat (conc curr-row-num ":0") var)
-;;	  (iup:attribute-set! mat (conc curr-row-num ":1") (config-lookup rawconfig fname var))
-;;	  (set! curr-row-num (+ curr-row-num 1)))
-;;	(configf:section-vars rawconfig fname)))
-;;     (list setup-matrix jobtools-matrix validvals-matrix envovrd-matrix disks-matrix)
-;;     (list "setup"      "jobtools"      "validvalues"      "env-override" "disks"))
-
-    (for-each
-     (lambda (mat)
-       (iup:attribute-set! mat "0:1" "ubuntu\nnfs\nnone")
-       (iup:attribute-set! mat "0:0" "Test")
-       (iup:attribute-set! mat "ALIGNMENT1" "ALEFT")
-       ;; (iup:attribute-set! mat "FIXTOTEXT" "C1")
-       (iup:attribute-set! mat "RESIZEMATRIX" "YES")
-       (iup:attribute-set! mat "WIDTH1" "120")
-       (iup:attribute-set! mat "WIDTH0" "100")
-       )
-     (list runs-matrix))
-
-;;    (iup:attribute-set! validvals-matrix "WIDTH1" "290")
-;;    (iup:attribute-set! envovrd-matrix   "WIDTH1" "290")
-    
-    (iup:hbox
-     (iup:frame 
-      #:title "Runs browser"
-      (iup:vbox
-       runs-matrix)))))
-
-(define (main-panel)
-  (iup:dialog
-   #:title "Menu Test"
-   #:menu (main-menu)
-   (let ((tabtop (iup:tabs 
-		  (runs)
-		  (mtest) 
-		  (rconfig)
-		  (tests)
-		  )))
-     (iup:attribute-set! tabtop "TABTITLE0" "Runs")
-     (iup:attribute-set! tabtop "TABTITLE3" "Tests")
-     (iup:attribute-set! tabtop "TABTITLE1" "megatest.config") 
-     (iup:attribute-set! tabtop "TABTITLE2" "runconfigs.config")
-     tabtop)))

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -27,11 +27,11 @@
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
 (declare (uses dashboard-tests))
 (declare (uses dashboard-guimonitor))
-(declare (uses dashboard-main))
+;; (declare (uses dashboard-main))
 (declare (uses megatest-version))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
@@ -687,16 +687,14 @@
 	(begin
 	  (print "ERROR: testid is not a number " (args:get-arg "-test"))
 	  (exit 1)))))
  ((args:get-arg "-guimonitor")
   (gui-monitor *db*))
- ((args:get-arg "-main")
-  (iup:show (main-panel)))
  (else
   (set! uidat (make-dashboard-buttons *num-runs* *num-tests* *dbkeys*))
   (iup:callback-set! *tim*
 		     "ACTION_CB"
 		     (lambda (x)
 		       (run-update x)))))
 		       ;(print x)))))
 
 (iup:main-loop)