From d36f1a5426cf8267f35992114e75f8a028e41c71 Mon Sep 17 00:00:00 2001 From: David Botton Date: Mon, 27 Jun 2022 19:03:58 -0400 Subject: [PATCH] each custom control project own category --- templates/projects/clog-plugin/tmpl-tools.lisp.lt | 8 +++++++- tools/clog-builder-settings.lisp | 9 +-------- tools/clog-builder.lisp | 3 ++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/projects/clog-plugin/tmpl-tools.lisp.lt b/templates/projects/clog-plugin/tmpl-tools.lisp.lt index 8859835..04ba42c 100644 --- a/templates/projects/clog-plugin/tmpl-tools.lisp.lt +++ b/templates/projects/clog-plugin/tmpl-tools.lisp.lt @@ -2,7 +2,13 @@ (progn (clog-tools:add-supported-controls - (list `(;; unique name to control used to identify it the .clog xml + (list '(:name "group" + :description "<%= (@ sys-name) %> Controls" + :create nil + :create-type nil + :events nil + :properties nil) + `(;; unique name to control used to identify it the .clog xml :name "<%= (@ sys-name) %>" ;; how control appears in builder control list :description "<%= (@ sys-name) %>" diff --git a/tools/clog-builder-settings.lisp b/tools/clog-builder-settings.lisp index ab9b27f..a7baa76 100644 --- a/tools/clog-builder-settings.lisp +++ b/tools/clog-builder-settings.lisp @@ -1693,14 +1693,7 @@ :attr "data-clog-one-row-limit") (:name "join to slot-name (optional)" :attr "data-clog-one-row-master") - ,@*props-form-element*)) - '(:name "group" - :description "Custom Controls" - :create nil - :create-type nil - :events nil - :properties nil))) - + ,@*props-form-element*)))) (defparameter *supported-templates* (list diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp index 9f432fb..6052f27 100644 --- a/tools/clog-builder.lisp +++ b/tools/clog-builder.lisp @@ -260,7 +260,8 @@ replaced." (dolist (r control-records) (setf *supported-controls* (append (remove-if (lambda (x) - (equal (getf x :name) (getf r :name))) + (unless (equalp (getf x :name) "group") + (equal (getf x :name) (getf r :name)))) *supported-controls*) (list r)))))