From a6b6cbbcdd969d6bfac2407e87d5f7f0d7e67b5c Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Thu, 20 Jan 2011 10:54:48 +0000 Subject: [PATCH] Add Leaves screensaver localizzation. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40250 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/screen_savers/leaves/Jamfile | 11 ++++-- src/add-ons/screen_savers/leaves/Leaves.cpp | 40 +++++++++++++-------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/add-ons/screen_savers/leaves/Jamfile b/src/add-ons/screen_savers/leaves/Jamfile index 6df2c6dc72..0c6d5c3749 100644 --- a/src/add-ons/screen_savers/leaves/Jamfile +++ b/src/add-ons/screen_savers/leaves/Jamfile @@ -1,6 +1,13 @@ SubDir HAIKU_TOP src add-ons screen_savers leaves ; ScreenSaver Leaves : - Leaves.cpp : - be screensaver $(TARGET_LIBSUPC++) ; + Leaves.cpp : + be screensaver $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS) +; + +DoCatalogs Leaves : + x-vnd.Haiku-LeavesScreensaver + : + Leaves.cpp +; diff --git a/src/add-ons/screen_savers/leaves/Leaves.cpp b/src/add-ons/screen_savers/leaves/Leaves.cpp index 089e3c95c5..512296a33d 100644 --- a/src/add-ons/screen_savers/leaves/Leaves.cpp +++ b/src/add-ons/screen_savers/leaves/Leaves.cpp @@ -12,12 +12,17 @@ #include #include +#include #include #include #include #include +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Leaves" + + // path data for the leaf shape static const BPoint kLeafBegin(56.24793f, 15.46287f); static BPoint kLeafCurves[][3] = { @@ -63,8 +68,8 @@ enum { extern "C" BScreenSaver* -instantiate_screen_saver(BMessage* msg, image_id image) -{ +instantiate_screen_saver(BMessage* msg, image_id image) +{ return new Leaves(msg, image); } @@ -90,34 +95,37 @@ Leaves::Leaves(BMessage* archive, image_id id) } -void +void Leaves::StartConfig(BView* view) { BRect bounds = view->Bounds(); bounds.InsetBy(10, 10); BRect frame(0, 0, bounds.Width(), 20); - fDropRateSlider = new BSlider(frame, "drop rate", "Drop rate:", - new BMessage(MSG_SET_DROP_RATE), kMinimumDropRate, kMaximumDropRate, - B_BLOCK_THUMB, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM); + fDropRateSlider = new BSlider(frame, "drop rate", + B_TRANSLATE("Drop rate:"), new BMessage(MSG_SET_DROP_RATE), + kMinimumDropRate, kMaximumDropRate, B_BLOCK_THUMB, + B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM); fDropRateSlider->SetValue(fDropRate); fDropRateSlider->ResizeToPreferred(); bounds.bottom -= fDropRateSlider->Bounds().Height() * 1.5; fDropRateSlider->MoveTo(bounds.LeftBottom()); view->AddChild(fDropRateSlider); - fLeafSizeSlider = new BSlider(frame, "leaf size", "Leaf size:", - new BMessage(MSG_SET_LEAF_SIZE), kMinimumLeafSize, kMaximumLeafSize, - B_BLOCK_THUMB, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM); + fLeafSizeSlider = new BSlider(frame, "leaf size", + B_TRANSLATE("Leaf size:"), new BMessage(MSG_SET_LEAF_SIZE), + kMinimumLeafSize, kMaximumLeafSize, B_BLOCK_THUMB, + B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM); fLeafSizeSlider->SetValue(fLeafSize); fLeafSizeSlider->ResizeToPreferred(); bounds.bottom -= fLeafSizeSlider->Bounds().Height() * 1.5; fLeafSizeSlider->MoveTo(bounds.LeftBottom()); view->AddChild(fLeafSizeSlider); - fSizeVariationSlider = new BSlider(frame, "variation", "Size variation:", - new BMessage(MSG_SET_SIZE_VARIATION), 0, kMaximumSizeVariation, - B_BLOCK_THUMB, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM); + fSizeVariationSlider = new BSlider(frame, "variation", + B_TRANSLATE("Size variation:"), new BMessage(MSG_SET_SIZE_VARIATION), + 0, kMaximumSizeVariation, B_BLOCK_THUMB, + B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM); fSizeVariationSlider->SetValue(fSizeVariation); fSizeVariationSlider->ResizeToPreferred(); bounds.bottom -= fSizeVariationSlider->Bounds().Height() * 1.5; @@ -127,8 +135,10 @@ Leaves::StartConfig(BView* view) BTextView* textView = new BTextView(bounds, B_EMPTY_STRING, bounds.OffsetToCopy(0., 0.), B_FOLLOW_ALL, B_WILL_DRAW); textView->SetViewColor(view->ViewColor()); - textView->Insert("Leaves\n\n" - "by Deyan Genovski, Geoffry Song\n\n"); + BString text = "Leaves\n\n"; + text << B_TRANSLATE("by Deyan Genovski, Geoffry Song"); + text << "\n\n"; + textView->Insert(text.String()); textView->SetStylable(true); textView->SetFontAndColor(0, 6, be_bold_font); textView->MakeEditable(false); @@ -140,7 +150,7 @@ Leaves::StartConfig(BView* view) fDropRateSlider->SetTarget(this); fLeafSizeSlider->SetTarget(this); fSizeVariationSlider->SetTarget(this); -} +} status_t