[haiku-commits] r40945 - in haiku/trunk/src/apps: 3dmov aboutsystem activitymonitor bootmanager cdplayer ...
- From: jonas@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 14 Mar 2011 03:16:35 +0100 (CET)
Author: kirilla
Date: 2011-03-14 03:16:35 +0100 (Mon, 14 Mar 2011)
New Revision: 40945
Changeset: http://dev.haiku-os.org/changeset/40945
Modified:
haiku/trunk/src/apps/3dmov/Jamfile
haiku/trunk/src/apps/3dmov/MainWindow.cpp
haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
haiku/trunk/src/apps/aboutsystem/Jamfile
haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp
haiku/trunk/src/apps/activitymonitor/ActivityMonitor.h
haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp
haiku/trunk/src/apps/activitymonitor/Jamfile
haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp
haiku/trunk/src/apps/bootmanager/Jamfile
haiku/trunk/src/apps/cdplayer/Jamfile
haiku/trunk/src/apps/charactermap/Jamfile
haiku/trunk/src/apps/codycam/Jamfile
haiku/trunk/src/apps/deskbar/Jamfile
haiku/trunk/src/apps/devices/Jamfile
haiku/trunk/src/apps/diskprobe/Jamfile
haiku/trunk/src/apps/processcontroller/Jamfile
haiku/trunk/src/apps/pulse/Jamfile
haiku/trunk/src/apps/sudoku/Jamfile
Log:
Localization changes. Stop using AddCatalogEntryAttribute rule in Jamfiles.
Modified: haiku/trunk/src/apps/3dmov/Jamfile
===================================================================
--- haiku/trunk/src/apps/3dmov/Jamfile 2011-03-14 02:07:50 UTC (rev 40944)
+++ haiku/trunk/src/apps/3dmov/Jamfile 2011-03-14 02:16:35 UTC (rev 40945)
@@ -11,6 +11,12 @@
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
+;
Modified: haiku/trunk/src/apps/3dmov/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/3dmov/MainWindow.cpp 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/3dmov/MainWindow.cpp 2011-03-14 02:16:35 UTC (rev
40945)
@@ -9,8 +9,9 @@
On Zeta, both AddChild(new BGLView) and
new MainWindow work without any problems.
*/
+#include <Catalog.h>
+#include <GLView.h>
#include <InterfaceKit.h>
-#include <GLView.h>
#include <Messenger.h>
#include "MainWindow.h"
@@ -51,7 +52,8 @@
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++;
Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2011-03-14 02:07:50 UTC
(rev 40944)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp 2011-03-14 02:16:35 UTC
(rev 40945)
@@ -349,6 +349,8 @@
AboutApp::AboutApp()
: BApplication("application/x-vnd.Haiku-About")
{
+ B_TRANSLATE_MARK_APP_NAME("AboutSystem");
+
AboutWindow *window = new(std::nothrow) AboutWindow();
if (window)
window->Show();
Modified: haiku/trunk/src/apps/aboutsystem/Jamfile
===================================================================
--- haiku/trunk/src/apps/aboutsystem/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/aboutsystem/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -17,8 +17,3 @@
AboutSystem.cpp
Utilities.cpp
;
-
-AddCatalogEntryAttribute AboutSystem
- :
- "x-vnd.Haiku-About:AboutWindow:About this system"
-;
Modified: haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp 2011-03-14
02:07:50 UTC (rev 40944)
+++ haiku/trunk/src/apps/activitymonitor/ActivityMonitor.cpp 2011-03-14
02:16:35 UTC (rev 40945)
@@ -64,7 +64,7 @@
NULL
};
- BAboutWindow aboutWindow(kAppName, 2008, kAuthors);
+ BAboutWindow aboutWindow(B_TRANSLATE_APP_NAME("ActivityMonitor"), 2008,
kAuthors);
aboutWindow.Show();
}
Modified: haiku/trunk/src/apps/activitymonitor/ActivityMonitor.h
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityMonitor.h 2011-03-14
02:07:50 UTC (rev 40944)
+++ haiku/trunk/src/apps/activitymonitor/ActivityMonitor.h 2011-03-14
02:16:35 UTC (rev 40945)
@@ -15,9 +15,7 @@
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "ActivityWindow"
-static const char* kAppName = B_TRANSLATE_MARK("ActivityMonitor");
-
class ActivityMonitor : public BApplication {
public:
ActivityMonitor();
Modified: haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp 2011-03-14
02:07:50 UTC (rev 40944)
+++ haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp 2011-03-14
02:16:35 UTC (rev 40945)
@@ -34,8 +34,9 @@
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);
Modified: haiku/trunk/src/apps/activitymonitor/Jamfile
===================================================================
--- haiku/trunk/src/apps/activitymonitor/Jamfile 2011-03-14 02:07:50 UTC
(rev 40944)
+++ haiku/trunk/src/apps/activitymonitor/Jamfile 2011-03-14 02:16:35 UTC
(rev 40945)
@@ -24,8 +24,3 @@
DataSource.cpp
SettingsWindow.cpp
;
-
-AddCatalogEntryAttribute ActivityMonitor
- :
- "x-vnd.Haiku-ActivityMonitor:ActivityWindow:ActivityMonitor"
-;
Modified: haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp
===================================================================
--- haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp 2011-03-14
02:07:50 UTC (rev 40944)
+++ haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp 2011-03-14
02:16:35 UTC (rev 40945)
@@ -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);
Modified: haiku/trunk/src/apps/bootmanager/Jamfile
===================================================================
--- haiku/trunk/src/apps/bootmanager/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/bootmanager/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -28,11 +28,6 @@
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
Modified: haiku/trunk/src/apps/cdplayer/Jamfile
===================================================================
--- haiku/trunk/src/apps/cdplayer/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/cdplayer/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -22,8 +22,3 @@
:
CDPlayer.cpp
;
-
-AddCatalogEntryAttribute CDPlayer
- :
- "x-vnd.Haiku-CDPlayer:CDPlayer:CDPlayer"
-;
Modified: haiku/trunk/src/apps/charactermap/Jamfile
===================================================================
--- haiku/trunk/src/apps/charactermap/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/charactermap/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -22,8 +22,3 @@
CharacterWindow.cpp
UnicodeBlocks.cpp
;
-
-AddCatalogEntryAttribute CharacterMap
- :
- "x-vnd.Haiku-CharacterMap:CharacterWindow:CharacterMap"
-;
Modified: haiku/trunk/src/apps/codycam/Jamfile
===================================================================
--- haiku/trunk/src/apps/codycam/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/codycam/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -26,8 +26,3 @@
SftpClient.cpp
VideoConsumer.cpp
;
-
-AddCatalogEntryAttribute CodyCam
- :
- "x-vnd.Haiku.CodyCam:CodyCam:CodyCam"
-;
Modified: haiku/trunk/src/apps/deskbar/Jamfile
===================================================================
--- haiku/trunk/src/apps/deskbar/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/deskbar/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -40,7 +40,7 @@
Switcher.cpp
$(targetSource)
: be $(HAIKU_LOCALE_LIBS) tracker $(targetLib) $(TARGET_LIBSUPC++)
- ;
+;
DoCatalogs Deskbar :
x-vnd.Be-TSKB
@@ -51,9 +51,4 @@
StatusView.cpp
TimeView.cpp
WindowMenu.cpp
- ;
-
-AddCatalogEntryAttribute Deskbar
- :
- "x-vnd.Be-TSKB:MainWindow:Deskbar"
;
Modified: haiku/trunk/src/apps/devices/Jamfile
===================================================================
--- haiku/trunk/src/apps/devices/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/devices/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -88,11 +88,6 @@
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 ] ;
Modified: haiku/trunk/src/apps/diskprobe/Jamfile
===================================================================
--- haiku/trunk/src/apps/diskprobe/Jamfile 2011-03-14 02:07:50 UTC (rev
40944)
+++ haiku/trunk/src/apps/diskprobe/Jamfile 2011-03-14 02:16:35 UTC (rev
40945)
@@ -31,8 +31,3 @@
ProbeView.cpp
TypeEditors.cpp
;
-
-AddCatalogEntryAttribute DiskProbe
- :
- "x-vnd.Haiku-DiskProbe:OpenWindow:DiskProbe"
-;
Modified: haiku/trunk/src/apps/processcontroller/Jamfile
===================================================================
--- haiku/trunk/src/apps/processcontroller/Jamfile 2011-03-14 02:07:50 UTC
(rev 40944)
+++ haiku/trunk/src/apps/processcontroller/Jamfile 2011-03-14 02:16:35 UTC
(rev 40945)
@@ -35,8 +35,3 @@
PriorityMenu.cpp
ProcessController.cpp
;
-
-AddCatalogEntryAttribute ProcessController
- :
- x-vnd.Haiku-ProcessController:PCWindow:ProcessController
-;
Modified: haiku/trunk/src/apps/pulse/Jamfile
===================================================================
--- haiku/trunk/src/apps/pulse/Jamfile 2011-03-14 02:07:50 UTC (rev 40944)
+++ haiku/trunk/src/apps/pulse/Jamfile 2011-03-14 02:16:35 UTC (rev 40945)
@@ -40,9 +40,3 @@
PrefsWindow.cpp
PulseWindow.cpp
;
-
-AddCatalogEntryAttribute Pulse
- :
- x-vnd.Haiku-Pulse:PulseWindow:Pulse
-;
-
Modified: haiku/trunk/src/apps/sudoku/Jamfile
===================================================================
--- haiku/trunk/src/apps/sudoku/Jamfile 2011-03-14 02:07:50 UTC (rev 40944)
+++ haiku/trunk/src/apps/sudoku/Jamfile 2011-03-14 02:16:35 UTC (rev 40945)
@@ -24,8 +24,3 @@
SudokuGenerator.cpp
SudokuWindow.cpp
;
-
-AddCatalogEntryAttribute Sudoku
- :
- x-vnd.Haiku-Sudoku:SudokuWindow:Sudoku
-;
Other related posts:
- » [haiku-commits] r40945 - in haiku/trunk/src/apps: 3dmov aboutsystem activitymonitor bootmanager cdplayer ... - jonas
