dazscript-framework 0.1.14 → 0.1.16

package/src/dialog/builders/button-builder.ts

@@ -1,53 +1,53 @@
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export class ButtonBuilder extends WidgetBuilderBase<DzPushButton> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzPushButton))
-    }
-
-    text(text: string): this {
-        this.widget.text = text
-        return this
-    }
-
-    toggle(bind: Observable<boolean>): this {
-        this.widget.setCheckable(true)
-        this.widget.checked = bind.value
-        this.widget.toggled.scriptConnect((value) => {
-            bind.value = value
-        })
-        bind.connect((value) => {
-            this.widget.checked = value
-        })
-        return this
-    }
-
-    clicked(then: Observable<void> | ((button: DzPushButton) => void)): this {
-        if (then instanceof Observable) {
-            this.widget.clicked.scriptConnect(() => {
-                then.trigger()
-            })
-        }
-        else {
-            this.widget.clicked.scriptConnect(() => {
-                then?.(this.widget)
-            })
-        }
-        return this
-    }
-
-    icon(image: string | Pixmap): this {
-        this.widget.pixmap = typeof image === 'string'
-            ? new Pixmap(image)
-            : image
-        return this
-    }
-
-    build(then?: (button: DzPushButton) => void): DzPushButton {
-        if (!this.widget.text && this.widget.pixmap) this.widget.collapseEmptySpace = true
-        then?.(this.widget)
-        return this.widget
-    }
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export class ButtonBuilder extends WidgetBuilderBase<DzPushButton> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzPushButton))
+    }
+
+    text(text: string): this {
+        this.widget.text = text
+        return this
+    }
+
+    toggle(bind: Observable<boolean>): this {
+        this.widget.setCheckable(true)
+        this.widget.checked = bind.value
+        this.widget.toggled.scriptConnect((value) => {
+            bind.value = value
+        })
+        bind.connect((value) => {
+            this.widget.checked = value
+        })
+        return this
+    }
+
+    clicked(then: Observable<void> | ((button: DzPushButton) => void)): this {
+        if (then instanceof Observable) {
+            this.widget.clicked.scriptConnect(() => {
+                then.trigger()
+            })
+        }
+        else {
+            this.widget.clicked.scriptConnect(() => {
+                then?.(this.widget)
+            })
+        }
+        return this
+    }
+
+    icon(image: string | Pixmap): this {
+        this.widget.pixmap = typeof image === 'string'
+            ? new Pixmap(image)
+            : image
+        return this
+    }
+
+    build(then?: (button: DzPushButton) => void): DzPushButton {
+        if (!this.widget.text && this.widget.pixmap) this.widget.collapseEmptySpace = true
+        then?.(this.widget)
+        return this.widget
+    }
 }

package/src/dialog/builders/checkbox-builder.ts

@@ -1,30 +1,30 @@
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export default class CheckBoxBuilder extends WidgetBuilderBase<DzCheckBox> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzCheckBox))
-    }
-
-    label(text: string): this {
-        this.widget.text = text ?? ''
-        return this
-    }
-
-    value(property: Observable<boolean>): this {
-        this.widget.checked = property.value
-        property.connect((value) => {
-            this.widget.checked = value
-        })
-        this.widget.toggled.scriptConnect((value) => {
-            property.value = value
-        })
-        return this
-    }
-
-    build(): DzCheckBox {
-        return this.widget
-    }
-
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export default class CheckBoxBuilder extends WidgetBuilderBase<DzCheckBox> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzCheckBox))
+    }
+
+    label(text: string): this {
+        this.widget.text = text ?? ''
+        return this
+    }
+
+    value(property: Observable<boolean>): this {
+        this.widget.checked = property.value
+        property.connect((value) => {
+            this.widget.checked = value
+        })
+        this.widget.toggled.scriptConnect((value) => {
+            property.value = value
+        })
+        return this
+    }
+
+    build(): DzCheckBox {
+        return this.widget
+    }
+
 }

package/src/dialog/builders/color-picker-builder.ts

@@ -0,0 +1,36 @@
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export default class ColorPickerBuilder extends WidgetBuilderBase<DzColorWgt> {
+    private _value?: Color
+    private _minWidth: number
+    private _parent: DzWidget | DzLayout | null = null;
+
+    constructor(private readonly context: WidgetBuilderContext) {
+        super(null)
+    }
+
+    value(color: Color): this {
+        this._value = color
+        return this
+    }
+
+    minWidth(width: number): this {
+        this._minWidth = width
+        return this
+    }
+
+    parent(parent: DzWidget | DzLayout): this {
+        this._parent = parent
+        return this
+    }
+
+    override build(): DzColorWgt {
+        let widget = createWidget(this.context).parent(this._parent ?? this.context.parent).build(DzColorWgt)
+
+        if (this._value) widget.value = this._value
+        widget.minWidth = this._minWidth
+
+        return widget;
+    }
+}

package/src/dialog/builders/combo-box-builder.ts

@@ -1,36 +1,39 @@
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export class ComboBoxBuilder extends WidgetBuilderBase<DzComboBox> {
-    items(items: string[]): this {
-        items.forEach((item, idx) => {
-            if (!item)
-                this.widget.insertSeparator(idx)
-            else
-                this.widget.insertItem(idx, item)
-        });
-        return this
-    }
-
-    selected(bind: Observable<string>): this {
-        this.widget.currentText = bind.value
-        bind.connect((text) => {
-            if (this.widget.findText(text) >= 0)
-                this.widget.currentText = text
-        })
-        this.widget.textChanged.scriptConnect((text) => {
-            bind.value = text
-        })
-        return this
-    }
-
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzComboBox))
-    }
-
-    build(then?: (comboBox: DzComboBox) => void) {
-        then?.(this.widget)
-        return this.widget
-    }
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export class ComboBoxBuilder extends WidgetBuilderBase<DzComboBox> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzComboBox))
+    }
+
+    items(items: string[]): this {
+        items.forEach((item, idx) => {
+            if (!item)
+                this.widget.insertSeparator(idx)
+            else
+                this.widget.insertItem(idx, item)
+        });
+        return this
+    }
+
+    selected(bind: Observable<string>): this {
+        if (bind.value && this.widget.findText(bind.value) >= 0) {
+            this.widget.currentText = bind.value
+        }
+        bind.connect((text) => {
+            if (this.widget.findText(text) >= 0) {
+                this.widget.currentText = text
+            }
+        })
+        this.widget.textChanged.scriptConnect((text) => {
+            bind.value = text
+        })
+        return this
+    }
+
+    build(then?: (comboBox: DzComboBox) => void) {
+        then?.(this.widget)
+        return this.widget
+    }
 }

package/src/dialog/builders/combo-edit-builder.ts

@@ -1,36 +1,36 @@
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export class ComboEditBuilder extends WidgetBuilderBase<DzComboEdit> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzComboEdit));
-    }
-
-    items(items: string[]): this {
-        this.widget.insertItems(0, items)
-        return this
-    }
-
-    changed(bind: Observable<string>): this {
-        this.widget.text = bind.value
-        this.widget.itemChanged.scriptConnect((text) => {
-            bind.value = text
-        })
-        bind.connect((text) => {
-            this.widget.text = text
-        })
-        return this
-    }
-
-    edited(bind: Observable<string>): this {
-        this.widget.text = bind.value
-        this.widget.textEdited.scriptConnect((text) => {
-            bind.value = text
-        })
-        bind.connect((text) => {
-            this.widget.text = text
-        })
-        return this
-    }
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export class ComboEditBuilder extends WidgetBuilderBase<DzComboEdit> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzComboEdit));
+    }
+
+    items(items: string[]): this {
+        this.widget.insertItems(0, items)
+        return this
+    }
+
+    changed(bind: Observable<string>): this {
+        this.widget.text = bind.value
+        this.widget.itemChanged.scriptConnect((text) => {
+            bind.value = text
+        })
+        bind.connect((text) => {
+            this.widget.text = text
+        })
+        return this
+    }
+
+    edited(bind: Observable<string>): this {
+        this.widget.text = bind.value
+        this.widget.textEdited.scriptConnect((text) => {
+            bind.value = text
+        })
+        bind.connect((text) => {
+            this.widget.text = text
+        })
+        return this
+    }
 }

package/src/dialog/builders/dialog-builder.ts

@@ -1,49 +1,49 @@
-import { DialogProperties } from '../shared';
-import { WidgetBuilderContext, WidgetsBuilder } from './widgets-builder';
-
-export class DialogBuilder extends WidgetsBuilder {
-    public properties: DialogProperties
-
-    constructor(private title: string, private id?: string) {
-        super(new WidgetBuilderContext(new DzBasicDialog()))
-        this.properties = new DialogProperties()
-    }
-
-    options(properties: DialogProperties) {
-        this.properties = properties
-    }
-
-    build(setup: () => void): DzBasicDialog {
-        this.init()
-        setup()
-        this.resize()
-        return this.context.dialog
-    }
-
-    private init() {
-        this.context.dialog.caption = this.title
-        let dialogWidget = this.context.dialog.getWidget()
-        var key = (this.id ?? this.context.dialog.caption).replace(/ /g, "") + "Dlg"
-        dialogWidget.objectName = key
-    }
-
-    private resize() {
-        let dialogWidget = this.context.dialog.getWidget();
-        let sizeHint = dialogWidget.minimumSizeHint;
-        let height = this.properties.height ?? sizeHint.height;
-        this.context.dialog.minHeight = sizeHint.height;
-        this.context.dialog.height = height;
-
-        if (this.properties.width) this.context.dialog.width = this.properties.width;
-
-        if (this.properties.resizable === true) {
-            this.context.dialog.sizeGripEnabled = true;
-        }
-        else {
-            if (this.properties.width)
-                this.context.dialog.setFixedWidth(this.properties.width);
-            this.context.dialog.setFixedHeight(height);
-        }
-    }
-}
-
+import { DialogProperties } from '../shared';
+import { WidgetBuilderContext, WidgetsBuilder } from './widgets-builder';
+
+export class DialogBuilder extends WidgetsBuilder {
+    public properties: DialogProperties
+
+    constructor(private title: string, private id?: string) {
+        super(new WidgetBuilderContext(new DzBasicDialog()))
+        this.properties = new DialogProperties()
+    }
+
+    options(properties: DialogProperties) {
+        this.properties = properties
+    }
+
+    build(setup: () => void): DzBasicDialog {
+        this.init()
+        setup()
+        this.resize()
+        return this.context.dialog
+    }
+
+    private init() {
+        this.context.dialog.caption = this.title
+        let dialogWidget = this.context.dialog.getWidget()
+        var key = (this.id ?? this.context.dialog.caption).replace(/ /g, "") + "Dlg"
+        dialogWidget.objectName = key
+    }
+
+    private resize() {
+        let dialogWidget = this.context.dialog.getWidget();
+        let sizeHint = dialogWidget.minimumSizeHint;
+        let height = this.properties.height ?? sizeHint.height;
+        this.context.dialog.minHeight = sizeHint.height;
+        this.context.dialog.height = height;
+
+        if (this.properties.width) this.context.dialog.width = this.properties.width;
+
+        if (this.properties.resizable === true) {
+            this.context.dialog.sizeGripEnabled = true;
+        }
+        else {
+            if (this.properties.width)
+                this.context.dialog.setFixedWidth(this.properties.width);
+            this.context.dialog.setFixedHeight(height);
+        }
+    }
+}
+

package/src/dialog/builders/groupbox-builder.ts

@@ -1,73 +1,121 @@
-import { Observable } from '@dsf/lib/observable';
-import { Direction } from '../shared';
-import LayoutBuilder from './layout-builder';
-import { IWidgetBuilder, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
-    private _title: Observable<string>
-    private _direction: Direction = 'vertical'
-    private _style: { flat?: boolean }
-    private _visible: Observable<boolean>
-
-    constructor(private context: WidgetBuilderContext) {
-    }
-
-    title(text: string | Observable<string>): this {
-        this._title = typeof text === 'string'
-            ? new Observable(text)
-            : text
-        return this
-    }
-
-    vertical(): this {
-        this._direction = 'vertical'
-        return this
-    }
-
-    horizontal(): this {
-        this._direction = 'horizontal'
-        return this
-    }
-
-    style(options: { flat?: boolean }): this {
-        this._style = options
-        return this
-    }
-
-    visible(value: boolean | Observable<boolean>): this {
-        this._visible = typeof value === 'boolean'
-            ? new Observable(value)
-            : value
-        return this
-    }
-
-    build(then?: (layout: DzVBoxLayout | DzHBoxLayout) => void): DzGroupBox {
-        let groupBox = createWidget(this.context).build(DzGroupBox)
-
-        groupBox.title = this._title?.value
-        groupBox.flat = this._style?.flat
-
-        this._title?.connect((text) => {
-            groupBox.title = text
-        })
-
-        new LayoutBuilder(this.context)
-            .parent(groupBox)
-            .direction(this._direction)
-            .build(then)
-
-        if (this._visible) {
-            if (this._visible.value === false)
-                groupBox.hide()
-            this._visible.connect((visible) => {
-                if (visible)
-                    groupBox.show()
-                else
-                    groupBox.hide()
-            })
-        }
-
-        return groupBox
-    }
-}
+import { Observable } from '@dsf/lib/observable';
+import { Direction } from '../shared';
+import LayoutBuilder from './layout-builder';
+import { IWidgetBuilder, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
+    private _title: Observable<string>
+    private _direction: Direction = 'vertical'
+    private _style: { flat?: boolean }
+    private _visible: Observable<boolean>
+    private _enabled: Observable<boolean>
+    private _columns: number = 1
+    private _height: number | null = null
+    private _minHeight: number | null = null
+
+    constructor(private context: WidgetBuilderContext) {
+    }
+
+    title(text: string | Observable<string>): this {
+        this._title = typeof text === 'string'
+            ? new Observable(text)
+            : text
+        return this
+    }
+
+    vertical(): this {
+        this._direction = 'vertical'
+        return this
+    }
+
+    horizontal(): this {
+        this._direction = 'horizontal'
+        return this
+    }
+
+    orientation(direction: Direction): this {
+        this._direction = direction
+        return this
+    }
+
+    style(options: { flat?: boolean }): this {
+        this._style = options
+        return this
+    }
+
+    flat(): this {
+        this._style = { flat: true }
+        return this
+    }
+
+    visible(value: boolean | Observable<boolean>): this {
+        this._visible = typeof value === 'boolean'
+            ? new Observable(value)
+            : value
+        return this
+    }
+
+    enabled(value: boolean | Observable<boolean>): this {
+        this._enabled = typeof value === 'boolean'
+            ? new Observable(value)
+            : value
+        return this
+    }
+
+    height(value: number): this {
+        this._height = value
+        return this
+    }
+
+    minHeight(value: number): this {
+        this._minHeight = value
+        return this
+    }
+
+    columns(value: number): this {
+        this._columns = value
+        return this
+    }
+
+    build(then?: (layout: DzVBoxLayout | DzHBoxLayout, groupBox: DzGroupBox) => void): DzGroupBox {
+        let groupBox = createWidget(this.context).build(DzGroupBox)
+
+        groupBox.title = this._title?.value
+        groupBox.flat = this._style?.flat
+        groupBox.columns = this._columns
+        if (this._height !== null) groupBox.height = this._height
+        if (this._minHeight !== null) groupBox.minHeight = this._minHeight
+
+        this._title?.connect((text) => {
+            groupBox.title = text
+        })
+
+        new LayoutBuilder(this.context)
+            .parent(groupBox)
+            .direction(this._direction)
+            .build((layout) => {
+                then?.(layout, groupBox)
+            })
+
+        if (this._visible) {
+            if (this._visible.value === false)
+                groupBox.hide()
+            this._visible.connect((visible) => {
+                if (visible)
+                    groupBox.show()
+                else
+                    groupBox.hide()
+            })
+        }
+
+        if (this._enabled) {
+            groupBox.enabled = this._enabled.value
+            this._enabled.connect((enabled) => {
+                groupBox.enabled = enabled
+            })
+        }
+
+        return groupBox
+    }
+}