Ticket #7270: mediaplayer-infowindow.diff

src/apps/mediaplayer/InfoWin.cpp

@@ -26 +26 @@
 #include <string.h>
 
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <MediaDefs.h>
 #include <Mime.h>
@@ -39 +40 @@
 #include "PlaylistItem.h"
 
 
-#define NAME "File Info"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "MediaPlayer-File Info"
+
 #define MIN_WIDTH 400
 
 #define BASE_HEIGHT (32 + 32)
@@ -159 +162 @@
 InfoWin::InfoWin(BPoint leftTop, Controller* controller)
     :
     BWindow(BRect(leftTop.x, leftTop.y, leftTop.x + MIN_WIDTH - 1,
-        leftTop.y + 300), NAME, B_TITLED_WINDOW,
+        leftTop.y + 300), B_TRANSLATE("File info"), B_TITLED_WINDOW,
         B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
     fController(controller),
     fControllerObserver(new ControllerObserver(this,
@@ -168 +171 @@
     BRect rect = Bounds();
 
     // accomodate for big fonts
-    float div = max_c(2 * 32, be_plain_font->StringWidth("Display Mode") + 10);
+    float div = max_c(2 * 32, be_plain_font->StringWidth(B_TRANSLATE("Display mode")) + 10);
 
     fInfoView = new InfoView(rect, "background", div);
     fInfoView->SetViewColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR));
@@ -304 +307 @@
     status_t err;
     // video track format information
     if ((which & INFO_VIDEO) && fController->VideoTrackCount() > 0) {
-        fLabelsView->Insert("Video\n\n\n");
+        fLabelsView->Insert(B_TRANSLATE("Video\n\n\n"));
         BString s;
         media_format format;
         media_raw_video_format videoFormat;
@@ -316 +319 @@
             media_codec_info mci;
             err = fController->GetVideoCodecInfo(&mci);
             if (err < B_OK) {
-                s << "Haiku Media Kit: " << strerror(err);
+                s << B_TRANSLATE("Haiku Media Kit:") << strerror(err);
                 if (format.user_data_type == B_CODEC_TYPE_INFO) {
-                    s << (char *)format.user_data << " (not supported)";
+                    s << (char *)format.user_data << " " <<
+                        B_TRANSLATE("(not supported)");
                 }
             } else
                 s << mci.pretty_name; //<< "(" << mci.short_name << ")";
         } else if (format.type == B_MEDIA_RAW_VIDEO) {
             videoFormat = format.u.raw_video;
-            s << "raw video";
+            s << B_TRANSLATE("raw video");
         } else
-            s << "unknown format";
+            s << B_TRANSLATE("unknown format");
         s << "\n";
         s << format.Width() << " x " << format.Height();
         // encoded has output as 1st field...
-        s << ", " << videoFormat.field_rate << " fps";
+        s << ", " << videoFormat.field_rate << " " << B_TRANSLATE("fps");
         s << "\n\n";
         fContentsView->Insert(s.String());
     }
 
     // audio track format information
     if ((which & INFO_AUDIO) && fController->AudioTrackCount() > 0) {
-        fLabelsView->Insert("Audio\n\n\n");
+        fLabelsView->Insert(B_TRANSLATE("Audio\n\n\n"));
         BString s;
         media_format format;
         media_raw_audio_format audioFormat;
@@ -351 +355 @@
             media_codec_info mci;
             err = fController->GetAudioCodecInfo(&mci);
             if (err < 0) {
-                s << "Haiku Media Kit: " << strerror(err);
+                s << B_TRANSLATE("Haiku Media Kit:") << " " << strerror(err);
                 if (format.user_data_type == B_CODEC_TYPE_INFO) {
-                    s << (char *)format.user_data << " (not supported)";
+                    s << (char *)format.user_data << " " <<
+                        B_TRANSLATE("(not supported)");
                 }
             } else
                 s << mci.pretty_name; //<< "(" << mci.short_name << ")";
         } else if (format.type == B_MEDIA_RAW_AUDIO) {
             audioFormat = format.u.raw_audio;
-            s << "raw audio";
+            s << B_TRANSLATE("raw audio");
         } else
-            s << "unknown format";
+            s << B_TRANSLATE("unknown format");
         s << "\n";
         uint32 bitsPerSample = 8 * (audioFormat.format
             & media_raw_audio_format::B_AUDIO_SIZE_MASK);
@@ -369 +374 @@
         float sr = audioFormat.frame_rate;
 
         if (bitsPerSample > 0)
-            s << bitsPerSample << " Bit ";
+            s << bitsPerSample << " " << B_TRANSLATE("Bit") << " ";
         if (channelCount == 1)
-            s << "Mono";
+            s << B_TRANSLATE("Mono");
         else if (channelCount == 2)
-            s << "Stereo";
+            s << B_TRANSLATE("Stereo");
         else
-            s << channelCount << " Channels";
+            s << channelCount << " " << B_TRANSLATE("Channels");
         s << ", ";
         if (sr > 0.0)
             s << sr / 1000;
         else
             s << "??";
-        s<< " kHz";
+        s << " " << B_TRANSLATE("kHz");
         s << "\n\n";
         fContentsView->Insert(s.String());
     }
 
     // statistics
     if ((which & INFO_STATS) && fController->HasFile()) {
-        fLabelsView->Insert("Duration\n");
+        fLabelsView->Insert(B_TRANSLATE("Duration\n"));
         BString s;
         bigtime_t d = fController->TimeDuration();
         bigtime_t v;
@@ -408 +413 @@
         v = d / 1000;
         s << v;
         if (hours)
-            s << " h";
+            s << " " << B_TRANSLATE_COMMENT("h", "Hours");
         else
-            s << " min";
+            s << " " << B_TRANSLATE_COMMENT("min", "Minutes");
         s << "\n";
         fContentsView->Insert(s.String());
         // TODO: demux/video/audio/... perfs (Kb/s)
 
-        fLabelsView->Insert("Display mode\n");
+        fLabelsView->Insert(B_TRANSLATE("Display mode\n"));
         if (fController->IsOverlayActive())
-            fContentsView->Insert("Overlay\n");
+            fContentsView->Insert(B_TRANSLATE("Overlay\n"));
         else
-            fContentsView->Insert("DrawBitmap\n");
+            fContentsView->Insert(B_TRANSLATE("DrawBitmap\n"));
 
         fLabelsView->Insert("\n");
         fContentsView->Insert("\n");
@@ -437 +442 @@
             media_file_format fileFormat;
             BString s;
             if (fController->GetFileFormatInfo(&fileFormat) == B_OK) {
-                fLabelsView->Insert("Container\n");
+                fLabelsView->Insert(B_TRANSLATE("Container\n"));
                 s << fileFormat.pretty_name;
                 s << "\n";
                 fContentsView->Insert(s.String());
@@ -445 +450 @@
                     iconSet = fInfoView->SetIcon(fileFormat.mime_type) == B_OK;
             } else
                 fContentsView->Insert("\n");
-            fLabelsView->Insert("Location\n");
+            fLabelsView->Insert(B_TRANSLATE("Location\n"));
             if (fController->GetLocation(&s) < B_OK)
-                s = "<unknown>";
+                s = B_TRANSLATE("<unknown>");
             s << "\n";
             fContentsView->Insert(s.String());
             if (fController->GetName(&s) < B_OK)
-                s = "<unnamed media>";
+                s = B_TRANSLATE("<unnamed media>");
             fFilenameView->SetText(s.String());
         } else {
-            fFilenameView->SetText("<no media>");
+            fFilenameView->SetText(B_TRANSLATE("<no media>"));
         }
         if (!iconSet)
             fInfoView->SetGenericIcon();
@@ -463 +468 @@
     if ((which & INFO_COPYRIGHT) && fController->HasFile()) {
         BString s;
         if (fController->GetCopyright(&s) == B_OK && s.Length() > 0) {
-            fLabelsView->Insert("Copyright\n\n");
+            fLabelsView->Insert(B_TRANSLATE("Copyright\n\n"));
             s << "\n\n";
             fContentsView->Insert(s.String());
         }

src/apps/mediaplayer/Jamfile

@@ -124 +124 @@
     PeakView.cpp
     CopyPLItemsCommand.cpp
     ImportPLItemsCommand.cpp
+    InfoWin.cpp
     MovePLItemsCommand.cpp
     PlaylistItem.cpp
     PlaylistWindow.cpp