From 15fd71bfffa53005e8085e4af8e5f36b6bee4024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 14 Feb 2010 22:29:29 +0000 Subject: [PATCH] * Fixed artwork directory. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35462 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kits/interface/picture/PictureTest.cpp | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/src/tests/kits/interface/picture/PictureTest.cpp b/src/tests/kits/interface/picture/PictureTest.cpp index 8740d95152..8df226f5b3 100644 --- a/src/tests/kits/interface/picture/PictureTest.cpp +++ b/src/tests/kits/interface/picture/PictureTest.cpp @@ -1,12 +1,17 @@ #include #include +#include +#include +#include #include #include #include #include + #include "SVGViewView.h" + class Svg2PictureWindow : public BWindow { public: Svg2PictureWindow(BRect frame, const char *filename) @@ -17,6 +22,7 @@ public: } }; + class OriginalView : public BBox { public: OriginalView(BRect frame); @@ -137,6 +143,7 @@ PictureView::AllAttached() message2.PrintToStream(); } + void PictureView::Draw(BRect update) { @@ -145,18 +152,18 @@ PictureView::Draw(BRect update) } -// main +// #pragma mark - + + int main() { BApplication pictureApp("application/x-vnd.picture"); + BWindow *pictureWindow = new BWindow(BRect(100, 100, 500, 400), - "BPicture test", B_TITLED_WINDOW, - B_NOT_RESIZABLE|B_NOT_ZOOMABLE|B_QUIT_ON_WINDOW_CLOSE); - - BWindow *svgWindow = new Svg2PictureWindow(BRect(300, 300, 600, 600), "/boot/beos/etc/artwork/lion.svg"); - - + "BPicture test", B_TITLED_WINDOW, + B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_QUIT_ON_WINDOW_CLOSE); + BRect rect(pictureWindow->Bounds()); rect.right -= (rect.Width() + 1) / 2; OriginalView *testView = new OriginalView(rect); @@ -166,12 +173,20 @@ main() pictureWindow->AddChild(testView); pictureWindow->AddChild(pictureView); - pictureWindow->Show(); - svgWindow->Show(); + + BPath path; + if (find_directory(B_SYSTEM_DATA_DIRECTORY, &path) == B_OK) { + path.Append("artwork/lion.svg"); + BEntry entry(path.Path()); + if (entry.Exists()) { + BWindow *svgWindow = new Svg2PictureWindow(BRect(300, 300, 600, 600), + path.Path()); + svgWindow->Show(); + } + } pictureApp.Run(); - return 0; }