Index: dashboard-tests.scm ================================================================== --- dashboard-tests.scm +++ dashboard-tests.scm @@ -94,11 +94,12 @@ "Current state: " "Current status: " "Test comment: " "Test id: " "Test date: ")) - (list (iup:label "" #:expand "VERTICAL")))) + (list (iup:label "" #:expand "VERTICAL" + )))) (apply iup:vbox ; #:expand "YES" (list (store-label "testname" (iup:label (db:test-get-testname testdat) #:expand "HORIZONTAL") (lambda (testdat)(db:test-get-testname testdat))) @@ -162,11 +163,12 @@ (list "Author: " "Owner: " "Reviewed: " "Tags: " "Description: ")) - (list (iup:label "" #:expand "VERTICAL")))) + (list (iup:label "" #:expand "VERTICAL" + )))) (apply iup:vbox ; #:expand "YES" (list (store-meta "author" (iup:label (db:testmeta-get-author testmeta) #:expand "HORIZONTAL") (lambda (testmeta)(db:testmeta-get-author testmeta))) @@ -178,11 +180,12 @@ (lambda (testmeta)(db:testmeta-get-reviewed testmeta))) (store-meta "tags" (iup:label (db:testmeta-get-tags testmeta) #:expand "HORIZONTAL") (lambda (testmeta)(db:testmeta-get-tags testmeta))) (store-meta "description" - (iup:label (test-meta-panel-get-description testmeta) #:size "x50"); #:expand "HORIZONTAL") + (iup:label (test-meta-panel-get-description testmeta) ;; #:wordwrap "YES" ;; #:size "x50" + ) ;; #:expand "HORIZONTAL") (lambda (testmeta) (test-meta-panel-get-description testmeta))) ))))) @@ -206,16 +209,21 @@ (list (iup:label "runname ") (iup:label "run-id") (iup:label "run-date")))) (apply iup:vbox (append (map (lambda (keyval) - (iup:label (cadr keyval) #:expand "HORIZONTAL")) + (iup:vbox + (iup:label (cadr keyval) #:expand "HORIZONTAL") + ;; (iup:label "" #:expand "BOTH") + ) + ) keydat) (list (iup:label runname) (iup:label (conc run-id)) (iup:label (seconds->year-work-week/day-time event_time)) - (iup:label "" #:expand "VERTICAL")))))))) + (iup:label "" ;;#:expand "VERTICAL" + )))))))) ;;====================================================================== ;; Host info panel ;;====================================================================== (define (host-info-panel testdat store-label) @@ -231,11 +239,12 @@ "CPU Load: " "Run duration: " "Logfile: " "Top process id: " "Uname -a: ")) - (iup:label "" #:expand "VERTICAL"))) + (iup:label "" ;; #:expand "VERTICAL" + ))) (apply iup:vbox ; #:expand "YES" (list ;; NOTE: Yes, the host can change! (store-label "HostName" (iup:label ;; (sdb:qry 'getstr @@ -267,18 +276,20 @@ ;; (define (submegatest-panel dbstruct keydat testdat runname testconfig) (let* ((test-run-dir (db:test-get-rundir testdat)) (subarea (subrun:get-runarea test-run-dir)) (area-exists (and subarea (common:file-exists? subarea silent: #t)))) - (if subarea - (iup:frame - #:title "Megatest Run Info" ; #:expand "YES" + (iup:frame + #:title "Megatest Run Info" ;; #:expand "HORIZONTAL" + (if subarea (iup:button "Launch Dashboard" #:action (lambda (obj) - (subrun:launch-dashboard test-run-dir)))) - (iup:vbox)))) + (subrun:launch-dashboard test-run-dir))) + (iup:vbox + (iup:label "Not a subrun..." #:expand "HORIZONTAL") + ))))) ;; use a global for setting the buttons colors ;; state status teststeps (define *state-status* (vector #f #f #f)) (define (update-state-status-buttons testdat) @@ -727,21 +738,23 @@ (else ;; (test-set-status! db run-id test-name state status itemdat) (set! self ; (iup:dialog #:close_cb (lambda (a)(exit)) ; #:expand "YES" #:title testfullname - (iup:vbox ; #:expand "YES" - ;; The run and test info - (iup:hbox ; #:expand "YES" - (run-info-panel dbstruct keydat testdat runname) - (test-info-panel testdat store-label widgets) - (test-meta-panel testmeta store-meta)) + (iup:vbox (iup:hbox - (host-info-panel testdat store-label) - (submegatest-panel dbstruct keydat testdat runname testconfig)) + (iup:vbox ; #:expand "YES" + ;; The run and test info + (iup:hbox ; #:expand "YES" + (run-info-panel dbstruct keydat testdat runname) + (test-info-panel testdat store-label widgets)) + (host-info-panel testdat store-label)) + (iup:vbox + (test-meta-panel testmeta store-meta) + (submegatest-panel dbstruct keydat testdat runname testconfig))) ;; The controls - (iup:frame #:title "Actions" + (iup:hbox ;; frame #:title "Actions" (iup:vbox (iup:hbox (iup:frame #:title "Immediate" (iup:hbox