From 7d917369a4c5ebecd4b2a345d052b3b60accd4ed Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 10 Oct 2008 15:33:54 +0000 Subject: [PATCH] Minor fixes/improvements --- .../wx/bbs/appli/exampleSimpleLayoutTDown.bbs | 4 +- .../wx/bbs/appli/exampleSimpleLayoutTLeft.bbs | 2 +- .../bbs/appli/exampleSimpleLayoutTRight.bbs | 2 +- .../wx/bbs/appli/exampleSimpleLayoutTUp.bbs | 2 +- .../wx/bbs/appli/exampleSimpleLayoutX4.bbs | 27 +++++++++ packages/wx/bbs/boxes/bbLayoutX4.bbs | 58 +++++++++++++++++++ 6 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 packages/wx/bbs/appli/exampleSimpleLayoutX4.bbs create mode 100644 packages/wx/bbs/boxes/bbLayoutX4.bbs diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs index 344e48f..5b5eacc 100644 --- a/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs +++ b/packages/wx/bbs/appli/exampleSimpleLayoutTDown.bbs @@ -1,7 +1,6 @@ -/* description "Simple test of wx::LayoutTDown widgets" author "jean-pierre.roux@creatis.univ-lyon1.fr" -category "example" +category "example, wx" load std include wx @@ -22,4 +21,3 @@ connect s2.Widget main.Widget2 connect s3.Widget main.Widget3 exec main -*/ diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs index 9f216f0..1dec6cb 100644 --- a/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs +++ b/packages/wx/bbs/appli/exampleSimpleLayoutTLeft.bbs @@ -1,6 +1,6 @@ description "Simple test of wx::LayoutTLeft widgets" author "jean-pierre.roux@creatis.univ-lyon1.fr" -category "example" +category "example, wx" load std include wx diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs index 145189f..e3b19e8 100644 --- a/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs +++ b/packages/wx/bbs/appli/exampleSimpleLayoutTRight.bbs @@ -1,6 +1,6 @@ description "Simple test of wx::LayoutTRight widgets" author "jean-pierre.roux [at] creatis [dot] univ [dash] lyon1 [dot] fr" -category "example" +category "example, wx" load std include wx diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs index 26e5e83..5bc69c7 100644 --- a/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs +++ b/packages/wx/bbs/appli/exampleSimpleLayoutTUp.bbs @@ -1,6 +1,6 @@ description "Simple test of wx::LayoutTUp widgets" author "jean-pierre.roux@creatis.univ-lyon1.fr" -category "example" +category "example, wx" load std include wx diff --git a/packages/wx/bbs/appli/exampleSimpleLayoutX4.bbs b/packages/wx/bbs/appli/exampleSimpleLayoutX4.bbs new file mode 100644 index 0000000..b1b516a --- /dev/null +++ b/packages/wx/bbs/appli/exampleSimpleLayoutX4.bbs @@ -0,0 +1,27 @@ +description "Simple test of wx::LayoutX4 widgets" +author "jean-pierre.roux@creatis.univ-lyon1.fr" +category "example" + +load std +include wx + +new LayoutX4 main + +new Slider s1 + set s1.Title "SliderUpLeft" + +new Slider s2 + set s2.Title "SliderUpRight" + +new Slider s3 + set s3.Title "SliderDownLeft" + +new Slider s4 + set s4.Title "SliderDownRight" + +connect s1.Widget main.Widget1 +connect s2.Widget main.Widget2 +connect s3.Widget main.Widget3 +connect s3.Widget main.Widget4 + +exec main diff --git a/packages/wx/bbs/boxes/bbLayoutX4.bbs b/packages/wx/bbs/boxes/bbLayoutX4.bbs new file mode 100644 index 0000000..750274d --- /dev/null +++ b/packages/wx/bbs/boxes/bbLayoutX4.bbs @@ -0,0 +1,58 @@ + +load std +load wx +// --------------- +// | | | +// | W1 | W2 | +// |-------------| +// | | | +// | W3 | W4 | +// --------------- + +define LayoutX4 wx + +description "Creates a '+ like' complex container : {UpLeft, UpRight} {DownLeft, DownRigth} " +author "jean-pierre.roux@creatis.univ-lyon1.fr" +category "complex box, widget" + +new LayoutSplit currentBox + set currentBox.Orientation V + +new LayoutSplit up + set up.Orientation H + +new LayoutSplit down + set Down.Orientation H + + connect upLeft.Widget currentBox.Widget1 + connect upRight.Widget currentBox.Widget2 + + connect upLeft.Widget up.Widget1 + connect upRight.Widget up.Widget2 + + connect downLeft.Widget down.Widget1 + connect downRight.Widget down.Widget2 + +new MultipleInputs m + connect currentBox.BoxChange m.In1 + connect upLeft.BoxChange m.In2 + connect upRight.BoxChange m.In3 + connect downLeft.BoxChange m.In5 + connect downRight.BoxChange m.In5 + + input WinTitle currentBox.WinTitle "Title of the window (*)" + input WinHeight currentBox.WinHeight "Height of the window (*)" + input WinHide currentBox.WinHide "Any signal received hides the window (*)" + input WinClose currentBox.WinClose "Any signal received closes the window (*)" + input WinWidth currentBox.WinWidth "Width of the window (* : only used if the widget is not connected to a Layout box)" + + input Widget1 up.Widget1 "UpLeft container" + input Widget2 up.Widget2 "UpRight container" + input Widget3 currentBox.Widget2 "DownLeft container" + input Widget4 currentBox.Widget4 "DownRight container" + output Widget currentBox.Widget "Widget" + + output BoxChange m.Out "BoxChange" + +endefine + -- 2.45.0