Localization of screensavers. Fixes #7326.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40848 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/screen_savers/butterfly/Butterfly.cpp

@@ -13,11 +13,15 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include <Catalog.h>
 #include <OS.h>
 #include <View.h>
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Screensaver Butterfly"
+
 
 extern "C" BScreenSaver*
 instantiate_screen_saver(BMessage* archive, image_id imageId)
@@ -40,7 +44,7 @@ void
 Butterfly::StartConfig(BView* view)
 {
 	BPrivate::BuildScreenSaverDefaultSettingsView(view, "Butterfly",
-		"by Geoffry Song");
+		B_TRANSLATE("by Geoffry Song"));
 }
 
 
@@ -162,4 +166,3 @@ Butterfly::_Iterate()
 	fBase += 0.05f;
 	return p;
 }
-

src/add-ons/screen_savers/butterfly/Butterfly.rdef

@@ -0,0 +1,15 @@
+/*
+ * Butterfly.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-ButterflyScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver Butterfly"
+};

src/add-ons/screen_savers/butterfly/Jamfile

@@ -3,7 +3,15 @@ SubDir HAIKU_TOP src add-ons screen_savers butterfly ;
 UsePrivateHeaders screen_saver ;
 	# For BuildScreenSaverDefaultSettingsView
 
-ScreenSaver Butterfly :
+AddResources Butterfly : Butterfly.rdef ;
-	Butterfly.cpp : 
-	be screensaver $(TARGET_LIBSUPC++) ;
 
+ScreenSaver Butterfly :
+	Butterfly.cpp
+	: be screensaver $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+;
+
+DoCatalogs Butterfly :
+	x-vnd.Haiku-ButterflyScreensaver
+	:
+	Butterfly.cpp	
+;

src/add-ons/screen_savers/debugnow/DebugNow.cpp

@@ -7,6 +7,7 @@
  */
 
 
+#include <Catalog.h>
 #include <Font.h>
 #include <ScreenSaver.h>
 #include <StringView.h>
@@ -14,6 +15,9 @@
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Screensaver DebugNow"
+
 
 const rgb_color kMediumBlue = {0, 0, 100};
 const rgb_color kWhite = {255, 255, 255};
@@ -56,7 +60,7 @@ void
 DebugNow::StartConfig(BView *view) 
 {
 	BPrivate::BuildScreenSaverDefaultSettingsView(view, "DEBUG NOW",
-		"by Ryan Leavengood");
+		B_TRANSLATE("by Ryan Leavengood"));
 } 
 
 

src/add-ons/screen_savers/debugnow/DebugNow.rdef

@@ -0,0 +1,15 @@
+/*
+ * DebugNow.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-DebugNowScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver DebugNow"
+};

src/add-ons/screen_savers/debugnow/Jamfile

@@ -5,7 +5,15 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 UsePrivateHeaders screen_saver ;
 	# For BuildScreenSaverDefaultSettingsView
 
+AddResources Butterfly : DebugNow.rdef ;
+
 ScreenSaver DebugNow :
 	DebugNow.cpp : 
-	be libscreensaver.so $(TARGET_LIBSUPC++) ;
+	be libscreensaver.so $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+;
 
+DoCatalogs DebugNow :
+	x-vnd.Haiku-DebugNowScreensaver
+	:
+	DebugNow.cpp	
+;

src/add-ons/screen_savers/haiku/Jamfile

@@ -5,8 +5,15 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 UsePrivateHeaders screen_saver ;
 	# For BuildScreenSaverDefaultSettingsView
 
+AddResources Haiku : ScreenSaver.rdef ;
+
 Addon Haiku :
 	ScreenSaver.cpp
-	: be screensaver $(TARGET_LIBSUPC++)
+	: be screensaver $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
 ;
 
+DoCatalogs Haiku :
+	x-vnd.Haiku-HaikuScreensaver
+	:
+	ScreenSaver.cpp	
+;

src/add-ons/screen_savers/haiku/ScreenSaver.cpp

@@ -8,14 +8,20 @@
 ** This file may be used under the terms of the MIT License.
 */
 
-#include <ScreenSaver.h>
+
-#include <View.h>
-#include <StringView.h>
-#include <Font.h>
 #include <stdlib.h>
 
+#include <Catalog.h>
+#include <Font.h>
+#include <ScreenSaver.h>
+#include <StringView.h>
+#include <View.h>
+
 #include <BuildScreenSaverDefaultSettingsView.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Screensaver Haiku"
+
 
 class ScreenSaver : public BScreenSaver
 {
@@ -56,7 +62,7 @@ void
 ScreenSaver::StartConfig(BView *view) 
 { 
 	BPrivate::BuildScreenSaverDefaultSettingsView(view, "Haiku",
-		"by Marcus Overhagen");
+		B_TRANSLATE("by Marcus Overhagen"));
 } 
 
 

src/add-ons/screen_savers/haiku/ScreenSaver.rdef

@@ -0,0 +1,15 @@
+/*
+ * ScreenSaver.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-HaikuScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver Haiku"
+};

src/add-ons/screen_savers/icons/Icons.rdef

@@ -0,0 +1,15 @@
+/*
+ * Icons.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-IconsScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver Icons"
+};

src/add-ons/screen_savers/icons/IconsSaver.cpp

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <MimeType.h>
 #include <StringView.h>
 
@@ -17,6 +18,9 @@
 
 #include "IconDisplay.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Screensaver Icons"
+
 
 #define MAX_ICONS 15
 #define MAX_SIZE 20 // In percentage of the screen width
@@ -186,6 +190,6 @@ void
 IconsSaver::StartConfig(BView* view)
 {
 	BPrivate::BuildScreenSaverDefaultSettingsView(view, "Icons",
-		"by Vincent Duvert");
+		B_TRANSLATE("by Vincent Duvert"));
 }
 

src/add-ons/screen_savers/icons/Jamfile

@@ -3,7 +3,15 @@ SubDir HAIKU_TOP src add-ons screen_savers icons ;
 UsePrivateHeaders screen_saver ;
 	# For BuildScreenSaverDefaultSettingsView
 
+AddResources Icons : Icons.rdef ;
+
 ScreenSaver Icons :
 	IconDisplay.cpp IconsSaver.cpp :
-	be libscreensaver.so $(TARGET_LIBSUPC++)
+	be libscreensaver.so $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+;
+
+DoCatalogs Icons :
+	x-vnd.Haiku-IconsScreensaver
+	:
+	IconsSaver.cpp	
 ;

src/add-ons/screen_savers/ifs/IFS.rdef

@@ -0,0 +1,15 @@
+/*
+ * IFS.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-IFSScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver IFS"
+};

src/add-ons/screen_savers/ifs/IFSSaver.cpp

@@ -1,14 +1,20 @@
 // IFSSaver.cpp
 
+
 #include <math.h>
 #include <stdio.h>
 
+#include <Catalog.h>
 #include <CheckBox.h>
 #include <Slider.h>
 #include <TextView.h>
 
 #include "IFSSaver.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Screensaver IFS"
+
+
 enum {
 	MSG_TOGGLE_ADDITIVE		= 'tgad',
 	MSG_SET_SPEED			= 'stsp',
@@ -62,7 +68,7 @@ IFSSaver::StartConfig(BView *view)
 
 	// the additive check box
 	fAdditiveCB = new BCheckBox(frame, "additive setting",
-								"Render dots additive",
+								B_TRANSLATE("Render dots additive"),
 								new BMessage(MSG_TOGGLE_ADDITIVE),
 								B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
 
@@ -76,7 +82,7 @@ IFSSaver::StartConfig(BView *view)
 
 	// the additive check box
 	fSpeedS = new BSlider(frame, "speed setting",
-						  "Morphing speed:",
+						  B_TRANSLATE("Morphing speed:"),
 						  new BMessage(MSG_SET_SPEED),
 						  1, 12, B_BLOCK_THUMB,
 						  B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM);
@@ -97,10 +103,10 @@ IFSSaver::StartConfig(BView *view)
 	BTextView* textView = new BTextView(bounds, B_EMPTY_STRING, textRect,
 										B_FOLLOW_ALL, B_WILL_DRAW);
 	textView->SetViewColor(view->ViewColor());
-	textView->Insert("Iterated Function System\n\n"
+	textView->Insert(B_TRANSLATE("Iterated Function System\n\n"
 					 ""B_UTF8_COPYRIGHT" 1997 Massimino Pascal\n\n"
 					 "xscreensaver port by Stephan Aßmus\n"
-					 "<[email protected]>");
+					 "<[email protected]>"));
 
 
 	textView->SetStylable(true);

src/add-ons/screen_savers/ifs/Jamfile

@@ -2,10 +2,17 @@ SubDir HAIKU_TOP src add-ons screen_savers ifs ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+AddResources IFS : IFS.rdef ;
+
 ScreenSaver IFS :
 	IFS.cpp
 	IFSSaver.cpp
 
-	: be libscreensaver.so $(TARGET_LIBSUPC++)
+	: be libscreensaver.so $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
 ;
 
+DoCatalogs IFS :
+	x-vnd.Haiku-IFSScreensaver
+	:
+	IFSSaver.cpp	
+;

src/add-ons/screen_savers/leaves/Jamfile

@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src add-ons screen_savers leaves ;
 
+AddResources Leaves : Leaves.rdef ;
+
 ScreenSaver Leaves :
 	Leaves.cpp :
 	be screensaver $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
@@ -10,4 +12,3 @@ DoCatalogs Leaves :
 	:
 	Leaves.cpp
 ;
-

src/add-ons/screen_savers/leaves/Leaves.rdef

@@ -0,0 +1,15 @@
+/*
+ * Leaves.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-LeavesScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver Leaves"
+};

src/add-ons/screen_savers/message/Jamfile

@@ -7,12 +7,19 @@ UsePrivateHeaders shared ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+AddResources Message : Message.rdef ;
+
 ScreenSaver Message :
 	Message.cpp : 
-	be libscreensaver.so $(TARGET_LIBSUPC++) ;
+	be libscreensaver.so $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) ;
 
 Package haiku-screensaverkit-cvs :
 	Message :
 	boot home config add-ons Screen\ Savers
 ;
 
+DoCatalogs Message :
+	x-vnd.Haiku-MessageScreensaver
+	:
+	Message.cpp	
+;

src/add-ons/screen_savers/message/Message.cpp

@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <Font.h>
 #include <ObjectList.h>
 #include <Picture.h>
@@ -23,6 +24,10 @@
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Screensaver Message"
+
+
 // Double brackets to satisfy a compiler warning
 const pattern kCheckered = { { 0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0x33, 0x33 } };
 
@@ -43,7 +48,7 @@ BString *get_message()
 
 	// Just in case
 	if (result->Length() <= 0) {
-		result->Append("Insert clever anecdote or phrase here!");
+		result->Append(B_TRANSLATE("Insert clever anecdote or phrase here!"));
 	}
 
 	return result;
@@ -126,7 +131,7 @@ void
 Message::StartConfig(BView *view) 
 { 
 	BPrivate::BuildScreenSaverDefaultSettingsView(view, "Message",
-		"by Ryan Leavengood");
+		B_TRANSLATE("by Ryan Leavengood"));
 } 
 
 

src/add-ons/screen_savers/message/Message.rdef

@@ -0,0 +1,15 @@
+/*
+ * Message.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-MessageScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver Message"
+};

src/add-ons/screen_savers/spider/Jamfile

@@ -2,11 +2,18 @@ SubDir HAIKU_TOP src add-ons screen_savers spider ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+AddResources Spider : Spider.rdef ;
+
 ScreenSaver Spider :
 	Polygon.cpp
 	PolygonQueue.cpp
 	SpiderSaver.cpp
 
-	: be libscreensaver.so $(TARGET_LIBSUPC++)
+	: be libscreensaver.so $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
 ;
 
+DoCatalogs Spider :
+	x-vnd.Haiku-SpiderScreensaver
+	:
+	SpiderSaver.cpp	
+;

src/add-ons/screen_savers/spider/Spider.rdef

@@ -0,0 +1,15 @@
+/*
+ * Spider.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-SpiderScreensaver";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = 0,
+	internal = 0,
+	short_info = "1.0.0",
+	long_info = "Screensaver Spider"
+};

src/add-ons/screen_savers/spider/SpiderSaver.cpp

@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <Message.h>
 #include <Menu.h>
 #include <MenuField.h>
@@ -23,6 +24,9 @@
 #include "Polygon.h"
 #include "PolygonQueue.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Screensaver Spider"
+
 enum {
 	MSG_QUEUE_NUMBER			= 'qunm',
 	MSG_POLY_NUMBER				= 'plnm',
@@ -92,8 +96,7 @@ void
 SpiderSaver::StartConfig(BView *view)
 {
 	SpiderView* configView = new SpiderView(view->Bounds(), this,
-											fQueueNumber, fMaxPolyPoints,
+		fQueueNumber, fMaxPolyPoints, fMaxQueueDepth, fColor);
-											fMaxQueueDepth, fColor);
 	view->AddChild(configView);
 }
 
@@ -334,7 +337,8 @@ SpiderView::SpiderView(BRect frame, SpiderSaver* saver,
 	be_bold_font->GetHeight(&fh);
 	float fontHeight = fh.ascent + fh.descent + 5.0;
 	frame.bottom = frame.top + fontHeight;
-	BStringView* title = new BStringView(frame, B_EMPTY_STRING, "Spider by stippi");
+	BStringView* title = new BStringView(frame, B_EMPTY_STRING,
+		B_TRANSLATE("Spider by stippi"));
 	title->SetFont(be_bold_font);
 	AddChild(title);
 
@@ -342,7 +346,7 @@ SpiderView::SpiderView(BRect frame, SpiderSaver* saver,
 	fontHeight = fh.ascent + fh.descent + 5.0;
 	frame.top = frame.bottom;
 	frame.bottom = frame.top + fontHeight;
-	title = new BStringView(frame, B_EMPTY_STRING, "for  bonefish");
+	title = new BStringView(frame, B_EMPTY_STRING, B_TRANSLATE("for  bonefish"));
 	BFont font(be_plain_font);
 	font.SetShear(110.0);
 	title->SetFont(&font);
@@ -353,70 +357,69 @@ SpiderView::SpiderView(BRect frame, SpiderSaver* saver,
 	frame.top = 10.0;
 	frame.bottom = frame.top + viewHeight;
 	frame.OffsetBy(0.0, viewHeight);
-	fQueueNumberS = new BSlider(frame, "queue number", "Max. polygon count",
+	fQueueNumberS = new BSlider(frame, "queue number",
-								new BMessage(MSG_QUEUE_NUMBER),
+		B_TRANSLATE("Max. polygon count"), new BMessage(MSG_QUEUE_NUMBER),
 		1, MAX_QUEUE_NUMBER);
 	fQueueNumberS->SetHashMarks(B_HASH_MARKS_BOTTOM);
 	fQueueNumberS->SetHashMarkCount((MAX_QUEUE_NUMBER - 1) / 2 + 1);
 	fQueueNumberS->SetValue(queueNumber);
 	AddChild(fQueueNumberS);
 	frame.OffsetBy(0.0, viewHeight);
-	fPolyNumberS = new BSlider(frame, "poly points", "Max. points per polygon",
+	fPolyNumberS = new BSlider(frame, "poly points",
-								new BMessage(MSG_POLY_NUMBER),
+		B_TRANSLATE("Max. points per polygon"), new BMessage(MSG_POLY_NUMBER),
 		MIN_POLY_POINTS, MAX_POLY_POINTS);
 	fPolyNumberS->SetHashMarks(B_HASH_MARKS_BOTTOM);
 	fPolyNumberS->SetHashMarkCount(MAX_POLY_POINTS - MIN_POLY_POINTS + 1);
 	fPolyNumberS->SetValue(maxPolyPoints);
 	AddChild(fPolyNumberS);
 	frame.OffsetBy(0.0, viewHeight);
-	fQueueDepthS = new BSlider(frame, "queue depth", "Trail depth",
+	fQueueDepthS = new BSlider(frame, "queue depth", B_TRANSLATE("Trail depth"),
-								new BMessage(MSG_QUEUE_DEPTH),
+		new BMessage(MSG_QUEUE_DEPTH), MIN_QUEUE_DEPTH, MAX_QUEUE_DEPTH);
-								MIN_QUEUE_DEPTH, MAX_QUEUE_DEPTH);
 	fQueueDepthS->SetHashMarks(B_HASH_MARKS_BOTTOM);
 	fQueueDepthS->SetHashMarkCount((MAX_QUEUE_DEPTH - MIN_QUEUE_DEPTH) / 4 + 1);
 	fQueueDepthS->SetValue(maxQueueDepth);
 	AddChild(fQueueDepthS);
 
-	BMenu* menu = new BMenu("Color");
+	BMenu* menu = new BMenu(B_TRANSLATE("Color"));
 	BMessage* message = new BMessage(MSG_COLOR);
 	message->AddInt32("color", RED);
-	BMenuItem* item = new BMenuItem("Red", message);
+	BMenuItem* item = new BMenuItem(B_TRANSLATE("Red"), message);
 	if (color == RED)
 		item->SetMarked(true);
 	menu->AddItem(item);
 	message = new BMessage(MSG_COLOR);
 	message->AddInt32("color", GREEN);
-	item = new BMenuItem("Green", message);
+	item = new BMenuItem(B_TRANSLATE("Green"), message);
 	if (color == GREEN)
 		item->SetMarked(true);
 	menu->AddItem(item);
 	message = new BMessage(MSG_COLOR);
 	message->AddInt32("color", BLUE);
-	item = new BMenuItem("Blue", message);
+	item = new BMenuItem(B_TRANSLATE("Blue"), message);
 	if (color == BLUE)
 		item->SetMarked(true);
 	menu->AddItem(item);
 	message = new BMessage(MSG_COLOR);
 	message->AddInt32("color", YELLOW);
-	item = new BMenuItem("Yellow", message);
+	item = new BMenuItem(B_TRANSLATE("Yellow"), message);
 	if (color == YELLOW)
 		item->SetMarked(true);
 	menu->AddItem(item);
 	message = new BMessage(MSG_COLOR);
 	message->AddInt32("color", PURPLE);
-	item = new BMenuItem("Purple", message);
+	item = new BMenuItem(B_TRANSLATE("Purple"), message);
 	if (color == PURPLE)
 		item->SetMarked(true);
 	menu->AddItem(item);
 	message = new BMessage(MSG_COLOR);
 	message->AddInt32("color", CYAN);
-	item = new BMenuItem("Cyan", message);
+	item = new BMenuItem(B_TRANSLATE("Cyan"), message);
 	if (color == CYAN)
 		item->SetMarked(true);
 	menu->AddItem(item);
 	message = new BMessage(MSG_COLOR);
 	message->AddInt32("color", GRAY);
-	item = new BMenuItem("Gray", message);
+	item = new BMenuItem(B_TRANSLATE("Gray"), message);
 	if (color == GRAY)
 		item->SetMarked(true);
 	menu->AddItem(item);
@@ -425,8 +428,8 @@ SpiderView::SpiderView(BRect frame, SpiderSaver* saver,
 	menu->SetRadioMode(true);
 
 	frame.OffsetBy(0.0, viewHeight);
-	fColorMF = new BMenuField(frame, "color", "Color", menu);
+	fColorMF = new BMenuField(frame, "color", B_TRANSLATE("Color"), menu);
-	fColorMF->SetDivider(fColorMF->StringWidth("Color") + 5.0);
+	fColorMF->SetDivider(fColorMF->StringWidth(B_TRANSLATE("Color")) + 5.0);
 	AddChild(fColorMF);
 }