From 47798a10f7838631d031aabb0078bf66d011cfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Mon, 14 Mar 2011 02:16:35 +0000 Subject: [PATCH] Localization changes. Stop using AddCatalogEntryAttribute rule in Jamfiles. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40945 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/3dmov/Jamfile | 8 +++++++- src/apps/3dmov/MainWindow.cpp | 6 ++++-- src/apps/aboutsystem/AboutSystem.cpp | 2 ++ src/apps/aboutsystem/Jamfile | 5 ----- src/apps/activitymonitor/ActivityMonitor.cpp | 2 +- src/apps/activitymonitor/ActivityMonitor.h | 2 -- src/apps/activitymonitor/ActivityWindow.cpp | 5 +++-- src/apps/activitymonitor/Jamfile | 5 ----- src/apps/bootmanager/BootManagerWindow.cpp | 6 +++--- src/apps/bootmanager/Jamfile | 5 ----- src/apps/cdplayer/Jamfile | 5 ----- src/apps/charactermap/Jamfile | 5 ----- src/apps/codycam/Jamfile | 5 ----- src/apps/deskbar/Jamfile | 7 +------ src/apps/devices/Jamfile | 5 ----- src/apps/diskprobe/Jamfile | 5 ----- src/apps/processcontroller/Jamfile | 5 ----- src/apps/pulse/Jamfile | 6 ------ src/apps/sudoku/Jamfile | 5 ----- 19 files changed, 21 insertions(+), 73 deletions(-) diff --git a/src/apps/3dmov/Jamfile b/src/apps/3dmov/Jamfile index 1a2956b2a0..135ae0af28 100644 --- a/src/apps/3dmov/Jamfile +++ b/src/apps/3dmov/Jamfile @@ -11,6 +11,12 @@ Application 3DMov : ViewCube.cpp ViewSphere.cpp GLUtility.cpp - : be GL game media translation $(TARGET_LIBSUPC++) + : be GL game $(HAIKU_LOCALE_LIBS) media translation $(TARGET_LIBSUPC++) : 3dmov.rdef ; + +DoCatalogs 3DMov : + x-vnd.Haiku-3DMov + : + MainWindow.cpp +; diff --git a/src/apps/3dmov/MainWindow.cpp b/src/apps/3dmov/MainWindow.cpp index 82c343a17d..0628b447d1 100644 --- a/src/apps/3dmov/MainWindow.cpp +++ b/src/apps/3dmov/MainWindow.cpp @@ -9,8 +9,9 @@ On Zeta, both AddChild(new BGLView) and new MainWindow work without any problems. */ -#include +#include #include +#include #include #include "MainWindow.h" @@ -51,7 +52,8 @@ static int sMainWindowCount = 0; // keep track of number of spawned windows DESCRIPTION: Constructor */ MainWindow :: MainWindow(BRect frame, SHAPE shape) - : BDirectWindow(frame, "3Dmov", B_TITLED_WINDOW, 0) + : + BDirectWindow(frame, B_TRANSLATE_APP_NAME("3DMov"), B_TITLED_WINDOW, 0) { sMainWindowCount++; diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index eb0d98524e..488521a7cc 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -349,6 +349,8 @@ private: AboutApp::AboutApp() : BApplication("application/x-vnd.Haiku-About") { + B_TRANSLATE_MARK_APP_NAME("AboutSystem"); + AboutWindow *window = new(std::nothrow) AboutWindow(); if (window) window->Show(); diff --git a/src/apps/aboutsystem/Jamfile b/src/apps/aboutsystem/Jamfile index c1003f8b43..ea0c00236c 100644 --- a/src/apps/aboutsystem/Jamfile +++ b/src/apps/aboutsystem/Jamfile @@ -17,8 +17,3 @@ DoCatalogs AboutSystem : AboutSystem.cpp Utilities.cpp ; - -AddCatalogEntryAttribute AboutSystem - : - "x-vnd.Haiku-About:AboutWindow:About this system" -; diff --git a/src/apps/activitymonitor/ActivityMonitor.cpp b/src/apps/activitymonitor/ActivityMonitor.cpp index eb18bf385c..15950f4e9e 100644 --- a/src/apps/activitymonitor/ActivityMonitor.cpp +++ b/src/apps/activitymonitor/ActivityMonitor.cpp @@ -64,7 +64,7 @@ ActivityMonitor::ShowAbout() NULL }; - BAboutWindow aboutWindow(kAppName, 2008, kAuthors); + BAboutWindow aboutWindow(B_TRANSLATE_APP_NAME("ActivityMonitor"), 2008, kAuthors); aboutWindow.Show(); } diff --git a/src/apps/activitymonitor/ActivityMonitor.h b/src/apps/activitymonitor/ActivityMonitor.h index 6bac156419..808dca6082 100644 --- a/src/apps/activitymonitor/ActivityMonitor.h +++ b/src/apps/activitymonitor/ActivityMonitor.h @@ -15,8 +15,6 @@ class ActivityWindow; #undef B_TRANSLATE_CONTEXT #define B_TRANSLATE_CONTEXT "ActivityWindow" -static const char* kAppName = B_TRANSLATE_MARK("ActivityMonitor"); - class ActivityMonitor : public BApplication { public: diff --git a/src/apps/activitymonitor/ActivityWindow.cpp b/src/apps/activitymonitor/ActivityWindow.cpp index 1ed737b240..8522c87369 100644 --- a/src/apps/activitymonitor/ActivityWindow.cpp +++ b/src/apps/activitymonitor/ActivityWindow.cpp @@ -34,8 +34,9 @@ static const uint32 kMsgShowSettings = 'shst'; ActivityWindow::ActivityWindow() - : BWindow(BRect(100, 100, 500, 350), kAppName, B_TITLED_WINDOW, - B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE) + : + BWindow(BRect(100, 100, 500, 350), B_TRANSLATE_APP_NAME("ActivityMonitor"), + B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE) { BMessage settings; _LoadSettings(settings); diff --git a/src/apps/activitymonitor/Jamfile b/src/apps/activitymonitor/Jamfile index 2f1fbe5230..60c7dbfabd 100644 --- a/src/apps/activitymonitor/Jamfile +++ b/src/apps/activitymonitor/Jamfile @@ -24,8 +24,3 @@ DoCatalogs ActivityMonitor : DataSource.cpp SettingsWindow.cpp ; - -AddCatalogEntryAttribute ActivityMonitor - : - "x-vnd.Haiku-ActivityMonitor:ActivityWindow:ActivityMonitor" -; diff --git a/src/apps/bootmanager/BootManagerWindow.cpp b/src/apps/bootmanager/BootManagerWindow.cpp index 5d38914baa..806066a84f 100644 --- a/src/apps/bootmanager/BootManagerWindow.cpp +++ b/src/apps/bootmanager/BootManagerWindow.cpp @@ -28,9 +28,9 @@ BootManagerWindow::BootManagerWindow() : - BWindow(BRect(100, 100, 500, 400), B_TRANSLATE_COMMENT("BootManager", - "Window Title"), B_TITLED_WINDOW, - B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) + BWindow(BRect(100, 100, 500, 400), B_TRANSLATE_APP_NAME("BootManager"), + B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE + | B_AUTO_UPDATE_SIZE_LIMITS) { float minWidth, maxWidth, minHeight, maxHeight; GetSizeLimits(&minWidth, &maxWidth, &minHeight, &maxHeight); diff --git a/src/apps/bootmanager/Jamfile b/src/apps/bootmanager/Jamfile index 20ead8c8af..a141789323 100644 --- a/src/apps/bootmanager/Jamfile +++ b/src/apps/bootmanager/Jamfile @@ -28,11 +28,6 @@ Application BootManager : DoCatalogs BootManager : x-vnd.Haiku-BootManager : $(cataloguedSources) ; -AddCatalogEntryAttribute BootManager - : - "x-vnd.Haiku-BootManager:BootManagerWindow:BootManager" -; - # Assemble the boot loader, and convert it into a header file # TODO: should be merged with the AssembleNasm rule diff --git a/src/apps/cdplayer/Jamfile b/src/apps/cdplayer/Jamfile index ad25cada84..a878bb7d83 100644 --- a/src/apps/cdplayer/Jamfile +++ b/src/apps/cdplayer/Jamfile @@ -22,8 +22,3 @@ DoCatalogs CDPlayer : : CDPlayer.cpp ; - -AddCatalogEntryAttribute CDPlayer - : - "x-vnd.Haiku-CDPlayer:CDPlayer:CDPlayer" -; diff --git a/src/apps/charactermap/Jamfile b/src/apps/charactermap/Jamfile index 9c8d19e4ec..70dd91e310 100644 --- a/src/apps/charactermap/Jamfile +++ b/src/apps/charactermap/Jamfile @@ -22,8 +22,3 @@ DoCatalogs CharacterMap : CharacterWindow.cpp UnicodeBlocks.cpp ; - -AddCatalogEntryAttribute CharacterMap - : - "x-vnd.Haiku-CharacterMap:CharacterWindow:CharacterMap" -; diff --git a/src/apps/codycam/Jamfile b/src/apps/codycam/Jamfile index 7f911b2d4e..0e2207a9b9 100644 --- a/src/apps/codycam/Jamfile +++ b/src/apps/codycam/Jamfile @@ -26,8 +26,3 @@ DoCatalogs CodyCam : SftpClient.cpp VideoConsumer.cpp ; - -AddCatalogEntryAttribute CodyCam - : - "x-vnd.Haiku.CodyCam:CodyCam:CodyCam" -; diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile index 68d4b5b47b..72fabbb561 100644 --- a/src/apps/deskbar/Jamfile +++ b/src/apps/deskbar/Jamfile @@ -40,7 +40,7 @@ Application Deskbar : Switcher.cpp $(targetSource) : be $(HAIKU_LOCALE_LIBS) tracker $(targetLib) $(TARGET_LIBSUPC++) - ; +; DoCatalogs Deskbar : x-vnd.Be-TSKB @@ -51,9 +51,4 @@ DoCatalogs Deskbar : StatusView.cpp TimeView.cpp WindowMenu.cpp - ; - -AddCatalogEntryAttribute Deskbar - : - "x-vnd.Be-TSKB:MainWindow:Deskbar" ; diff --git a/src/apps/devices/Jamfile b/src/apps/devices/Jamfile index 0ff4d17cf2..188950e1b0 100644 --- a/src/apps/devices/Jamfile +++ b/src/apps/devices/Jamfile @@ -88,11 +88,6 @@ DoCatalogs Devices : Device.cpp ; -AddCatalogEntryAttribute Devices - : - "x-vnd.Haiku-Devices:DevicesApplication:Devices" -; - Includes [ FGristFiles DevicesInfo.cpp ] : [ FGristFiles isapnpids.h usbdevs.h usbdevs_data.h ] ; Includes [ FGristFiles ConfigurationWindow.cpp ] : [ FGristFiles pcihdr.h ] ; diff --git a/src/apps/diskprobe/Jamfile b/src/apps/diskprobe/Jamfile index 6777da26cb..466886e450 100644 --- a/src/apps/diskprobe/Jamfile +++ b/src/apps/diskprobe/Jamfile @@ -31,8 +31,3 @@ DoCatalogs DiskProbe : ProbeView.cpp TypeEditors.cpp ; - -AddCatalogEntryAttribute DiskProbe - : - "x-vnd.Haiku-DiskProbe:OpenWindow:DiskProbe" -; diff --git a/src/apps/processcontroller/Jamfile b/src/apps/processcontroller/Jamfile index b7a1948226..b6feaa585c 100644 --- a/src/apps/processcontroller/Jamfile +++ b/src/apps/processcontroller/Jamfile @@ -35,8 +35,3 @@ DoCatalogs ProcessController : PriorityMenu.cpp ProcessController.cpp ; - -AddCatalogEntryAttribute ProcessController - : - x-vnd.Haiku-ProcessController:PCWindow:ProcessController -; diff --git a/src/apps/pulse/Jamfile b/src/apps/pulse/Jamfile index 78ed412f8a..feac93a547 100644 --- a/src/apps/pulse/Jamfile +++ b/src/apps/pulse/Jamfile @@ -40,9 +40,3 @@ DoCatalogs Pulse : PrefsWindow.cpp PulseWindow.cpp ; - -AddCatalogEntryAttribute Pulse - : - x-vnd.Haiku-Pulse:PulseWindow:Pulse -; - diff --git a/src/apps/sudoku/Jamfile b/src/apps/sudoku/Jamfile index eaebd2d819..64423233ed 100644 --- a/src/apps/sudoku/Jamfile +++ b/src/apps/sudoku/Jamfile @@ -24,8 +24,3 @@ DoCatalogs Sudoku : SudokuGenerator.cpp SudokuWindow.cpp ; - -AddCatalogEntryAttribute Sudoku - : - x-vnd.Haiku-Sudoku:SudokuWindow:Sudoku -;