Ticket #7275: mediaplayer-about-update.patch

src/apps/mediaplayer/MainWin.cpp

@@ -34 +34 @@
 #include <Debug.h>
 #include <fs_attr.h>
 #include <Language.h>
-#include <Locale.h>
 #include <Menu.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
@@ -65 +64 @@
 #define B_TRANSLATE_CONTEXT "MediaPlayer-Main"
 #define MIN_WIDTH 250
 
+extern const char* PLAYER_NAME;
 
 int MainWin::sNoVideoWidth = MIN_WIDTH;
 
@@ -172 +172 @@
 
 MainWin::MainWin(bool isFirstWindow, BMessage* message)
     :
-    BWindow(BRect(100, 100, 400, 300), NAME, B_TITLED_WINDOW,
+    BWindow(BRect(100, 100, 400, 300), PLAYER_NAME, B_TITLED_WINDOW,
         B_ASYNCHRONOUS_CONTROLS /* | B_WILL_ACCEPT_FIRST_CLICK */),
     fCreationTime(system_time()),
     fInfoWin(NULL),
@@ -1082 +1082 @@
     if (ret != B_OK) {
         fprintf(stderr, "MainWin::OpenPlaylistItem() - Failed to send message "
             "to Controller.\n");
-        (new BAlert(B_TRANSLATE("error"), 
-            B_TRANSLATE(NAME" encountered an internal error. "
-            "The file could not be opened."), B_TRANSLATE("OK")))->Go();
+        BString errorText(PLAYER_NAME);
+        errorText << B_TRANSLATE(" encountered an internal error. "
+            "The file could not be opened.");
+        errorText << "\n";
+        (new BAlert(B_TRANSLATE("Error"), errorText.String(),
+            B_TRANSLATE("OK")))->Go();
         _PlaylistItemOpened(item, ret);
     } else {
         BString string;
@@ -1346 +1349 @@
         fHasFile = false;
         fHasVideo = false;
         fHasAudio = false;
-        SetTitle(NAME);
+        SetTitle(PLAYER_NAME);
     } else {
         fHasFile = true;
         fHasVideo = fController->VideoTrackCount() != 0;
@@ -1418 +1421 @@
 void
 MainWin::_CreateMenu()
 {
-    fFileMenu = new BMenu(NAME);
+    fFileMenu = new BMenu(PLAYER_NAME);
     fPlaylistMenu = new BMenu(B_TRANSLATE("Playlist"B_UTF8_ELLIPSIS));
     fAudioMenu = new BMenu(B_TRANSLATE("Audio"));
     fVideoMenu = new BMenu(B_TRANSLATE("Video"));
@@ -1471 +1474 @@
 
     fFileMenu->AddSeparatorItem();
 
-    item = new BMenuItem(B_TRANSLATE("About " NAME B_UTF8_ELLIPSIS),
+    BString aboutText(B_TRANSLATE("About %1%2"));
+    aboutText.ReplaceFirst("%1", PLAYER_NAME);
+    aboutText.ReplaceFirst("%2", B_UTF8_ELLIPSIS);
+    item = new BMenuItem(aboutText.String(),
         new BMessage(B_ABOUT_REQUESTED));
     fFileMenu->AddItem(item);
     item->SetTarget(be_app);

src/apps/mediaplayer/MainApp.cpp

@@ -27 +27 @@
 #include <Catalog.h>
 #include <Entry.h>
 #include <FilePanel.h>
-#include <Locale.h>
 #include <MediaDefs.h>
 #include <MediaRoster.h>
 #include <MimeType.h>
 #include <Path.h>
 #include <Resources.h>
 #include <Roster.h>
+#include <TextView.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48 +48 @@
 #undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "MediaPlayer-Main"
 
-
 static const char* kCurrentPlaylistFilename = 
     B_TRANSLATE("MediaPlayer Current Playlist");
 
 const char* kAppSig = "application/x-vnd.Haiku-MediaPlayer";
+const char* PLAYER_NAME = B_TRANSLATE("MediaPlayer");
 
 MainApp* gMainApp;
 
@@ -411 +411 @@
 void
 MainApp::AboutRequested()
 {
-    BAlert* alert = new BAlert("about", B_TRANSLATE(
-        NAME"\n\nWritten by Marcus Overhagen, "
-        "Stephan Aßmus and Frederik Modéen"), 
-        B_TRANSLATE("Thanks"));
+    BString aboutText(PLAYER_NAME);
+    aboutText << "\n\n";
+    aboutText << B_TRANSLATE("Written by Marcus Overhagen, "
+        "Stephan Aßmus and Frederik Modéen\n");
+    BAlert* alert = new BAlert(B_TRANSLATE("About"),
+        aboutText.String(), B_TRANSLATE("Thanks"));
+    BTextView* view = alert->TextView();
+    BFont font;
+
+    view->SetStylable(true);
+
+    view->GetFont(&font);
+    font.SetSize(18);
+    font.SetFace(B_BOLD_FACE);
+    view->SetFontAndColor(0, strlen(PLAYER_NAME), &font);
     alert->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
         // Make sure it is on top of any player windows that may have the
         // floating all window feel.

src/apps/mediaplayer/MainApp.h

@@ -27 +27 @@
 
 #include "MainWin.h"
 
-
 enum  {
     M_NEW_PLAYER                = 'nwpl',
     M_PLAYER_QUIT               = 'plqt',
@@ -53 +52 @@
 };
 
 
-#define NAME "MediaPlayer"
-
-
 class BFilePanel;
 class SettingsWindow;
 
@@ -118 +114 @@
 
 extern MainApp* gMainApp;
 extern const char* kAppSig;
+extern const char* PLAYER_NAME;
 
 #endif  // __MAIN_APP_H