Author: mmadia Date: 2010-05-07 02:16:18 +0200 (Fri, 07 May 2010) New Revision: 36693 Changeset: http://dev.haiku-os.org/changeset/36693/haiku Ticket: http://dev.haiku-os.org/ticket/5408 Modified: haiku/trunk/src/preferences/opengl/CapabilitiesView.cpp haiku/trunk/src/preferences/opengl/ExtensionsList.cpp haiku/trunk/src/preferences/opengl/ExtensionsView.cpp haiku/trunk/src/preferences/opengl/InfoView.cpp Log: Updated to use B_TRANSLATE* macros. relates to #5408. Modified: haiku/trunk/src/preferences/opengl/CapabilitiesView.cpp =================================================================== --- haiku/trunk/src/preferences/opengl/CapabilitiesView.cpp 2010-05-07 00:12:56 UTC (rev 36692) +++ haiku/trunk/src/preferences/opengl/CapabilitiesView.cpp 2010-05-07 00:16:18 UTC (rev 36693) @@ -30,10 +30,10 @@ { if (!view) return; - + BRect dummyRect(0, 0, 0, 0); const float kSpacer = 5; - + BString tempViewName(viewName); BStringView *nameView = new BStringView(dummyRect, tempViewName.String(), name, B_FOLLOW_NONE); @@ -63,7 +63,7 @@ CapabilitiesView::CapabilitiesView() - : BView(TR("Capabilities"), 0, NULL) + : BView(B_TRANSLATE("Capabilities"), 0, NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLayout(new BGroupLayout(B_VERTICAL)); @@ -113,82 +113,85 @@ rootView->SetLayout(new BGroupLayout(B_VERTICAL)); tempString << (int32) buffers; - AddStringView(rootView, "Buffers", TR("Auxiliary buffer(s):"), + AddStringView(rootView, "Buffers", B_TRANSLATE("Auxiliary buffer(s):"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) modelStack; - AddStringView(rootView, "ModelStack", TR("Model stack size:"), + AddStringView(rootView, "ModelStack", B_TRANSLATE("Model stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) projectionStack; - AddStringView(rootView, "ProjectionStack", TR("Projection stack size:"), - tempString.String(), true); + AddStringView(rootView, "ProjectionStack", + B_TRANSLATE("Projection stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) textureStack; - AddStringView(rootView, "TextureStack", TR("Texture stack size:"), + AddStringView(rootView, "TextureStack", B_TRANSLATE("Texture stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) nameStack; - AddStringView(rootView, "NameStack", TR("Name stack size:"), + AddStringView(rootView, "NameStack", B_TRANSLATE("Name stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) listStack; - AddStringView(rootView, "ListStack", TR("List stack size:"), + AddStringView(rootView, "ListStack", B_TRANSLATE("List stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) attribStack; - AddStringView(rootView, "AttribStack", TR("Attributes stack size:"), + AddStringView(rootView, "AttribStack", B_TRANSLATE("Attributes stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxTex3d; - AddStringView(rootView, "MaxTex3D", TR("Max. 3D texture size:"), + AddStringView(rootView, "MaxTex3D", B_TRANSLATE("Max. 3D texture size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxTex2d; - AddStringView(rootView, "MaxTex2D", TR("Max. 2D texture size:"), + AddStringView(rootView, "MaxTex2D", B_TRANSLATE("Max. 2D texture size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) textureUnits; - AddStringView(rootView, "MaxTexUnits", TR("Max. texture units:"), + AddStringView(rootView, "MaxTexUnits", B_TRANSLATE("Max. texture units:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) lights; - AddStringView(rootView, "MaxLights", TR("Max. lights:"), + AddStringView(rootView, "MaxLights", B_TRANSLATE("Max. lights:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) clippingPlanes; - AddStringView(rootView, "MaxClippingPlanes", TR("Max. clipping planes:"), - tempString.String(), true); + AddStringView(rootView, "MaxClippingPlanes", + B_TRANSLATE("Max. clipping planes:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxPoly; - AddStringView(rootView, "MaxPoly", TR("Max. evaluators equation order:"), + AddStringView(rootView, "MaxPoly", + B_TRANSLATE("Max. evaluators equation order:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) convolutionWidth << "x" << convolutionHeight; - AddStringView(rootView, "MaxConvultion", TR("Max. convolution:"), + AddStringView(rootView, "MaxConvultion", B_TRANSLATE("Max. convolution:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxIndex; - AddStringView(rootView, "MaxIndex", TR("Max. recommended index elements:"), + AddStringView(rootView, "MaxIndex", + B_TRANSLATE("Max. recommended index elements:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxVertex; - AddStringView(rootView, "MaxVertex", TR("Max. recommended vertex elements:"), + AddStringView(rootView, "MaxVertex", + B_TRANSLATE("Max. recommended vertex elements:"), tempString.String(), true); AddChild(BGroupLayoutBuilder(B_VERTICAL) @@ -200,7 +203,7 @@ CapabilitiesView::~CapabilitiesView() { - + } @@ -210,19 +213,19 @@ switch (message->what) { default: BView::MessageReceived(message); - } + } } void CapabilitiesView::AttachedToWindow() { - + } void CapabilitiesView::DetachedFromWindow() { - + } Modified: haiku/trunk/src/preferences/opengl/ExtensionsList.cpp =================================================================== --- haiku/trunk/src/preferences/opengl/ExtensionsList.cpp 2010-05-07 00:12:56 UTC (rev 36692) +++ haiku/trunk/src/preferences/opengl/ExtensionsList.cpp 2010-05-07 00:16:18 UTC (rev 36693) @@ -27,15 +27,15 @@ ExtensionRow::~ExtensionRow() { - + } ExtensionsList::ExtensionsList() : BColumnListView("ExtensionsList", B_FOLLOW_ALL) { - BStringColumn* column = new BStringColumn(TR("Available"), 280, 280, 280, - B_TRUNCATE_MIDDLE); + BStringColumn* column = new BStringColumn(B_TRANSLATE("Available"), + 280, 280, 280, B_TRUNCATE_MIDDLE); AddColumn(column, 0); SetSortingEnabled(true); SetSortColumn(column, true, true); Modified: haiku/trunk/src/preferences/opengl/ExtensionsView.cpp =================================================================== --- haiku/trunk/src/preferences/opengl/ExtensionsView.cpp 2010-05-07 00:12:56 UTC (rev 36692) +++ haiku/trunk/src/preferences/opengl/ExtensionsView.cpp 2010-05-07 00:16:18 UTC (rev 36693) @@ -23,7 +23,7 @@ ExtensionsView::ExtensionsView() - : BView(TR("Extensions"), 0, NULL) + : BView(B_TRANSLATE("Extensions"), 0, NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLayout(new BGroupLayout(B_VERTICAL)); @@ -31,7 +31,7 @@ const float kInset = 10; ExtensionsList *extList = new ExtensionsList(); - + _AddExtensionsList(extList, (char*) glGetString(GL_EXTENSIONS)); _AddExtensionsList(extList, (char*) gluGetString(GLU_EXTENSIONS)); @@ -44,7 +44,7 @@ ExtensionsView::~ExtensionsView() { - + } @@ -54,21 +54,21 @@ switch (message->what) { default: BView::MessageReceived(message); - } + } } void ExtensionsView::AttachedToWindow() { - + } void ExtensionsView::DetachedFromWindow() { - + } // #pragma mark @@ -79,7 +79,7 @@ if (!stringList) // empty extentions string return; - + while (*stringList) { char extName[255]; int n = strcspn(stringList, " "); @@ -91,4 +91,4 @@ stringList += (n + 1); // next ! } } - + Modified: haiku/trunk/src/preferences/opengl/InfoView.cpp =================================================================== --- haiku/trunk/src/preferences/opengl/InfoView.cpp 2010-05-07 00:12:56 UTC (rev 36692) +++ haiku/trunk/src/preferences/opengl/InfoView.cpp 2010-05-07 00:16:18 UTC (rev 36693) @@ -25,7 +25,7 @@ InfoView::InfoView() - : BView(TR("Information"), 0, NULL) + : BView(B_TRANSLATE("Information"), 0, NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLayout(new BGroupLayout(B_VERTICAL)); @@ -33,23 +33,23 @@ BRect dummyRect(0, 0, 0, 0); BStringView *version = new BStringView(dummyRect, "Version", - TR("OpenGL version:"), B_FOLLOW_NONE); + B_TRANSLATE("OpenGL version:"), B_FOLLOW_NONE); BStringView *versionValue = new BStringView(dummyRect, "VersionVal", (const char*)glGetString(GL_VERSION), B_FOLLOW_NONE); BStringView *vendor = new BStringView(dummyRect, "Vendor", - TR("Vendor name:"), B_FOLLOW_NONE); + B_TRANSLATE("Vendor name:"), B_FOLLOW_NONE); BStringView *vendorValue = new BStringView(dummyRect, "VendorVal", (const char*)glGetString(GL_VENDOR), B_FOLLOW_NONE); BStringView *renderer = new BStringView(dummyRect, "Renderer", - TR("Renderer name:"), B_FOLLOW_NONE); + B_TRANSLATE("Renderer name:"), B_FOLLOW_NONE); BStringView *rendererValue = new BStringView(dummyRect, "RendererVal", (const char*)glGetString(GL_RENDERER), B_FOLLOW_NONE); BStringView *gluVersion = new BStringView(dummyRect, "GLUVersion", - TR("GLU version:"), B_FOLLOW_NONE); + B_TRANSLATE("GLU version:"), B_FOLLOW_NONE); BStringView *gluVersionValue = new BStringView(dummyRect, "GLUVersionVal", (const char*)gluGetString(GLU_VERSION), B_FOLLOW_NONE); BStringView *glutVersion = new BStringView(dummyRect, "GLUTVersion", - TR("GLUT API version:"), B_FOLLOW_NONE); + B_TRANSLATE("GLUT API version:"), B_FOLLOW_NONE); BString glutApiVer; glutApiVer << (int32)GLUT_API_VERSION; BStringView *glutVersionValue = new BStringView(dummyRect, "GLUTVersionVal", @@ -96,7 +96,7 @@ InfoView::~InfoView() { - + } @@ -106,19 +106,19 @@ switch (message->what) { default: BView::MessageReceived(message); - } + } } void InfoView::AttachedToWindow() { - + } void InfoView::DetachedFromWindow() { - + }