Localization changes. Stop using AddCatalogEntryAttribute rule in Jamfiles.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40945 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström 2011-03-14 02:16:35 +00:00
parent 2e7a9f2783
commit 47798a10f7
19 changed files with 21 additions and 73 deletions

View File

@ -11,6 +11,12 @@ Application 3DMov :
ViewCube.cpp ViewCube.cpp
ViewSphere.cpp ViewSphere.cpp
GLUtility.cpp GLUtility.cpp
: be GL game media translation $(TARGET_LIBSUPC++) : be GL game $(HAIKU_LOCALE_LIBS) media translation $(TARGET_LIBSUPC++)
: 3dmov.rdef : 3dmov.rdef
; ;
DoCatalogs 3DMov :
x-vnd.Haiku-3DMov
:
MainWindow.cpp
;

View File

@ -9,8 +9,9 @@
On Zeta, both AddChild(new BGLView) and new MainWindow work without any problems. On Zeta, both AddChild(new BGLView) and new MainWindow work without any problems.
*/ */
#include <InterfaceKit.h> #include <Catalog.h>
#include <GLView.h> #include <GLView.h>
#include <InterfaceKit.h>
#include <Messenger.h> #include <Messenger.h>
#include "MainWindow.h" #include "MainWindow.h"
@ -51,7 +52,8 @@ static int sMainWindowCount = 0; // keep track of number of spawned windows
DESCRIPTION: Constructor DESCRIPTION: Constructor
*/ */
MainWindow :: MainWindow(BRect frame, SHAPE shape) 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++; sMainWindowCount++;

View File

@ -349,6 +349,8 @@ private:
AboutApp::AboutApp() AboutApp::AboutApp()
: BApplication("application/x-vnd.Haiku-About") : BApplication("application/x-vnd.Haiku-About")
{ {
B_TRANSLATE_MARK_APP_NAME("AboutSystem");
AboutWindow *window = new(std::nothrow) AboutWindow(); AboutWindow *window = new(std::nothrow) AboutWindow();
if (window) if (window)
window->Show(); window->Show();

View File

@ -17,8 +17,3 @@ DoCatalogs AboutSystem :
AboutSystem.cpp AboutSystem.cpp
Utilities.cpp Utilities.cpp
; ;
AddCatalogEntryAttribute AboutSystem
:
"x-vnd.Haiku-About:AboutWindow:About this system"
;

View File

@ -64,7 +64,7 @@ ActivityMonitor::ShowAbout()
NULL NULL
}; };
BAboutWindow aboutWindow(kAppName, 2008, kAuthors); BAboutWindow aboutWindow(B_TRANSLATE_APP_NAME("ActivityMonitor"), 2008, kAuthors);
aboutWindow.Show(); aboutWindow.Show();
} }

View File

@ -15,8 +15,6 @@ class ActivityWindow;
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "ActivityWindow" #define B_TRANSLATE_CONTEXT "ActivityWindow"
static const char* kAppName = B_TRANSLATE_MARK("ActivityMonitor");
class ActivityMonitor : public BApplication { class ActivityMonitor : public BApplication {
public: public:

View File

@ -34,8 +34,9 @@ static const uint32 kMsgShowSettings = 'shst';
ActivityWindow::ActivityWindow() 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; BMessage settings;
_LoadSettings(settings); _LoadSettings(settings);

View File

@ -24,8 +24,3 @@ DoCatalogs ActivityMonitor :
DataSource.cpp DataSource.cpp
SettingsWindow.cpp SettingsWindow.cpp
; ;
AddCatalogEntryAttribute ActivityMonitor
:
"x-vnd.Haiku-ActivityMonitor:ActivityWindow:ActivityMonitor"
;

View File

@ -28,9 +28,9 @@
BootManagerWindow::BootManagerWindow() BootManagerWindow::BootManagerWindow()
: :
BWindow(BRect(100, 100, 500, 400), B_TRANSLATE_COMMENT("BootManager", BWindow(BRect(100, 100, 500, 400), B_TRANSLATE_APP_NAME("BootManager"),
"Window Title"), B_TITLED_WINDOW, B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) | B_AUTO_UPDATE_SIZE_LIMITS)
{ {
float minWidth, maxWidth, minHeight, maxHeight; float minWidth, maxWidth, minHeight, maxHeight;
GetSizeLimits(&minWidth, &maxWidth, &minHeight, &maxHeight); GetSizeLimits(&minWidth, &maxWidth, &minHeight, &maxHeight);

View File

@ -28,11 +28,6 @@ Application BootManager :
DoCatalogs BootManager : x-vnd.Haiku-BootManager : $(cataloguedSources) ; 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 # Assemble the boot loader, and convert it into a header file
# TODO: should be merged with the AssembleNasm rule # TODO: should be merged with the AssembleNasm rule

View File

@ -22,8 +22,3 @@ DoCatalogs CDPlayer :
: :
CDPlayer.cpp CDPlayer.cpp
; ;
AddCatalogEntryAttribute CDPlayer
:
"x-vnd.Haiku-CDPlayer:CDPlayer:CDPlayer"
;

View File

@ -22,8 +22,3 @@ DoCatalogs CharacterMap :
CharacterWindow.cpp CharacterWindow.cpp
UnicodeBlocks.cpp UnicodeBlocks.cpp
; ;
AddCatalogEntryAttribute CharacterMap
:
"x-vnd.Haiku-CharacterMap:CharacterWindow:CharacterMap"
;

View File

@ -26,8 +26,3 @@ DoCatalogs CodyCam :
SftpClient.cpp SftpClient.cpp
VideoConsumer.cpp VideoConsumer.cpp
; ;
AddCatalogEntryAttribute CodyCam
:
"x-vnd.Haiku.CodyCam:CodyCam:CodyCam"
;

View File

@ -40,7 +40,7 @@ Application Deskbar :
Switcher.cpp Switcher.cpp
$(targetSource) $(targetSource)
: be $(HAIKU_LOCALE_LIBS) tracker $(targetLib) $(TARGET_LIBSUPC++) : be $(HAIKU_LOCALE_LIBS) tracker $(targetLib) $(TARGET_LIBSUPC++)
; ;
DoCatalogs Deskbar : DoCatalogs Deskbar :
x-vnd.Be-TSKB x-vnd.Be-TSKB
@ -51,9 +51,4 @@ DoCatalogs Deskbar :
StatusView.cpp StatusView.cpp
TimeView.cpp TimeView.cpp
WindowMenu.cpp WindowMenu.cpp
;
AddCatalogEntryAttribute Deskbar
:
"x-vnd.Be-TSKB:MainWindow:Deskbar"
; ;

View File

@ -88,11 +88,6 @@ DoCatalogs Devices :
Device.cpp Device.cpp
; ;
AddCatalogEntryAttribute Devices
:
"x-vnd.Haiku-Devices:DevicesApplication:Devices"
;
Includes [ FGristFiles DevicesInfo.cpp ] : [ FGristFiles isapnpids.h usbdevs.h Includes [ FGristFiles DevicesInfo.cpp ] : [ FGristFiles isapnpids.h usbdevs.h
usbdevs_data.h ] ; usbdevs_data.h ] ;
Includes [ FGristFiles ConfigurationWindow.cpp ] : [ FGristFiles pcihdr.h ] ; Includes [ FGristFiles ConfigurationWindow.cpp ] : [ FGristFiles pcihdr.h ] ;

View File

@ -31,8 +31,3 @@ DoCatalogs DiskProbe :
ProbeView.cpp ProbeView.cpp
TypeEditors.cpp TypeEditors.cpp
; ;
AddCatalogEntryAttribute DiskProbe
:
"x-vnd.Haiku-DiskProbe:OpenWindow:DiskProbe"
;

View File

@ -35,8 +35,3 @@ DoCatalogs ProcessController :
PriorityMenu.cpp PriorityMenu.cpp
ProcessController.cpp ProcessController.cpp
; ;
AddCatalogEntryAttribute ProcessController
:
x-vnd.Haiku-ProcessController:PCWindow:ProcessController
;

View File

@ -40,9 +40,3 @@ DoCatalogs Pulse :
PrefsWindow.cpp PrefsWindow.cpp
PulseWindow.cpp PulseWindow.cpp
; ;
AddCatalogEntryAttribute Pulse
:
x-vnd.Haiku-Pulse:PulseWindow:Pulse
;

View File

@ -24,8 +24,3 @@ DoCatalogs Sudoku :
SudokuGenerator.cpp SudokuGenerator.cpp
SudokuWindow.cpp SudokuWindow.cpp
; ;
AddCatalogEntryAttribute Sudoku
:
x-vnd.Haiku-Sudoku:SudokuWindow:Sudoku
;