From 0ad63be48d354138374fd90ea2295eb5bb239a14 Mon Sep 17 00:00:00 2001 From: koldo Date: Sat, 18 May 2013 22:30:54 +0000 Subject: [PATCH] .ScatterCtrl_Demo: Small change git-svn-id: svn://ultimatepp.org/upp/trunk@6081 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay | 4 ++-- examples/ScatterCtrl_Demo/main.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay index ab8446b1d..25d22ee17 100644 --- a/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay +++ b/examples/ScatterCtrl_Demo/ScatterCtrl_Demo.lay @@ -7,7 +7,7 @@ LAYOUT(ScatterCtrl_Demo, 624, 352) ITEM(DropList, paintMode, LeftPosZ(4, 172).BottomPosZ(77, 19)) ITEM(Label, dv___6, SetLabel(t_("Painting Mode")).LeftPosZ(4, 172).BottomPosZ(97, 19)) ITEM(ArrayCtrl, examplesList, LeftPosZ(4, 168).VSizePosZ(28, 124)) - ITEM(Label, dv___8, SetLabel(t_("Choose example")).LeftPosZ(4, 152).TopPosZ(4, 21)) + ITEM(Label, dv___8, SetLabel(t_("Choose example")).LeftPosZ(4, 168).TopPosZ(4, 21)) END_LAYOUT LAYOUT(Tab1, 380, 292) @@ -71,7 +71,7 @@ LAYOUT(Tab11, 504, 468) END_LAYOUT LAYOUT(TabPie, 536, 440) - ITEM(PieCtrl, chart, SetLegendHeight(80).SetLegendBackColor(Color(229, 229, 229)).SetTitle(t_("Average Weather")).SetFrame(ThinInsetFrame()).HSizePosZ(8, 12).VSizePosZ(40, 12)) + ITEM(PieCtrl, chart, SetLegendBackColor(Color(229, 229, 229)).SetLegendHeight(80).SetTitle(t_("Average Weather")).SetFrame(ThinInsetFrame()).HSizePosZ(8, 12).VSizePosZ(40, 12)) ITEM(Label, dv___1, SetLabel(t_(" EXPERIMENTAL")).SetFrame(ThinInsetFrame()).LeftPosZ(8, 84).TopPosZ(8, 24)) END_LAYOUT diff --git a/examples/ScatterCtrl_Demo/main.cpp b/examples/ScatterCtrl_Demo/main.cpp index 48c14d873..a1181cff0 100644 --- a/examples/ScatterCtrl_Demo/main.cpp +++ b/examples/ScatterCtrl_Demo/main.cpp @@ -44,6 +44,7 @@ ScatterCtrl_Demo::ScatterCtrl_Demo() for (int i = 0; i < Examples().GetCount(); ++i) Examples()[i].ctrl()->Init(); + examplesList.NoHorzGrid().NoVertGrid(); examplesList.AddColumn("Example name"); for (int i = 0; i < Examples().GetCount(); ++i) { examplesList.Add(Examples()[i].name); @@ -109,14 +110,14 @@ void ScatterCtrl_Demo::SavePNG() { int ntab = examplesList.GetCursor(); - Examples()[ntab].ctrl()->Scatter().SaveToFile(Format("scatter%d.png", ntab)); + Examples()[ntab].ctrl()->Scatter().SaveToFile(AppendFileName(GetDesktopFolder(), Format("scatter%d.png", ntab))); } void ScatterCtrl_Demo::SaveJPG() { int ntab = examplesList.GetCursor(); - Examples()[ntab].ctrl()->Scatter().SaveToFile(Format("scatter%d.jpg", ntab)); + Examples()[ntab].ctrl()->Scatter().SaveToFile(AppendFileName(GetDesktopFolder(), Format("scatter%d.jpg", ntab))); } #ifdef PLATFORM_WIN32 @@ -124,7 +125,7 @@ void ScatterCtrl_Demo::SaveEMF() { int ntab = examplesList.GetCursor(); - Examples()[ntab].ctrl()->Scatter().SaveAsMetafile(Format("scatter%d.emf", ntab)); + Examples()[ntab].ctrl()->Scatter().SaveAsMetafile(AppendFileName(GetDesktopFolder(), Format("scatter%d.emf", ntab))); } #endif