Ticket #5292: midiplayer.diff

src/apps/midiplayer/MidiPlayerApp.cpp

@@ -21 +21 @@
  */
 
 #include <Alert.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <StorageKit.h>
 
 #include "MidiPlayerApp.h"
 #include "MidiPlayerWindow.h"
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "Main Application"
 
 MidiPlayerApp::MidiPlayerApp()
     : BApplication(MIDI_PLAYER_SIGNATURE)
 {
+    be_locale->GetAppCatalog(&fCatalog);
     window = new MidiPlayerWindow;
 }
 
@@ -46 +51 @@
 {
     (new BAlert(
         NULL,
-        "Haiku MIDI Player 1.0.0 beta\n\n"
+        TR_CMT("Haiku MIDI Player 1.0.0 beta\n\n"
         "This tiny program\n"
         "Knows how to play thousands of\n"
-        "Cheesy sounding songs",
+        "Cheesy sounding songs", "This is a haiku. First line has five syllables, second has seven and last has five again. Create your own."),
         "Okay", NULL, NULL,
         B_WIDTH_AS_USUAL, B_INFO_ALERT))->Go();
 }

src/apps/midiplayer/ScopeView.cpp

@@ -20 +20 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <Catalog.h>
+#include <Locale.h>
 #include <Synth.h>
 #include <Window.h>
 
 #include "ScopeView.h"
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "Scope View"
+
+
 //------------------------------------------------------------------------------
 
 ScopeView::ScopeView()
@@ -180 +186 @@
 
 void ScopeView::DrawNoFile()
 {
-    DrawText("Drop MIDI file here");
+    DrawText(TR("Drop MIDI file here"));
 }
 
 //------------------------------------------------------------------------------

src/apps/midiplayer/MidiPlayerApp.h

@@ -39 +39 @@
 
     private:
         typedef BApplication super;
-
+        BCatalog fCatalog;
         MidiPlayerWindow* window;
 };
 

src/apps/midiplayer/Jamfile

@@ -7 +7 @@
     MidiPlayerWindow.cpp 
     ScopeView.cpp
     SynthBridge.cpp
-    : be midi midi2 $(TARGET_LIBSUPC++)
+    : be midi midi2 $(TARGET_LIBSUPC++) liblocale.so
     : MidiPlayer.rdef
 ;
 
+DoCatalogs MidiPlayer :
+    x-vnd.Haiku-MidiPlayer
+    :
+    MidiPlayerApp.cpp 
+    MidiPlayerWindow.cpp 
+    ScopeView.cpp
+    : en.catalog
+    : eo.catkeys
+    ;

src/apps/midiplayer/MidiPlayerWindow.cpp

@@ -20 +20 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <Catalog.h>
 #include <GridLayoutBuilder.h>
 #include <GroupLayout.h>
 #include <GroupLayoutBuilder.h>
+#include <Locale.h>
 #include <MidiProducer.h>
 #include <MidiRoster.h>
 #include <StorageKit.h>
@@ -36 +38 @@
 #define _W(a) (a->Frame().Width())
 #define _H(a) (a->Frame().Height())
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "Main Window"
+
 //------------------------------------------------------------------------------
 
 MidiPlayerWindow::MidiPlayerWindow()
-    : BWindow(BRect(0, 0, 1, 1), "MidiPlayer", B_TITLED_WINDOW, 
+    : BWindow(BRect(0, 0, 1, 1), TR("MidiPlayer"), B_TITLED_WINDOW, 
               B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
     playing = false;
@@ -188 +193 @@
     msg->what = MSG_INPUT_CHANGED;
     msg->AddInt32("id", -1);
 
-    inputOff = new BMenuItem("Off", msg);
+    inputOff = new BMenuItem(TR("Off"), msg);
 
     inputPopUp->AddItem(inputOff);
 
-    inputMenu = new BMenuField("Live input:", inputPopUp, NULL);
+    inputMenu = new BMenuField(TR("Live input:"), inputPopUp, NULL);
 }
 
 //------------------------------------------------------------------------------
@@ -202 +207 @@
     BPopUpMenu* reverbPopUp = new BPopUpMenu("reverbPopUp");
 
     reverbNone = new BMenuItem(
-        "None", new BMessage(MSG_REVERB_NONE));
+        TR("None"), new BMessage(MSG_REVERB_NONE));
 
     reverbCloset = new BMenuItem(
-        "Closet", new BMessage(MSG_REVERB_CLOSET));
+        TR("Closet"), new BMessage(MSG_REVERB_CLOSET));
 
     reverbGarage = new BMenuItem(
-        "Garage", new BMessage(MSG_REVERB_GARAGE));
+        TR("Garage"), new BMessage(MSG_REVERB_GARAGE));
 
     reverbIgor = new BMenuItem(
-        "Igor's lab", new BMessage(MSG_REVERB_IGOR));
+        TR("Igor's lab"), new BMessage(MSG_REVERB_IGOR));
 
     reverbCavern = new BMenuItem(
-        "Cavern", new BMessage(MSG_REVERB_CAVERN));
+        TR("Cavern"), new BMessage(MSG_REVERB_CAVERN));
 
     reverbDungeon = new BMenuItem(
-        "Dungeon", new BMessage(MSG_REVERB_DUNGEON));
+        TR("Dungeon"), new BMessage(MSG_REVERB_DUNGEON));
 
     reverbPopUp->AddItem(reverbNone);
     reverbPopUp->AddItem(reverbCloset);
@@ -226 +231 @@
     reverbPopUp->AddItem(reverbCavern);
     reverbPopUp->AddItem(reverbDungeon);
 
-    reverbMenu = new BMenuField("Reverb:", reverbPopUp, NULL);
+    reverbMenu = new BMenuField(TR("Reverb:"), reverbPopUp, NULL);
 }
 
 //------------------------------------------------------------------------------
@@ -236 +241 @@
     // Set up needed views
     scopeView = new ScopeView;
 
-    showScope = new BCheckBox("showScope", "Scope",
+    showScope = new BCheckBox("showScope", TR("Scope"),
         new BMessage(MSG_SHOW_SCOPE));
     showScope->SetValue(B_CONTROL_ON);
 
@@ -249 +254 @@
     volumeSlider->UseFillColor(true, &col);
     volumeSlider->SetModificationMessage(new BMessage(MSG_VOLUME));
 
-    playButton = new BButton("playButton", "Play", new BMessage(MSG_PLAY_STOP));
+    playButton = new BButton("playButton", TR("Play"), new BMessage(MSG_PLAY_STOP));
     playButton->SetEnabled(false);
 
     BBox* divider = new BBox(B_EMPTY_STRING, B_WILL_DRAW | B_FRAME_EVENTS,
@@ -257 +262 @@
     divider->SetExplicitMaxSize(
         BSize(B_SIZE_UNLIMITED, 1));
 
-    BStringView* volumeLabel = new BStringView(NULL, "Volume:");
+    BStringView* volumeLabel = new BStringView(NULL, TR("Volume:"));
     volumeLabel->SetAlignment(B_ALIGN_LEFT);
     volumeLabel->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
 
@@ -381 +386 @@
         synth.SetVolume(volume / 100.0f);
 
         playButton->SetEnabled(true);
-        playButton->SetLabel("Stop");
+        playButton->SetLabel(TR("Stop"));
         scopeView->SetHaveFile(true);
         scopeView->SetPlaying(true);
         scopeView->Invalidate();
@@ -391 +396 @@
     else
     {
         playButton->SetEnabled(false);
-        playButton->SetLabel("Play");
+        playButton->SetLabel(TR("Play"));
         scopeView->SetHaveFile(false);
         scopeView->SetPlaying(false);
         scopeView->Invalidate();
 
         (new BAlert(
-            NULL, "Could not load song", "OK", NULL, NULL,
+            NULL, TR("Could not load song"), TR("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
     }
 }
@@ -441 +446 @@
     scopeView->SetPlaying(false);
     scopeView->Invalidate();
     playButton->SetEnabled(true);
-    playButton->SetLabel("Play");
+    playButton->SetLabel(TR("Play"));
     
     Unlock();
 }
@@ -461 +466 @@
     }
     else
     {
-        playButton->SetLabel("Stop");
+        playButton->SetLabel(TR("Stop"));
         scopeView->SetPlaying(true);
         scopeView->Invalidate();
 

data/catalogs/apps/midiplayer/eo.catkeys

@@ +1 @@
+1   esperanto   x-vnd.Haiku-MidiPlayer  1406887279
+None    Main Window     Neniu
+Live input: Main Window     Viva enigo:
+Haiku MIDI Player 1.0.0 beta\n\nThis tiny program\nKnows how to play thousands of\nCheesy sounding songs    Main Application    This is a haiku. First line has five syllables, second has seven and last has five again. Create your own.  Haiku MIDI-a Legilo 1.0.0 beta\n\nLa programet' ĉi\nEblas legi milojn da\nRidindaj kantoj
+Stop    Main Window     Halti
+Cavern  Main Window     Kavo
+Volume: Main Window     Laŭteco:
+Reverb: Main Window     Eĥo:
+OK  Main Window     Daŭrigi
+MidiPlayer  Main Window     MIDI-a Legilo
+Off Main Window     Malŝaltita
+Dungeon Main Window     Karcero
+Play    Main Window     Legi
+Garage  Main Window     Aŭtejo
+Closet  Main Window     Ĉambreto
+Drop MIDI file here Scope View      Faligu MIDI-an dosieron ĉi tie
+Igor's lab  Main Window     La laboratorio de Igoro
+Scope   Main Window     Skopo
+Could not load song Main Window     La kanto ne eblis ŝarĝiĝi.