Ticket #7656: desklink.patch

src/bin/desklink/MediaReplicant.cpp

@@ -20 +20 @@
 
 #include <Alert.h>
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <Entry.h>
 #include <File.h>
 #include <FindDirectory.h>
@@ -39 +40 @@
 #include "VolumeWindow.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "MediaReplicant"
+
+
 static const uint32 kMsgOpenMediaSettings = 'mese';
 static const uint32 kMsgOpenSoundSettings = 'sose';
 static const uint32 kMsgOpenMediaPlayer = 'omep';
@@ -88 +93 @@
         MixerControl control;
         control.Connect(fWhich);
 
-        char text[256];
-        snprintf(text, sizeof(text), "%g dB", control.Volume());
-        fView->SetText(text);
+        BString text;
+        text.SetToFormat(B_TRANSLATE("%g dB"), control.Volume());
+        fView->SetText(text.String());
 
         Unlock();
     }
@@ -218 +223 @@
         BPopUpMenu* menu = new BPopUpMenu("", false, false);
         menu->SetFont(be_plain_font);
 
-        menu->AddItem(new BMenuItem("Media preferences" B_UTF8_ELLIPSIS,
+        menu->AddItem(new BMenuItem(
+            B_TRANSLATE("Media preferences" B_UTF8_ELLIPSIS),
             new BMessage(kMsgOpenMediaSettings)));
-        menu->AddItem(new BMenuItem("Sound preferences" B_UTF8_ELLIPSIS,
+        menu->AddItem(new BMenuItem(
+            B_TRANSLATE("Sound preferences" B_UTF8_ELLIPSIS),
             new BMessage(kMsgOpenSoundSettings)));
 
         menu->AddSeparatorItem();
 
-        menu->AddItem(new BMenuItem("Open MediaPlayer",
+        menu->AddItem(new BMenuItem(B_TRANSLATE("Open MediaPlayer"),
             new BMessage(kMsgOpenMediaPlayer)));
 
         menu->AddSeparatorItem();
 
-        BMenu* subMenu = new BMenu("Options");
+        BMenu* subMenu = new BMenu(B_TRANSLATE("Options"));
         menu->AddItem(subMenu);
 
-        BMenuItem* item = new BMenuItem("Control physical output",
+        BMenuItem* item = new BMenuItem(B_TRANSLATE("Control physical output"),
             new BMessage(kMsgVolumeWhich));
         item->SetMarked(fVolumeWhich == VOLUME_USE_PHYS_OUTPUT);
         subMenu->AddItem(item);
 
-        item = new BMenuItem("Beep", new BMessage(kMsgToggleBeep));
+        item = new BMenuItem(B_TRANSLATE("Beep"),
+            new BMessage(kMsgToggleBeep));
         item->SetMarked(!fDontBeep);
         subMenu->AddItem(item);
 
         menu->AddSeparatorItem();
 
-        menu->AddItem(new BMenuItem("About" B_UTF8_ELLIPSIS,
+        menu->AddItem(new BMenuItem(B_TRANSLATE("About" B_UTF8_ELLIPSIS),
             new BMessage(B_ABOUT_REQUESTED)));
 
         menu->SetTargetForItems(this);
@@ -266 +274 @@
 {
     switch (message->what) {
         case B_ABOUT_REQUESTED:
-            (new BAlert("About Volume Control", "Volume Control\n"
+            (new BAlert(B_TRANSLATE("About Volume Control"),
+                B_TRANSLATE("Volume Control\n"
                     "  Brought to you by Jérôme DUVAL.\n\n"
-                    "Copyright " B_UTF8_COPYRIGHT "2003-2010, Haiku",
-                "OK"))->Go(NULL);
+                    "Copyright " B_UTF8_COPYRIGHT "2003-2010, Haiku"),
+                B_TRANSLATE("OK")))->Go(NULL);
             break;
 
         case kMsgOpenMediaPlayer:
@@ -391 +400 @@
     // launch the application
     if (_LaunchBySignature(signature) != B_OK
         && _LaunchByPath(path.Path()) != B_OK) {
-        BString message = "Couldn't launch ";
+        BString message = B_TRANSLATE("Couldn't launch ");
         message << prettyName;
 
-        (new BAlert("desklink", message.String(), "OK"))->Go();
+        (new BAlert(B_TRANSLATE("desklink"), message.String(),
+            B_TRANSLATE("OK")))->Go();
     }
 }
 

src/bin/desklink/DeskButton.cpp

@@ -12 +12 @@
 
 #include <Alert.h>
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <Dragger.h>
 #include <MenuItem.h>
 #include <Message.h>
@@ -25 +26 @@
 #define OPEN_REF    'opre'
 #define DO_ACTION   'doac'
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "DeskButton"
+
+
 extern const char *kAppSignature;
     // from desklink.cpp
 
@@ -108 +114 @@
 {
     switch (message->what) {
         case B_ABOUT_REQUESTED:
-            (new BAlert("About Desklink", "Desklink (Replicant)\n"
-                "  Brought to you by Jérôme DUVAL.\n\n"
-                "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku","OK"))->Go();
+            (new BAlert(B_TRANSLATE("About Desklink"),
+                B_TRANSLATE("Desklink (Replicant)\n"
+                    "Brought to you by Jérôme DUVAL.\n\n"
+                    "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku"),
+                B_TRANSLATE("OK")))->Go();
             break;
         case OPEN_REF:
             be_roster->Launch(&fRef);

src/bin/desklink/Jamfile

@@ -12 +12 @@
     VolumeControl.cpp
     VolumeWindow.cpp
 
-    : be libmedia.so $(TARGET_LIBSUPC++)
+    : be libmedia.so $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
     : desklink.rdef
 ;
+
+DoCatalogs Mail :
+    x-vnd.Haiku-desklink
+    :
+    DeskButton.cpp
+    MediaReplicant.cpp
+    VolumeControl.cpp
+;

src/bin/desklink/VolumeControl.cpp

@@ -17 +17 @@
 #include <Alert.h>
 #include <Application.h>
 #include <Beep.h>
+#include <Catalog.h>
 #include <ControlLook.h>
 #include <Dragger.h>
 #include <MessageRunner.h>
@@ -29 +30 @@
 #include "VolumeWindow.h"
 
 
+
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "VolumeControl"
+
+
 static const char* kMediaServerSignature = "application/x-vnd.Be.media-server";
 static const char* kAddOnServerSignature = "application/x-vnd.Be.addon-host";
 
@@ -37 +44 @@
 
 VolumeControl::VolumeControl(int32 volumeWhich, bool beep, BMessage* message)
     :
-    BSlider("VolumeControl", "Volume", message, 0, 1, B_HORIZONTAL),
+    BSlider("VolumeControl", B_TRANSLATE("Volume"),
+        message, 0, 1, B_HORIZONTAL),
     fMixerControl(new MixerControl(volumeWhich)),
     fBeep(beep),
     fSnapping(false),
@@ -285 +293 @@
             break;
 
         case B_ABOUT_REQUESTED:
-            (new BAlert("About Volume Control", "Volume Control\n"
+            (new BAlert(B_TRANSLATE("About Volume Control"),
+                B_TRANSLATE( "Volume Control\n"
                     "  Written by Jérôme DUVAL, and Axel Dörfler.\n\n"
-                    "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku",
-                "OK"))->Go(NULL);
+                    "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku"),
+                B_TRANSLATE("OK")))->Go(NULL);
             break;
 
         case B_SOME_APP_LAUNCHED:
@@ -308 +317 @@
            if (isMediaServer || isAddOnServer) {
                 if (!fMediaServerRunning && !fAddOnServerRunning) {
                     // No media server around
-                    SetLabel("No media server running");
+                    SetLabel(B_TRANSLATE("No media server running"));
                     SetEnabled(false);
                 } else if (fMediaServerRunning && fAddOnServerRunning) {
                     // HACK!
@@ -389 +398 @@
     if (!IsEnabled())
         return NULL;
 
-    snprintf(fText, sizeof(fText), "%ld dB", Value());
-    return fText;
+    fText.SetToFormat(B_TRANSLATE("%ld dB"), Value());
+    return fText.String();
 }
 
 
@@ -418 +427 @@
         SetLabel(errorString);
         SetLimits(-60, 18);
     } else {
-        SetLabel("Volume");
+        SetLabel(B_TRANSLATE("Volume"));
         SetLimits((int32)floorf(fMixerControl->Minimum()),
             (int32)ceilf(fMixerControl->Maximum()));
 

src/bin/desklink/VolumeControl.h

@@ -11 +11 @@
 #define VOLUME_SLIDER_H
 
 
+#include <String.h>
 #include <Slider.h>
 
 class MixerControl;
@@ -47 +48 @@
             bool            _IsReplicant() const;
             float           _PointForValue(int32 value) const;
 
-            mutable char    fText[64];
+            mutable BString fText;
             MixerControl*   fMixerControl;
             int32           fOriginalValue;
             bool            fBeep;