diff --git a/static-files/img/icons/comment.png b/static-files/img/icons/comment.png new file mode 100644 index 0000000..14f919b Binary files /dev/null and b/static-files/img/icons/comment.png differ diff --git a/static-files/img/icons/construction.png b/static-files/img/icons/construction.png new file mode 100644 index 0000000..6a9d14f Binary files /dev/null and b/static-files/img/icons/construction.png differ diff --git a/static-files/img/icons/copy.png b/static-files/img/icons/copy.png new file mode 100644 index 0000000..22e8c54 Binary files /dev/null and b/static-files/img/icons/copy.png differ diff --git a/static-files/img/icons/cut.png b/static-files/img/icons/cut.png new file mode 100644 index 0000000..f69af73 Binary files /dev/null and b/static-files/img/icons/cut.png differ diff --git a/static-files/img/icons/delete.png b/static-files/img/icons/delete.png new file mode 100644 index 0000000..d0520ac Binary files /dev/null and b/static-files/img/icons/delete.png differ diff --git a/static-files/img/icons/emi.png b/static-files/img/icons/emi.png new file mode 100644 index 0000000..5869158 Binary files /dev/null and b/static-files/img/icons/emi.png differ diff --git a/static-files/img/icons/export.png b/static-files/img/icons/export.png new file mode 100644 index 0000000..89980f1 Binary files /dev/null and b/static-files/img/icons/export.png differ diff --git a/static-files/img/icons/favicon.png b/static-files/img/icons/favicon.png new file mode 100644 index 0000000..fee91fd Binary files /dev/null and b/static-files/img/icons/favicon.png differ diff --git a/static-files/img/icons/open.png b/static-files/img/icons/open.png new file mode 100644 index 0000000..fef1004 Binary files /dev/null and b/static-files/img/icons/open.png differ diff --git a/static-files/img/icons/paste.png b/static-files/img/icons/paste.png new file mode 100644 index 0000000..bdb8dba Binary files /dev/null and b/static-files/img/icons/paste.png differ diff --git a/static-files/img/icons/redo.png b/static-files/img/icons/redo.png new file mode 100644 index 0000000..bcf36b4 Binary files /dev/null and b/static-files/img/icons/redo.png differ diff --git a/static-files/img/icons/rndr.png b/static-files/img/icons/rndr.png new file mode 100644 index 0000000..3f62485 Binary files /dev/null and b/static-files/img/icons/rndr.png differ diff --git a/static-files/img/icons/run.png b/static-files/img/icons/run.png new file mode 100644 index 0000000..8ab8b92 Binary files /dev/null and b/static-files/img/icons/run.png differ diff --git a/static-files/img/icons/save.png b/static-files/img/icons/save.png new file mode 100644 index 0000000..c9074bd Binary files /dev/null and b/static-files/img/icons/save.png differ diff --git a/static-files/img/icons/send.png b/static-files/img/icons/send.png new file mode 100644 index 0000000..fa68814 Binary files /dev/null and b/static-files/img/icons/send.png differ diff --git a/static-files/img/icons/undo.png b/static-files/img/icons/undo.png new file mode 100644 index 0000000..c63bc3e Binary files /dev/null and b/static-files/img/icons/undo.png differ diff --git a/static-files/img/icons/walk.png b/static-files/img/icons/walk.png new file mode 100644 index 0000000..51af881 Binary files /dev/null and b/static-files/img/icons/walk.png differ diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp index bfe65df..8543496 100644 --- a/tools/clog-builder.lisp +++ b/tools/clog-builder.lisp @@ -1016,21 +1016,32 @@ of controls and double click to select control." :client-movement t)) (box (create-panel-box-layout (window-content win) :left-width 0 :right-width 0 - :top-height 30 :bottom-height 0)) - (tool-bar (top-panel box)) - (btn-del (create-button tool-bar :content "Del")) - (btn-copy (create-button tool-bar :content "Copy")) - (btn-paste (create-button tool-bar :content "Paste")) - (btn-sim (create-button tool-bar :content "Sim")) - (btn-test (create-button tool-bar :content "Run")) - (btn-rndr (create-button tool-bar :content "Rndr")) - (btn-save (create-button tool-bar :content "Save")) - (btn-load (create-button tool-bar :content "Load")) + :top-height 33 :bottom-height 0)) + (tool-bar (create-div (top-panel box) :class "w3-center")) + (btn-class "w3-button w3-white w3-border w3-border-black") + (btn-copy (create-img tool-bar :alt-text "copy" :url-src "/img/icons/copy.png" :class btn-class)) + (btn-paste (create-img tool-bar :alt-text "paste" :url-src "/img/icons/paste.png" :class btn-class)) + (btn-cut (create-img tool-bar :alt-text "cut" :url-src "/img/icons/cut.png" :class btn-class)) + (btn-del (create-img tool-bar :alt-text "delete" :url-src "/img/icons/delete.png" :class btn-class)) + ;;(btn-sim (create-button tool-bar :content "Sim")) + (btn-test (create-img tool-bar :alt-text "test" :url-src "/img/icons/run.png" :class btn-class)) + (btn-rndr (create-img tool-bar :alt-text "render" :url-src "/img/icons/rndr.png" :class btn-class)) + (btn-save (create-img tool-bar :alt-text "save" :url-src "/img/icons/save.png" :class btn-class)) + (btn-load (create-img tool-bar :alt-text "load" :url-src "/img/icons/open.png" :class btn-class)) (content (center-panel box)) (in-simulation nil) (file-name "") (render-file-name "") (panel-id (html-id content))) + (setf (background-color (top-panel box)) :black) + (setf (height btn-copy) "12px") + (setf (height btn-paste) "12px") + (setf (height btn-cut) "12px") + (setf (height btn-del) "12px") + (setf (height btn-test) "12px") + (setf (height btn-rndr) "12px") + (setf (height btn-save) "12px") + (setf (height btn-load) "12px") (setf-next-id content 1) (setf (overflow content) :auto) (init-control-list app panel-id) @@ -1041,7 +1052,6 @@ of controls and double click to select control." (setf (attribute content "data-clog-type") "clog-data") (setf (attribute content "data-in-package") "clog-user") (setf (attribute content "data-custom-slots") "") - (setf (background-color tool-bar) :silver) ;; activate associated windows on open (on-populate-control-properties-win content :win win) (on-populate-control-list-win content) @@ -1127,26 +1137,29 @@ of controls and double click to select control." (set-on-click btn-del #'del) (set-on-cut content (lambda (obj) (copy obj) - (del obj)))) - (set-on-click btn-sim (lambda (obj) - (declare (ignore obj)) - (cond (in-simulation - (setf (text btn-sim) "Simulate") - (setf in-simulation nil) - (maphash (lambda (html-id control) - (declare (ignore html-id)) - (setf (hiddenp (get-placer control)) nil)) - (get-control-list app panel-id))) - (t - (setf (text btn-sim) "Develop") - (deselect-current-control app) - (on-populate-control-properties-win content :win win) - (setf in-simulation t) - (maphash (lambda (html-id control) - (declare (ignore html-id)) - (setf (hiddenp (get-placer control)) t)) - (get-control-list app panel-id)) - (focus (first-child content)))))) + (del obj))) + (set-on-click btn-cut (lambda (obj) + (copy obj) + (del obj)))) + ;; (set-on-click btn-sim (lambda (obj) + ;; (declare (ignore obj)) + ;; (cond (in-simulation + ;; (setf (text btn-sim) "Simulate") + ;; (setf in-simulation nil) + ;; (maphash (lambda (html-id control) + ;; (declare (ignore html-id)) + ;; (setf (hiddenp (get-placer control)) nil)) + ;; (get-control-list app panel-id))) + ;; (t + ;; (setf (text btn-sim) "Develop") + ;; (deselect-current-control app) + ;; (on-populate-control-properties-win content :win win) + ;; (setf in-simulation t) + ;; (maphash (lambda (html-id control) + ;; (declare (ignore html-id)) + ;; (setf (hiddenp (get-placer control)) t)) + ;; (get-control-list app panel-id)) + ;; (focus (first-child content)))))) (set-on-click btn-load (lambda (obj) (server-file-dialog obj "Load Panel" file-name (lambda (fname)