dazscript-framework 0.1.15 → 0.1.16

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

@@ -1,82 +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>
-    private _columns: number = 1
-
-    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
-    }
-
-    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
-
-        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()
-            })
-        }
-
-        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
+    }
+}

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

@@ -1,28 +1,33 @@
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export default class LabelBuilder extends WidgetBuilderBase<DzLabel> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzLabel));
-
-    }
-
-    text(text: string): this {
-        this.widget.text = text;
-        return this;
-    }
-
-    minWidth(width: number): this {
-        this.widget.minWidth = width
-        return this;
-    }
-
-    align(alignment: AlignmentFlags): this {
-        this.widget.alignment = alignment
-        return this;
-    }
-
-    build(): DzLabel {
-        return this.widget;
-    }
-}
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export default class LabelBuilder extends WidgetBuilderBase<DzLabel> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzLabel));
+
+    }
+
+    text(text: string): this {
+        this.widget.text = text;
+        return this;
+    }
+
+    wordWrap(enabled: boolean = true): this {
+        this.widget.wordWrap = enabled
+        return this
+    }
+
+    minWidth(width: number): this {
+        this.widget.minWidth = width
+        return this;
+    }
+
+    align(alignment: AlignmentFlags): this {
+        this.widget.alignment = alignment
+        return this;
+    }
+
+    build(): DzLabel {
+        return this.widget;
+    }
+}

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

@@ -1,59 +1,59 @@
-import { Direction } from '@dsf/dialog/shared';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export enum LayoutOrientation {
-    LeftToRight = 0,
-    RightToLeft = 1,
-    TopToBottom = 2,
-    BottomToTop = 3
-}
-
-export default class LayoutBuilder {
-    private widgetParent: DzWidget | DzLayout | null;
-    private _direction: Direction = 'vertical';
-    private _orientation?: LayoutOrientation;
-
-    constructor(protected context: WidgetBuilderContext) { }
-
-    static create(context: WidgetBuilderContext): LayoutBuilder {
-        return new LayoutBuilder(context)
-    }
-
-    orientation(orientation: LayoutOrientation): this {
-        this._orientation = orientation;
-        return this
-    }
-
-    direction(direction: Direction): this {
-        this._direction = direction;
-        return this;
-    }
-
-    parent(parent: DzWidget | DzLayout): this {
-        this.widgetParent = parent;
-        return this;
-    }
-
-    build(then?: (layout: DzVBoxLayout | DzHBoxLayout) => void): DzVBoxLayout | DzHBoxLayout {
-        let parent = this.widgetParent ?? this.context.parent;
-        let type = this.getLayoutFor(this._direction);
-        let layout = new type(parent);
-        if (this._orientation) layout.direction = this._orientation;
-
-        let currentLayout = this.context.layout;
-        this.context.layout = layout;
-
-        if (parent.inherits("DzWidget") && (parent as any).addLayout)
-            (parent as DzBasicDialog).addLayout(layout);
-
-        then?.(layout);
-
-        this.context.layout = currentLayout;
-        return layout;
-    }
-
-    private getLayoutFor(direction: string): new (arg: any) => DzVBoxLayout | DzHBoxLayout {
-        return direction === 'horizontal' ? DzHBoxLayout : DzVBoxLayout;
-    }
-}
-
+import { Direction } from '@dsf/dialog/shared';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export enum LayoutOrientation {
+    LeftToRight = 0,
+    RightToLeft = 1,
+    TopToBottom = 2,
+    BottomToTop = 3
+}
+
+export default class LayoutBuilder {
+    private widgetParent: DzWidget | DzLayout | null;
+    private _direction: Direction = 'vertical';
+    private _orientation?: LayoutOrientation;
+
+    constructor(protected context: WidgetBuilderContext) { }
+
+    static create(context: WidgetBuilderContext): LayoutBuilder {
+        return new LayoutBuilder(context)
+    }
+
+    orientation(orientation: LayoutOrientation): this {
+        this._orientation = orientation;
+        return this
+    }
+
+    direction(direction: Direction): this {
+        this._direction = direction;
+        return this;
+    }
+
+    parent(parent: DzWidget | DzLayout): this {
+        this.widgetParent = parent;
+        return this;
+    }
+
+    build(then?: (layout: DzVBoxLayout | DzHBoxLayout) => void): DzVBoxLayout | DzHBoxLayout {
+        let parent = this.widgetParent ?? this.context.parent;
+        let type = this.getLayoutFor(this._direction);
+        let layout = new type(parent);
+        if (this._orientation) layout.direction = this._orientation;
+
+        let currentLayout = this.context.layout;
+        this.context.layout = layout;
+
+        if (parent.inherits("DzWidget") && (parent as any).addLayout)
+            (parent as DzBasicDialog).addLayout(layout);
+
+        then?.(layout);
+
+        this.context.layout = currentLayout;
+        return layout;
+    }
+
+    private getLayoutFor(direction: string): new (arg: any) => DzVBoxLayout | DzHBoxLayout {
+        return direction === 'horizontal' ? DzHBoxLayout : DzVBoxLayout;
+    }
+}
+

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

@@ -1,119 +1,124 @@
-import { Observable } from '@dsf/lib/observable';
-import { InputValidator } from '../input-validator';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export default class LineEditBuilder extends WidgetBuilderBase<DzLineEdit> {
-    private inputValidator: InputValidator
-    private minValue?: number
-    private maxValue?: number
-
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzLineEdit))
-    }
-
-    placeholder(text: string): this {
-        this.widget.placeholderText = text
-        return this
-    }
-
-    focus(): this {
-        this.widget.getWidget().setFocus()
-        return this
-    }
-
-    validator(validator: InputValidator | null): this {
-        if (validator === null) return this
-        this.inputValidator = validator
-        let settings = new DzSettings()
-        settings.setStringValue("validator", InputValidator[validator]);
-        this.widget.setValidator(settings)
-        return this
-    }
-
-    /**
-     * Sets the min value of the input when validator is set to in or float
-     * @param minValue
-     * @returns
-     */
-    min(minValue: number): this {
-        this.minValue = minValue
-        return this
-    }
-
-    /**
-     * Sets the max value of the input when validator is set to in or float
-     * @param maxValue
-     * @returns
-     */
-    max(maxValue: number): this {
-        this.maxValue = maxValue
-        return this
-    }
-
-    /**
-     * Clamps the input to min and max values. Only works when validator is set to int or float
-     * @param min
-     * @param max
-     * @returns
-     */
-    clamp(min: number, max: number): this {
-        return this.min(min).max(max)
-    }
-
-    readOnly(onOff?: Observable<boolean> | null): this {
-        if (onOff == null) {
-            this.widget.readOnly = true
-            return this
-        }
-        else {
-            this.widget.readOnly = onOff.value
-            onOff.connect((value) => {
-                this.widget.readOnly = value
-            })
-        }
-        return this
-    }
-
-    value(text_: string | Observable<string>): this {
-        if (typeof text_ === 'string') {
-            this.widget.text = text_
-        }
-        else if (text_ instanceof Observable) {
-            this.widget.text = text_.value;
-            this.widget.textChanged.scriptConnect((text: string) => {
-                text_.value = this.clampValue(text);
-            });
-            text_.connect((text: string) => {
-                this.widget.text = text;
-            });
-        }
-
-        return this;
-    }
-
-    private clampValue(text: string): string {
-        if (this.inputValidator === InputValidator.int || this.inputValidator === InputValidator.float) {
-            let value = Number(text);
-            if (!isNaN(value)) {
-                if (this.minValue !== undefined) {
-                    value = Math.max(value, this.minValue);
-                }
-                if (this.maxValue !== undefined) {
-                    value = Math.min(value, this.maxValue);
-                }
-                return String(value);
-            }
-        }
-        else if (this.maxValue && text.length > this.maxValue)
-            text = text[this.maxValue]
-
-        return text;
-    }
-
-
-    build(then?: (lineEdit: DzLineEdit) => void): DzLineEdit {
-        then?.(this.widget);
-        return this.widget;
-    }
-}
+import { Observable } from '@dsf/lib/observable';
+import { InputValidator } from '../input-validator';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export default class LineEditBuilder extends WidgetBuilderBase<DzLineEdit> {
+    private inputValidator: InputValidator
+    private minValue?: number
+    private maxValue?: number
+
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzLineEdit))
+    }
+
+    password(): this {
+        this.widget.echoMode = (DzLineEdit as any).Password ?? 2
+        return this
+    }
+
+    placeholder(text: string): this {
+        this.widget.placeholderText = text
+        return this
+    }
+
+    focus(): this {
+        this.widget.getWidget().setFocus()
+        return this
+    }
+
+    validator(validator: InputValidator | null): this {
+        if (validator === null) return this
+        this.inputValidator = validator
+        let settings = new DzSettings()
+        settings.setStringValue("validator", InputValidator[validator]);
+        this.widget.setValidator(settings)
+        return this
+    }
+
+    /**
+     * Sets the min value of the input when validator is set to in or float
+     * @param minValue
+     * @returns
+     */
+    min(minValue: number): this {
+        this.minValue = minValue
+        return this
+    }
+
+    /**
+     * Sets the max value of the input when validator is set to in or float
+     * @param maxValue
+     * @returns
+     */
+    max(maxValue: number): this {
+        this.maxValue = maxValue
+        return this
+    }
+
+    /**
+     * Clamps the input to min and max values. Only works when validator is set to int or float
+     * @param min
+     * @param max
+     * @returns
+     */
+    clamp(min: number, max: number): this {
+        return this.min(min).max(max)
+    }
+
+    readOnly(onOff?: Observable<boolean> | null): this {
+        if (onOff == null) {
+            this.widget.readOnly = true
+            return this
+        }
+        else {
+            this.widget.readOnly = onOff.value
+            onOff.connect((value) => {
+                this.widget.readOnly = value
+            })
+        }
+        return this
+    }
+
+    value(text_: string | Observable<string>): this {
+        if (typeof text_ === 'string') {
+            this.widget.text = text_
+        }
+        else if (text_ instanceof Observable) {
+            this.widget.text = text_.value;
+            this.widget.textChanged.scriptConnect((text: string) => {
+                text_.value = this.clampValue(text);
+            });
+            text_.connect((text: string) => {
+                this.widget.text = text;
+            });
+        }
+
+        return this;
+    }
+
+    private clampValue(text: string): string {
+        if (this.inputValidator === InputValidator.int || this.inputValidator === InputValidator.float) {
+            let value = Number(text);
+            if (!isNaN(value)) {
+                if (this.minValue !== undefined) {
+                    value = Math.max(value, this.minValue);
+                }
+                if (this.maxValue !== undefined) {
+                    value = Math.min(value, this.maxValue);
+                }
+                return String(value);
+            }
+        }
+        else if (this.maxValue && text.length > this.maxValue)
+            text = text[this.maxValue]
+
+        return text;
+    }
+
+
+    build(then?: (lineEdit: DzLineEdit) => void): DzLineEdit {
+        then?.(this.widget);
+        return this.widget;
+    }
+}