From 7c7b5df51c2b0b2111c63837328f1de4e111fbca Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Wed, 18 May 2016 15:38:17 +0300 Subject: [PATCH] Rename SwitchWidget to SwitchButton - close issue #235 --- examples/example1/src/example1.d | 10 +++++----- src/dlangui/platforms/common/startup.d | 2 +- src/dlangui/widgets/controls.d | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/example1/src/example1.d b/examples/example1/src/example1.d index a30e373e..59a97153 100644 --- a/examples/example1/src/example1.d +++ b/examples/example1/src/example1.d @@ -567,11 +567,11 @@ extern (C) int UIAppMain(string[] args) { buttons10.addChild(new TextWidget(null, "ImageTextButton widgets: "d)); buttons10.addChild(new ImageTextButton("btn5", "text-plain", "Enabled"d)); buttons10.addChild((new ImageTextButton("btn6", "folder", "Disabled"d)).enabled(false)); - buttons10.addChild(new TextWidget(null, "SwitchWidget widgets: "d)); - buttons10.addChild((new SwitchWidget("SW1")).checked(true)); - buttons10.addChild((new SwitchWidget("SW2")).checked(false)); - buttons10.addChild((new SwitchWidget("SW3")).checked(true).enabled(false)); - buttons10.addChild((new SwitchWidget("SW4")).checked(false).enabled(false)); + buttons10.addChild(new TextWidget(null, "SwitchButton widgets: "d)); + buttons10.addChild((new SwitchButton("SW1")).checked(true)); + buttons10.addChild((new SwitchButton("SW2")).checked(false)); + buttons10.addChild((new SwitchButton("SW3")).checked(true).enabled(false)); + buttons10.addChild((new SwitchButton("SW4")).checked(false).enabled(false)); layout3.addChild(buttons10); WidgetGroup buttons11 = new HorizontalLayout(); diff --git a/src/dlangui/platforms/common/startup.d b/src/dlangui/platforms/common/startup.d index adc97511..705c1351 100644 --- a/src/dlangui/platforms/common/startup.d +++ b/src/dlangui/platforms/common/startup.d @@ -311,7 +311,7 @@ void registerStandardWidgets() { mixin(registerWidgets!(FileNameEditLine, DirEditLine, //dlangui.dialogs.filedlg ComboBox, ComboEdit, //dlangui.widgets.combobox Widget, TextWidget, MultilineTextWidget, Button, ImageWidget, ImageButton, ImageCheckButton, ImageTextButton, - SwitchWidget, RadioButton, CheckBox, ScrollBar, HSpacer, VSpacer, CanvasWidget, // dlangui.widgets.controls + SwitchButton, RadioButton, CheckBox, ScrollBar, HSpacer, VSpacer, CanvasWidget, // dlangui.widgets.controls EditLine, EditBox, LogWidget,//dlangui.widgets.editors StringGridWidget, //dlangui.widgets.grid VerticalLayout, HorizontalLayout, TableLayout, FrameLayout, // dlangui.widgets.layouts diff --git a/src/dlangui/widgets/controls.d b/src/dlangui/widgets/controls.d index 22d9dd22..cafa8ea2 100644 --- a/src/dlangui/widgets/controls.d +++ b/src/dlangui/widgets/controls.d @@ -160,7 +160,7 @@ class MultilineTextWidget : TextWidget { } /// Switch (on/off) widget -class SwitchWidget : Widget { +class SwitchButton : Widget { this(string ID = null) { super(ID); styleId = STYLE_SWITCH;