[haiku-commits] r40949 - in haiku/trunk/src/apps: cdplayer charactermap clock codycam deskbar ...

  • From: jonas@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 14 Mar 2011 15:41:14 +0100 (CET)

Author: kirilla
Date: 2011-03-14 15:41:13 +0100 (Mon, 14 Mar 2011)
New Revision: 40949
Changeset: http://dev.haiku-os.org/changeset/40949

Modified:
   haiku/trunk/src/apps/cdplayer/CDPlayer.cpp
   haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
   haiku/trunk/src/apps/clock/Jamfile
   haiku/trunk/src/apps/clock/clock.cpp
   haiku/trunk/src/apps/codycam/CodyCam.cpp
   haiku/trunk/src/apps/deskbar/BarWindow.cpp
   haiku/trunk/src/apps/devices/DevicesApplication.cpp
   haiku/trunk/src/apps/diskprobe/OpenWindow.cpp
   haiku/trunk/src/apps/diskusage/MainWindow.cpp
   haiku/trunk/src/apps/drivesetup/MainWindow.cpp
   haiku/trunk/src/apps/expander/ExpanderApp.cpp
   haiku/trunk/src/apps/expander/ExpanderWindow.cpp
   haiku/trunk/src/apps/glteapot/Jamfile
   haiku/trunk/src/apps/glteapot/TeapotApp.cpp
   haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp
Log:
Localization changes. Use of B_TRANSLATE_APP_NAME(). Small cleanups.

Modified: haiku/trunk/src/apps/cdplayer/CDPlayer.cpp
===================================================================
--- haiku/trunk/src/apps/cdplayer/CDPlayer.cpp  2011-03-14 13:48:21 UTC (rev 
40948)
+++ haiku/trunk/src/apps/cdplayer/CDPlayer.cpp  2011-03-14 14:41:13 UTC (rev 
40949)
@@ -633,9 +633,10 @@
 
 
 CDPlayerWindow::CDPlayerWindow()
-       : BWindow(BRect (100, 100, 405, 280), B_TRANSLATE("CDPlayer"), 
-               B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | 
-               B_ASYNCHRONOUS_CONTROLS)
+       :
+       BWindow(BRect (100, 100, 405, 280), B_TRANSLATE_APP_NAME("CDPlayer"), 
+               B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
+               | B_ASYNCHRONOUS_CONTROLS)
 {
 }
 

Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.cpp       2011-03-14 
13:48:21 UTC (rev 40948)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.cpp       2011-03-14 
14:41:13 UTC (rev 40949)
@@ -122,9 +122,10 @@
 
 
 CharacterWindow::CharacterWindow()
-       : BWindow(BRect(100, 100, 700, 550), B_TRANSLATE("CharacterMap"), 
+       :
+       BWindow(BRect(100, 100, 700, 550), 
B_TRANSLATE_APP_NAME("CharacterMap"), 
                B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | 
B_QUIT_ON_WINDOW_CLOSE
-                       | B_AUTO_UPDATE_SIZE_LIMITS)
+               | B_AUTO_UPDATE_SIZE_LIMITS)
 {
        BMessage settings;
        _LoadSettings(settings);

Modified: haiku/trunk/src/apps/clock/Jamfile
===================================================================
--- haiku/trunk/src/apps/clock/Jamfile  2011-03-14 13:48:21 UTC (rev 40948)
+++ haiku/trunk/src/apps/clock/Jamfile  2011-03-14 14:41:13 UTC (rev 40949)
@@ -6,6 +6,12 @@
        cl_view.cpp 
        cl_wind.cpp 
        clock.cpp 
-       : be $(TARGET_LIBSUPC++)
+       : be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
        : Clock.rdef
        ;
+
+DoCatalogs Clock :
+       x-vnd.Haiku-Clock
+       :
+       clock.cpp
+;

Modified: haiku/trunk/src/apps/clock/clock.cpp
===================================================================
--- haiku/trunk/src/apps/clock/clock.cpp        2011-03-14 13:48:21 UTC (rev 
40948)
+++ haiku/trunk/src/apps/clock/clock.cpp        2011-03-14 14:41:13 UTC (rev 
40949)
@@ -7,6 +7,7 @@
 
 
 #include <Application.h>
+#include <Catalog.h>
 
 #include "cl_wind.h"
 
@@ -19,7 +20,8 @@
 {
        BApplication app(kAppSignature);
 
-       BWindow* clockWindow = new TClockWindow(BRect(100, 100, 182, 182), 
"Clock");
+       BWindow* clockWindow = new TClockWindow(BRect(100, 100, 182, 182),
+               B_TRANSLATE_APP_NAME("Clock"));
        clockWindow->Show();
 
        app.Run();

Modified: haiku/trunk/src/apps/codycam/CodyCam.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/CodyCam.cpp    2011-03-14 13:48:21 UTC (rev 
40948)
+++ haiku/trunk/src/apps/codycam/CodyCam.cpp    2011-03-14 14:41:13 UTC (rev 
40949)
@@ -56,7 +56,8 @@
 void
 ErrorAlert(const char* message, status_t err, BWindow *window = NULL)
 {
-       BAlert *alert = new BAlert("", message, B_TRANSLATE("OK"));
+       BAlert *alert = new BAlert(B_TRANSLATE_APP_NAME("CodyCam"), message,
+               B_TRANSLATE("OK"));
        if (window != NULL)
                alert->CenterIn(window->Frame());
        alert->Go();
@@ -190,7 +191,7 @@
 CodyCam::ReadyToRun()
 {
        fWindow = new VideoWindow(BRect(28, 28, 28, 28),
-               (const char*) B_TRANSLATE("CodyCam"), B_TITLED_WINDOW,
+               (const char*) B_TRANSLATE_APP_NAME("CodyCam"), B_TITLED_WINDOW,
                B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, &fPort);
 
        _SetUpNodes();

Modified: haiku/trunk/src/apps/deskbar/BarWindow.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BarWindow.cpp  2011-03-14 13:48:21 UTC (rev 
40948)
+++ haiku/trunk/src/apps/deskbar/BarWindow.cpp  2011-03-14 14:41:13 UTC (rev 
40949)
@@ -85,11 +85,11 @@
 
 TBarWindow::TBarWindow()
        :
-       BWindow(BRect(-1000.0f, -1000.0f, -1000.0f, -1000.0f), 
B_TRANSLATE("Deskbar"),
-               B_BORDERED_WINDOW,
+       BWindow(BRect(-1000.0f, -1000.0f, -1000.0f, -1000.0f),
+               B_TRANSLATE_APP_NAME("Deskbar"), B_BORDERED_WINDOW,
                B_WILL_ACCEPT_FIRST_CLICK | B_NOT_ZOOMABLE | B_NOT_CLOSABLE
-                       | B_NOT_MINIMIZABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE
-                       | B_AVOID_FRONT | B_ASYNCHRONOUS_CONTROLS,
+               | B_NOT_MINIMIZABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE
+               | B_AVOID_FRONT | B_ASYNCHRONOUS_CONTROLS,
                B_ALL_WORKSPACES)
 {
        desk_settings* settings = ((TBarApp*)be_app)->Settings();

Modified: haiku/trunk/src/apps/devices/DevicesApplication.cpp
===================================================================
--- haiku/trunk/src/apps/devices/DevicesApplication.cpp 2011-03-14 13:48:21 UTC 
(rev 40948)
+++ haiku/trunk/src/apps/devices/DevicesApplication.cpp 2011-03-14 14:41:13 UTC 
(rev 40949)
@@ -76,7 +76,7 @@
 
 DevicesWindow::DevicesWindow()
        :
-       BWindow(BRect(50, 50, 750, 550), B_TRANSLATE("Devices"), 
+       BWindow(BRect(50, 50, 750, 550), B_TRANSLATE_APP_NAME("Devices"),
                B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS 
                | B_AUTO_UPDATE_SIZE_LIMITS
                | B_QUIT_ON_WINDOW_CLOSE)

Modified: haiku/trunk/src/apps/diskprobe/OpenWindow.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/OpenWindow.cpp       2011-03-14 13:48:21 UTC 
(rev 40948)
+++ haiku/trunk/src/apps/diskprobe/OpenWindow.cpp       2011-03-14 14:41:13 UTC 
(rev 40949)
@@ -32,9 +32,10 @@
 
 
 OpenWindow::OpenWindow()
-       : BWindow(BRect(0, 0, 35, 10), B_TRANSLATE("DiskProbe"), 
B_TITLED_WINDOW,
-               B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
-                        | B_AUTO_UPDATE_SIZE_LIMITS)
+       :
+       BWindow(BRect(0, 0, 35, 10), B_TRANSLATE_APP_NAME("DiskProbe"),
+               B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
+               | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
        fDevicesMenu = new BPopUpMenu("devices");
        CollectDevices(fDevicesMenu);

Modified: haiku/trunk/src/apps/diskusage/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/diskusage/MainWindow.cpp       2011-03-14 13:48:21 UTC 
(rev 40948)
+++ haiku/trunk/src/apps/diskusage/MainWindow.cpp       2011-03-14 14:41:13 UTC 
(rev 40949)
@@ -25,7 +25,7 @@
 
 MainWindow::MainWindow(BRect pieRect)
        :
-       BWindow(pieRect, B_TRANSLATE("DiskUsage"), B_TITLED_WINDOW,
+       BWindow(pieRect, B_TRANSLATE_APP_NAME("DiskUsage"), B_TITLED_WINDOW,
                B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
                | B_AUTO_UPDATE_SIZE_LIMITS)
 {

Modified: haiku/trunk/src/apps/drivesetup/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.cpp      2011-03-14 13:48:21 UTC 
(rev 40948)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.cpp      2011-03-14 14:41:13 UTC 
(rev 40949)
@@ -160,7 +160,8 @@
 
 
 MainWindow::MainWindow(BRect frame)
-       : BWindow(frame, B_TRANSLATE("DriveSetup"), B_DOCUMENT_WINDOW,
+       :
+       BWindow(frame, B_TRANSLATE_APP_NAME("DriveSetup"), B_DOCUMENT_WINDOW,
                B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE),
        fCurrentDisk(NULL),
        fCurrentPartitionID(-1),

Modified: haiku/trunk/src/apps/expander/ExpanderApp.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderApp.cpp       2011-03-14 13:48:21 UTC 
(rev 40948)
+++ haiku/trunk/src/apps/expander/ExpanderApp.cpp       2011-03-14 14:41:13 UTC 
(rev 40949)
@@ -29,7 +29,7 @@
 void
 ExpanderApp::AboutRequested()
 {
-       BString appName = B_TRANSLATE("Expander");
+       BString appName = B_TRANSLATE_APP_NAME("Expander");
        int nameLength = appName.CountChars();
        BAlert* alert = new BAlert("about",
                appName.Append(B_TRANSLATE("\n\twritten by Jérôme Duval\n"

Modified: haiku/trunk/src/apps/expander/ExpanderWindow.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderWindow.cpp    2011-03-14 13:48:21 UTC 
(rev 40948)
+++ haiku/trunk/src/apps/expander/ExpanderWindow.cpp    2011-03-14 14:41:13 UTC 
(rev 40949)
@@ -50,8 +50,8 @@
 ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref* ref,
                BMessage* settings)
        :
-       BWindow(frame, B_TRANSLATE_COMMENT("Expander", "!! Window Title !!"),
-               B_TITLED_WINDOW, B_NORMAL_WINDOW_FEEL),
+       BWindow(frame, B_TRANSLATE_APP_NAME("Expander"), B_TITLED_WINDOW,
+               B_NORMAL_WINDOW_FEEL),
        fSourcePanel(NULL),
        fDestPanel(NULL),
        fSourceChanged(true),

Modified: haiku/trunk/src/apps/glteapot/Jamfile
===================================================================
--- haiku/trunk/src/apps/glteapot/Jamfile       2011-03-14 13:48:21 UTC (rev 
40948)
+++ haiku/trunk/src/apps/glteapot/Jamfile       2011-03-14 14:41:13 UTC (rev 
40949)
@@ -9,6 +9,12 @@
        error.cpp
        TeapotWindow.cpp
        TeapotApp.cpp
-       : be GL game $(TARGET_LIBSUPC++)
+       : be GL game $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
        : GLTeapot.rdef
 ;
+
+DoCatalogs GLTeapot :
+       x-vnd.Haiku-GLTeapot
+       :
+       TeapotApp.cpp
+;

Modified: haiku/trunk/src/apps/glteapot/TeapotApp.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/TeapotApp.cpp 2011-03-14 13:48:21 UTC (rev 
40948)
+++ haiku/trunk/src/apps/glteapot/TeapotApp.cpp 2011-03-14 14:41:13 UTC (rev 
40949)
@@ -3,8 +3,12 @@
        This file may be used under the terms of the Be Sample Code License.
 */
 
+
 #include "TeapotApp.h"
 
+#include <Catalog.h>
+
+
 int
 main(int argc, char** argv)
 {
@@ -16,9 +20,11 @@
 
 
 TeapotApp::TeapotApp(const char* sign)
-       : BApplication(sign)
+       :
+       BApplication(sign)
 {
-       fTeapotWindow = new TeapotWindow(BRect(5, 25, 300, 315), "GLTeapot", 
B_TITLED_WINDOW, 0);       
+       fTeapotWindow = new TeapotWindow(BRect(5, 25, 300, 315),
+               B_TRANSLATE_APP_NAME("GLTeapot"), B_TITLED_WINDOW, 0);
        fTeapotWindow->Show();
 }
 
@@ -26,7 +32,6 @@
 void
 TeapotApp::MessageReceived(BMessage* msg)
 {
-//     msg->PrintToStream();
        switch (msg->what) {
 
                default:

Modified: haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp    2011-03-14 13:48:21 UTC 
(rev 40948)
+++ haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp    2011-03-14 14:41:13 UTC 
(rev 40949)
@@ -89,9 +89,9 @@
 MainWindow::MainWindow(IconEditorApp* app, Document* document,
                const BMessage* settings)
        :
-       BWindow(BRect(50, 50, 900, 750), "Icon-O-Matic",
+       BWindow(BRect(50, 50, 900, 750), B_TRANSLATE_APP_NAME("Icon-O-Matic"),
                B_DOCUMENT_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-                       B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
+               B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
        fApp(app),
        fDocument(document),
        fIcon(NULL)


Other related posts:

  • » [haiku-commits] r40949 - in haiku/trunk/src/apps: cdplayer charactermap clock codycam deskbar ... - jonas