[haiku-commits] r35462 - haiku/trunk/src/tests/kits/interface/picture
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 14 Feb 2010 23:29:29 +0100 (CET)
Author: axeld
Date: 2010-02-14 23:29:29 +0100 (Sun, 14 Feb 2010)
New Revision: 35462
Changeset: http://dev.haiku-os.org/changeset/35462/haiku
Modified:
haiku/trunk/src/tests/kits/interface/picture/PictureTest.cpp
Log:
* Fixed artwork directory.
Modified: haiku/trunk/src/tests/kits/interface/picture/PictureTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/picture/PictureTest.cpp
2010-02-14 22:29:01 UTC (rev 35461)
+++ haiku/trunk/src/tests/kits/interface/picture/PictureTest.cpp
2010-02-14 22:29:29 UTC (rev 35462)
@@ -1,12 +1,17 @@
#include <Application.h>
#include <Box.h>
+#include <Entry.h>
+#include <FindDirectory.h>
+#include <Path.h>
#include <Picture.h>
#include <Shape.h>
#include <View.h>
#include <Window.h>
+
#include "SVGViewView.h"
+
class Svg2PictureWindow : public BWindow {
public:
Svg2PictureWindow(BRect frame, const char *filename)
@@ -17,6 +22,7 @@
}
};
+
class OriginalView : public BBox {
public:
OriginalView(BRect frame);
@@ -137,6 +143,7 @@
message2.PrintToStream();
}
+
void
PictureView::Draw(BRect update)
{
@@ -145,18 +152,18 @@
}
-// 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 @@
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;
}
Other related posts:
- » [haiku-commits] r35462 - haiku/trunk/src/tests/kits/interface/picture - axeld
