Ticket #7229: STXTView.cpp_TGAView.cpp.patch

src/add-ons/translators/stxt/STXTView.cpp

@@ -1 +1 @@
 /*
- * Copyright 2002-2009, Haiku, Inc. All rights reserved.
+ * Copyright 2002-2011, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT license.
  *
  * Authors:
@@ -13 +13 @@
 #include "STXTView.h"
 #include "STXTTranslator.h"
 
+#include <Catalog.h>
 #include <StringView.h>
 
 #include <stdio.h>
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "STXTView"
+
+
 STXTView::STXTView(const BRect &frame, const char *name, uint32 resizeMode,
         uint32 flags, TranslatorSettings *settings)
     : BView(frame, name, resizeMode, flags)
@@ -30 +35 @@
     float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     BRect rect(10, 10, 200, 10 + height);
-    BStringView *stringView = new BStringView(rect, "title", "StyledEdit files translator");
+    BStringView *stringView = new BStringView(rect, "title",
+        B_TRANSLATE("StyledEdit files translator"));
     stringView->SetFont(be_bold_font);
     stringView->ResizeToPreferred();
     AddChild(stringView);
@@ -55 +61 @@
     height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
 
     rect.OffsetBy(0, height + 5);
-    stringView = new BStringView(rect, "Copyright", B_UTF8_COPYRIGHT "2002-2006 Haiku Inc.");
+    stringView = new BStringView(rect, "Copyright",
+        B_UTF8_COPYRIGHT "2002-2006 Haiku Inc.");
     stringView->ResizeToPreferred();
     AddChild(stringView);
 

src/add-ons/translators/tga/TGAView.cpp

@@ -52 +52 @@
     SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
     SetLowColor(ViewColor());
 
-    fTitle = new BStringView("title", "TGA Image Translator");
+    fTitle = new BStringView("title", B_TRANSLATE("TGA Image Translator"));
     fTitle->SetFont(be_bold_font);
- 
+
     char detail[100];
     sprintf(detail, B_TRANSLATE("Version %d.%d.%d %s"),
         static_cast<int>(B_TRANSLATION_MAJOR_VERSION(TGA_TRANSLATOR_VERSION)),
@@ -64 +64 @@
     fDetail = new BStringView("detail", detail);
     fWrittenBy = new BStringView("writtenby",
         B_TRANSLATE("Written by the Haiku Translation Kit Team"));
- 
+
     fpchkIgnoreAlpha = new BCheckBox(B_TRANSLATE("Ignore TGA alpha channel"),
         new BMessage(CHANGE_IGNORE_ALPHA));
     int32 val = (fSettings->SetGetBool(TGA_SETTING_IGNORE_ALPHA)) ? 1 : 0;
     fpchkIgnoreAlpha->SetValue(val);
     fpchkIgnoreAlpha->SetViewColor(ViewColor());
-    
+
     fpchkRLE = new BCheckBox(B_TRANSLATE("Save with RLE Compression"),
         new BMessage(CHANGE_RLE));
     val = (fSettings->SetGetBool(TGA_SETTING_RLE)) ? 1 : 0;
     fpchkRLE->SetValue(val);
     fpchkRLE->SetViewColor(ViewColor());
- 
+
     // Build the layout
     SetLayout(new BGroupLayout(B_HORIZONTAL));
- 
+
     AddChild(BGroupLayoutBuilder(B_VERTICAL, 7)
         .Add(fTitle)
         .Add(fDetail)
@@ -91 +91 @@
         .AddGlue()
         .SetInsets(5, 5, 5, 5)
     );
- 
+
     BFont font;
     GetFont(&font);
-    SetExplicitPreferredSize(BSize((font.Size() * 333)/12, (font.Size() * 200)/12));
+    SetExplicitPreferredSize(BSize((font.Size() * 333)/12,
+        (font.Size() * 200)/12));
 }