From c74c1937c667fd67b7a45efe55e75a452fbe6e03 Mon Sep 17 00:00:00 2001 From: koldo Date: Fri, 11 Oct 2013 19:55:57 +0000 Subject: [PATCH] .Controls4U_demo: Minor diffs git-svn-id: svn://ultimatepp.org/upp/trunk@6417 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/Controls4U_Demo/Controls4U_Demo.lay | 20 ++++++++++---------- bazaar/Controls4U_Demo/Controls4U_Demo.upp | 3 +-- bazaar/Controls4U_Demo/Controls4U_Demo_win.h | 1 - bazaar/Controls4U_Demo/init | 1 - bazaar/Controls4U_Demo/main_win.cpp | 1 + 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/bazaar/Controls4U_Demo/Controls4U_Demo.lay b/bazaar/Controls4U_Demo/Controls4U_Demo.lay index 2aa7356c6..d3b8c254c 100644 --- a/bazaar/Controls4U_Demo/Controls4U_Demo.lay +++ b/bazaar/Controls4U_Demo/Controls4U_Demo.lay @@ -42,10 +42,10 @@ END_LAYOUT LAYOUT(Meter, 536, 492) ITEM(Meter, meter5, SetPeak(100).SetAngleBegin(180).SetAngleEnd(0).SetColorType(1).SetFrame(InsetFrame()).LeftPosZ(136, 128).TopPosZ(184, 80)) - ITEM(Meter, meter3, SetText(t_("VU Meter")).SetAngleBegin(210).SetAngleEnd(0).ClockWise(false).SetColorType(1).SetFrame(InsetFrame()).LeftPosZ(136, 128).TopPosZ(4, 80)) + ITEM(Meter, meter3, SetAngleBegin(210).SetColorType(1).SetText(t_("VU Meter")).SetAngleEnd(0).ClockWise(false).SetFrame(InsetFrame()).LeftPosZ(136, 128).TopPosZ(4, 80)) ITEM(Meter, meter4, SetPeak(100).SetAngleBegin(180).SetAngleEnd(0).SetFrame(InsetFrame()).LeftPosZ(4, 128).TopPosZ(184, 80)) ITEM(Meter, meter2, SetText(t_("VU Meter")).SetAngleBegin(180).SetFrame(InsetFrame()).LeftPosZ(4, 128).TopPosZ(4, 80)) - ITEM(Meter, meter1, SetPeak(100).SetStep(10).SetAngleBegin(240).SetAngleEnd(300).SetColorType(1).SetFrame(InsetFrame()).LeftPosZ(276, 244).TopPosZ(16, 236)) + ITEM(Meter, meter1, SetStep(10).SetColorType(1).SetPeak(100).SetAngleBegin(240).SetAngleEnd(300).SetFrame(InsetFrame()).LeftPosZ(276, 244).TopPosZ(16, 236)) ITEM(DropList, knobSetStyle, LeftPosZ(276, 128).TopPosZ(460, 19)) ITEM(Label, dv___6, SetLabel(t_("SetStyle")).LeftPosZ(276, 80).TopPosZ(440, 19)) ITEM(DropList, knobColorType, LeftPosZ(276, 128).TopPosZ(332, 19)) @@ -60,9 +60,9 @@ LAYOUT(Meter, 536, 492) ITEM(Label, dv___16, SetLabel(t_("Move Knobs to change Meters value and change\nthe properties of main Meter.\nMeter handle is moved using multitasking and it is\nnot affected by window moving or resizing.")).LeftPosZ(8, 252).TopPosZ(424, 56)) ITEM(Label, dv___17, SetLabel(t_("Meter")).SetFont(StdFont().Bold()).LeftPosZ(8, 252).TopPosZ(404, 19)) ITEM(StaticImage, back, SetFit(3).UseAsBackground(true).LeftPosZ(4, 64).TopPosZ(364, 40)) - ITEM(Knob, knob5, SetColorType(3).SetNumber(false).SetMark(2).SetAngleBegin(180).SetAngleEnd(0).LeftPosZ(156, 88).TopPosZ(268, 88)) + ITEM(Knob, knob5, SetNumber(false).SetAngleEnd(0).SetColorType(3).SetMark(2).SetAngleBegin(180).LeftPosZ(156, 88).TopPosZ(268, 88)) ITEM(Knob, knob4, SetColorType(2).SetNumber(false).SetAngleBegin(180).SetAngleEnd(0).LeftPosZ(24, 88).TopPosZ(268, 88)) - ITEM(Knob, knob3, SetColorType(1).SetStyle(1).SetInterlocking(true).SetMark(2).SetAngleBegin(180).SetAngleEnd(0).ClockWise(false).LeftPosZ(160, 88).TopPosZ(88, 88)) + ITEM(Knob, knob3, SetInterlocking(true).ClockWise(false).SetMark(2).SetAngleEnd(0).SetStyle(1).SetColorType(1).SetAngleBegin(180).LeftPosZ(160, 88).TopPosZ(88, 88)) ITEM(Knob, knob2, SetStyle(1).SetNumber(false).SetAngleBegin(180).SetAngleEnd(0).LeftPosZ(24, 88).TopPosZ(88, 88)) ITEM(Knob, knob1, SetColorType(3).SetMark(2).SetMinorStep(5).HSizePosZ(400, 8).VSizePosZ(284, 8)) ITEM(DropList, knobSetMark, LeftPosZ(276, 128).TopPosZ(420, 19)) @@ -78,8 +78,8 @@ LAYOUT(StaticCtrlsTest, 412, 288) ITEM(StaticFrame, dv___5, SetBackground(LtGreen).SetFrame(OutsetFrame()).LeftPosZ(320, 84).TopPosZ(8, 80)) ITEM(StaticLine, dv___6, SetWidth(8).SetOrientation("/").SetColor(Color(28, 85, 200)).LeftPosZ(332, 64).TopPosZ(16, 64)) ITEM(StaticArrow, dv___7, SetWidth(2).SetEnds("<->").LeftPosZ(232, 76).TopPosZ(96, 72)) - ITEM(StaticArrow, dv___8, SetWidth(2).SetOrientation("┐_").SetEnds("<->").LeftPosZ(324, 76).TopPosZ(96, 72)) - ITEM(StaticArrow, dv___9, SetWidth(2).SetOrientation("┌┘").SetEnds("<->").LeftPosZ(320, 84).TopPosZ(100, 64)) + ITEM(StaticArrow, dv___8, SetWidth(2).SetOrientation("â”_").SetEnds("<->").LeftPosZ(324, 76).TopPosZ(96, 72)) + ITEM(StaticArrow, dv___9, SetWidth(2).SetOrientation("┌┘").SetEnds("<->").LeftPosZ(320, 84).TopPosZ(100, 64)) ITEM(StaticArrow, dv___10, SetWidth(8).SetOrientation("/").SetEnds("->").SetColor(Cyan).LeftPosZ(168, 52).TopPosZ(8, 160)) ITEM(StaticArrow, dv___11, SetWidth(6).SetEnds("->").LeftPosZ(100, 32).TopPosZ(8, 108)) ITEM(StaticArrow, dv___12, SetWidth(5).LeftPosZ(76, 24).TopPosZ(8, 108)) @@ -93,9 +93,9 @@ LAYOUT(StaticCtrlsTest, 412, 288) ITEM(StaticEllipse, dv___20, SetWidth(3).SetBackground(Color(255, 127, 0)).LeftPosZ(256, 28).TopPosZ(32, 28)) ITEM(StaticLine, dv___21, SetWidth(3).SetOrientation("\\").SetColor(Color(28, 85, 200)).LeftPosZ(332, 64).TopPosZ(16, 64)) ITEM(StaticArrow, dv___22, SetWidth(2).SetOrientation("/").SetEnds("<->").LeftPosZ(232, 76).TopPosZ(96, 72)) - ITEM(StaticArrow, dv___23, SetWidth(2).SetOrientation("└┐").SetEnds("<->").LeftPosZ(320, 84).TopPosZ(100, 64)) + ITEM(StaticArrow, dv___23, SetWidth(2).SetOrientation("â””â”").SetEnds("<->").LeftPosZ(320, 84).TopPosZ(100, 64)) ITEM(StaticLine, dv___24, SetWidth(3).SetOrientation("|").SetColor(Color(28, 85, 200)).LeftPosZ(324, 16).TopPosZ(16, 64)) - ITEM(StaticArrow, dv___25, SetWidth(2).SetOrientation("_┌").SetEnds("<->").LeftPosZ(324, 76).TopPosZ(96, 72)) + ITEM(StaticArrow, dv___25, SetWidth(2).SetOrientation("_┌").SetEnds("<->").LeftPosZ(324, 76).TopPosZ(96, 72)) ITEM(StaticArrow, dv___26, SetWidth(2).SetOrientation("\\").SetEnds("<->").LeftPosZ(232, 76).TopPosZ(96, 72)) ITEM(StaticArrow, dv___27, SetWidth(2).SetOrientation("-").SetEnds("<->").LeftPosZ(232, 76).TopPosZ(96, 72)) ITEM(StaticRectangle, dv___28, LeftPosZ(232, 76).TopPosZ(96, 72)) @@ -146,8 +146,8 @@ LAYOUT(StaticCtrls, 512, 416) ITEM(StaticEllipse, dv___4, SetWidth(4).SetColor(Color(141, 42, 0)).SetBackground(Color(170, 212, 150)).LeftPosZ(344, 116).TopPosZ(176, 76)) ITEM(StaticEllipse, dv___5, SetWidth(4).SetColor(Color(141, 42, 0)).SetBackground(Color(170, 212, 150)).LeftPosZ(200, 116).TopPosZ(176, 76)) ITEM(StaticEllipse, dv___6, SetWidth(4).SetColor(Color(141, 42, 0)).SetBackground(Color(170, 212, 150)).LeftPosZ(276, 116).TopPosZ(276, 76)) - ITEM(StaticArrow, dv___7, SetWidth(2).SetOrientation("└┐").SetEnds("->").SetColor(Color(141, 42, 0)).LeftPosZ(256, 148).TopPosZ(100, 76)) - ITEM(StaticArrow, dv___8, SetWidth(2).SetOrientation("┌┘").SetEnds("->").SetColor(Color(141, 42, 0)).LeftPosZ(108, 156).TopPosZ(100, 76)) + ITEM(StaticArrow, dv___7, SetWidth(2).SetOrientation("â””â”").SetEnds("->").SetColor(Color(141, 42, 0)).LeftPosZ(256, 148).TopPosZ(100, 76)) + ITEM(StaticArrow, dv___8, SetWidth(2).SetOrientation("┌┘").SetEnds("->").SetColor(Color(141, 42, 0)).LeftPosZ(108, 156).TopPosZ(100, 76)) ITEM(StaticArrow, dv___9, SetWidth(2).SetEnds("->").SetColor(Color(141, 42, 0)).LeftPosZ(228, 64).TopPosZ(100, 76)) ITEM(StaticRectangle, dv___10, SetWidth(4).SetColor(Color(141, 42, 0)).SetBackground(Color(170, 212, 150)).LeftPosZ(56, 116).TopPosZ(176, 76)) ITEM(StaticEllipse, dv___11, SetWidth(2).SetColor(Color(141, 42, 0)).SetBackground(Color(170, 212, 150)).LeftPosZ(16, 32).TopPosZ(376, 20)) diff --git a/bazaar/Controls4U_Demo/Controls4U_Demo.upp b/bazaar/Controls4U_Demo/Controls4U_Demo.upp index 118a7ff6a..dbaa788b3 100644 --- a/bazaar/Controls4U_Demo/Controls4U_Demo.upp +++ b/bazaar/Controls4U_Demo/Controls4U_Demo.upp @@ -4,8 +4,7 @@ uses CtrlLib, Controls4U, plugin\gif, - plugin\jpg, - plugin\tif; + plugin\jpg; file main_win.cpp, diff --git a/bazaar/Controls4U_Demo/Controls4U_Demo_win.h b/bazaar/Controls4U_Demo/Controls4U_Demo_win.h index 03c137bce..37b5f16d4 100644 --- a/bazaar/Controls4U_Demo/Controls4U_Demo_win.h +++ b/bazaar/Controls4U_Demo/Controls4U_Demo_win.h @@ -49,5 +49,4 @@ public: void SwitchOn(); }; - #endif diff --git a/bazaar/Controls4U_Demo/init b/bazaar/Controls4U_Demo/init index c49df964d..86ec0c250 100644 --- a/bazaar/Controls4U_Demo/init +++ b/bazaar/Controls4U_Demo/init @@ -4,5 +4,4 @@ #include "Controls4U/init" #include "plugin\gif/init" #include "plugin\jpg/init" -#include "plugin\tif/init" #endif diff --git a/bazaar/Controls4U_Demo/main_win.cpp b/bazaar/Controls4U_Demo/main_win.cpp index 068e9027b..38cc93cb1 100644 --- a/bazaar/Controls4U_Demo/main_win.cpp +++ b/bazaar/Controls4U_Demo/main_win.cpp @@ -258,4 +258,5 @@ void VLC_Demo::UpdateInfo() { length = FormatDouble(l/1000., 2, FD_ZERO); } + #endif