[haiku-commits] r40968 - in haiku/trunk/src/apps: activitymonitor bootmanager charactermap codycam deskbar ...
- From: jonas@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 16 Mar 2011 01:42:21 +0100 (CET)
Author: kirilla
Date: 2011-03-16 01:42:18 +0100 (Wed, 16 Mar 2011)
New Revision: 40968
Changeset: http://dev.haiku-os.org/changeset/40968
Modified:
haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp
haiku/trunk/src/apps/bootmanager/BootManager.cpp
haiku/trunk/src/apps/bootmanager/Jamfile
haiku/trunk/src/apps/charactermap/CharacterMap.cpp
haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
haiku/trunk/src/apps/charactermap/Jamfile
haiku/trunk/src/apps/codycam/CodyCam.cpp
haiku/trunk/src/apps/codycam/CodyCam.h
haiku/trunk/src/apps/codycam/Jamfile
haiku/trunk/src/apps/deskbar/BeMenu.cpp
haiku/trunk/src/apps/deskcalc/CalcView.cpp
haiku/trunk/src/apps/deskcalc/Jamfile
haiku/trunk/src/apps/devices/DevicesApplication.cpp
haiku/trunk/src/apps/devices/DevicesView.cpp
haiku/trunk/src/apps/devices/Jamfile
haiku/trunk/src/apps/expander/ExpanderApp.cpp
haiku/trunk/src/apps/expander/Jamfile
haiku/trunk/src/apps/installedpackages/UninstallWindow.cpp
haiku/trunk/src/apps/launchbox/App.cpp
haiku/trunk/src/apps/launchbox/PadView.cpp
haiku/trunk/src/apps/magnify/Jamfile
haiku/trunk/src/apps/magnify/Magnify.cpp
haiku/trunk/src/apps/mail/MailApp.cpp
haiku/trunk/src/apps/mail/MailWindow.cpp
haiku/trunk/src/apps/mediaconverter/Jamfile
haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
haiku/trunk/src/apps/mediaconverter/MessageConstants.h
haiku/trunk/src/apps/mediaplayer/MainApp.cpp
haiku/trunk/src/apps/mediaplayer/MainWin.cpp
haiku/trunk/src/apps/midiplayer/MidiPlayerWindow.cpp
haiku/trunk/src/apps/networkstatus/NetworkStatusWindow.cpp
haiku/trunk/src/apps/overlayimage/Jamfile
haiku/trunk/src/apps/overlayimage/OverlayWindow.cpp
haiku/trunk/src/apps/packageinstaller/Jamfile
haiku/trunk/src/apps/packageinstaller/PackageWindow.cpp
haiku/trunk/src/apps/packagemanager/ApplicationWindow.cpp
haiku/trunk/src/apps/packagemanager/Jamfile
haiku/trunk/src/apps/packagemanager/PackageManager.cpp
haiku/trunk/src/apps/pairs/PairsWindow.cpp
haiku/trunk/src/apps/poorman/Jamfile
haiku/trunk/src/apps/poorman/PoorManApplication.cpp
haiku/trunk/src/apps/poorman/PoorManWindow.cpp
haiku/trunk/src/apps/poorman/constants.cpp
haiku/trunk/src/apps/poorman/constants.h
Log:
Making use of B_TRANSLATE_APP_NAME, BAboutMenuItem, BAboutWindow. Clean-up.
Removal of some ellipsis. ('About Haiku' in Deskbar.)
Modified: haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -8,6 +8,7 @@
#include <stdio.h>
+#include <AboutMenuItem.h>
#include <Application.h>
#include <Catalog.h>
#include <File.h>
@@ -124,9 +125,7 @@
new BMessage(kMsgAddView)));
menu->AddSeparatorItem();
- menu->AddItem(item = new BMenuItem(
- B_TRANSLATE("About ActivityMonitor" B_UTF8_ELLIPSIS),
- new BMessage(B_ABOUT_REQUESTED)));
+ menu->AddItem(item = new BAboutMenuItem());
menu->AddSeparatorItem();
menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
Modified: haiku/trunk/src/apps/bootmanager/BootManager.cpp
===================================================================
--- haiku/trunk/src/apps/bootmanager/BootManager.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/bootmanager/BootManager.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -10,6 +10,7 @@
#include "BootManagerWindow.h"
+#include <AboutWindow.h>
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
@@ -51,30 +52,14 @@
void
BootManager::AboutRequested()
{
- BString aboutText;
- const char* title = B_TRANSLATE_COMMENT("BootManager", "Application
name");
- aboutText << title << "\n\n"
- << B_TRANSLATE("written by")
- << "\n"
- "\tDavid Dengg\n"
- "\tMichael Pfeiffer\n"
- "\n"
- << B_TRANSLATE_COMMENT("Copyright %year, Haiku Inc.\n",
- "Leave %year untranslated");
- aboutText.ReplaceLast("%year", "2008-2010");
- BAlert *alert = new BAlert("about",
- aboutText.String(), B_TRANSLATE("OK"));
- BTextView *view = alert->TextView();
- BFont font;
-
- view->SetStylable(true);
-
- view->GetFont(&font);
- font.SetSize(18);
- font.SetFace(B_BOLD_FACE);
- view->SetFontAndColor(0, strlen(title), &font);
-
- alert->Go();
+ const char* authors[] = {
+ "David Dengg",
+ "Michael Pfeiffer",
+ NULL
+ };
+
+ BAboutWindow about(B_TRANSLATE_APP_NAME("BootManager"), 2008, authors);
+ about.Show();
}
Modified: haiku/trunk/src/apps/bootmanager/Jamfile
===================================================================
--- haiku/trunk/src/apps/bootmanager/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/bootmanager/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -22,7 +22,7 @@
WizardController.cpp
WizardPageView.cpp
- : be textencoding tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+ : be libshared.a textencoding tracker $(HAIKU_LOCALE_LIBS)
$(TARGET_LIBSUPC++)
: BootManager.rdef
;
Modified: haiku/trunk/src/apps/charactermap/CharacterMap.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterMap.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/charactermap/CharacterMap.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -8,6 +8,7 @@
#include <stdlib.h>
+#include <AboutWindow.h>
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
@@ -57,21 +58,13 @@
void
CharacterMap::AboutRequested()
{
- BAlert *alert = new BAlert("about", B_TRANSLATE(
- "CharacterMap\n"
- "\twritten by Axel Dörfler\n"
- "\tCopyright 2009, Haiku, Inc.\n"), B_TRANSLATE("OK"));
- BTextView *view = alert->TextView();
- BFont font;
-
- view->SetStylable(true);
-
- view->GetFont(&font);
- font.SetSize(18);
- font.SetFace(B_BOLD_FACE);
- view->SetFontAndColor(0, 12, &font);
-
- alert->Go();
+ const char* authors[] = {
+ "Axel Dörfler",
+ NULL
+ };
+
+ BAboutWindow about(B_TRANSLATE_APP_NAME("CharacterMap"), 2009, authors);
+ about.Show();
}
Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <string.h>
+#include <AboutMenuItem.h>
#include <Application.h>
#include <Button.h>
#include <Catalog.h>
@@ -227,8 +228,7 @@
BMenu* menu = new BMenu(B_TRANSLATE("File"));
BMenuItem* item;
- menu->AddItem(item = new BMenuItem(B_TRANSLATE("About CharacterMap"
- B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)));
+ menu->AddItem(item = new BAboutMenuItem());
menu->AddSeparatorItem();
Modified: haiku/trunk/src/apps/charactermap/Jamfile
===================================================================
--- haiku/trunk/src/apps/charactermap/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/charactermap/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -11,7 +11,7 @@
UnicodeBlocks.cpp
UnicodeBlockView.cpp
- : be locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
+ : be libshared.a locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
: CharacterMap.rdef
;
Modified: haiku/trunk/src/apps/codycam/CodyCam.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/CodyCam.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/codycam/CodyCam.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -4,6 +4,8 @@
#include <string.h>
#include <unistd.h>
+#include <AboutMenuItem.h>
+#include <AboutWindow.h>
#include <Alert.h>
#include <Button.h>
#include <LayoutBuilder.h>
@@ -255,11 +257,6 @@
break;
}
- case msg_about:
- (new BAlert(B_TRANSLATE("About CodyCam"),
B_TRANSLATE("CodyCam\n\n"
- "The Original BeOS webcam"),
B_TRANSLATE("Close")))->Go();
- break;
-
case msg_control_win:
// our control window is being asked to go away
// set our pointer to NULL
@@ -273,6 +270,21 @@
}
+void
+CodyCam::AboutRequested()
+{
+ const char* authors[] = {
+ "Be, Incorporated",
+ NULL
+ };
+
+ BAboutWindow about(B_TRANSLATE_APP_NAME("CodyCam"), 2003, authors,
+ "The Original BeOS webcam.\n"
+ B_UTF8_COPYRIGHT " 1998-1999 Be, Incorporated.");
+ about.Show();
+}
+
+
status_t
CodyCam::_SetUpNodes()
{
@@ -510,8 +522,7 @@
menu->AddSeparatorItem();
- menuItem = new BMenuItem(B_TRANSLATE("About Codycam" B_UTF8_ELLIPSIS),
- new BMessage(msg_about), 'B');
+ menuItem = new BAboutMenuItem();
menuItem->SetTarget(be_app);
menu->AddItem(menuItem);
Modified: haiku/trunk/src/apps/codycam/CodyCam.h
===================================================================
--- haiku/trunk/src/apps/codycam/CodyCam.h 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/codycam/CodyCam.h 2011-03-16 00:42:18 UTC (rev
40968)
@@ -40,7 +40,6 @@
msg_start = 'strt',
msg_stop = 'stop',
- msg_about = 'abut',
msg_setup = 'setp',
msg_video = 'vdeo',
@@ -94,6 +93,7 @@
void ReadyToRun();
virtual bool QuitRequested();
virtual void MessageReceived(BMessage* message);
+ virtual void AboutRequested();
private:
status_t _SetUpNodes();
Modified: haiku/trunk/src/apps/codycam/Jamfile
===================================================================
--- haiku/trunk/src/apps/codycam/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/codycam/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -2,6 +2,8 @@
SetSubDirSupportedPlatformsBeOSCompatible ;
+UsePrivateHeaders shared ;
+
Application CodyCam :
CodyCam.cpp
FileUploadClient.cpp
@@ -11,7 +13,7 @@
Settings.cpp
SettingsHandler.cpp
VideoConsumer.cpp
- : be $(HAIKU_LOCALE_LIBS) media translation $(TARGET_NETAPI_LIB)
+ : be $(HAIKU_LOCALE_LIBS) libshared.a media translation
$(TARGET_NETAPI_LIB)
$(TARGET_LIBSTDC++)
: CodyCam.rdef
;
Modified: haiku/trunk/src/apps/deskbar/BeMenu.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BeMenu.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/deskbar/BeMenu.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -246,10 +246,10 @@
#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
static const char* kAboutHaikuMenuItemStr = B_TRANSLATE_MARK(
- "About Haiku" B_UTF8_ELLIPSIS);
+ "About Haiku");
#else
static const char* kAboutThisSystemMenuItemStr = B_TRANSLATE_MARK(
- "About this system" B_UTF8_ELLIPSIS);
+ "About this system");
#endif
item = new BMenuItem(
Modified: haiku/trunk/src/apps/deskcalc/CalcView.cpp
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcView.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/deskcalc/CalcView.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -17,6 +17,8 @@
#include <ctype.h>
#include <assert.h>
+#include <AboutMenuItem.h>
+#include <AboutWindow.h>
#include <Alert.h>
#include <Application.h>
#include <AppFileInfo.h>
@@ -686,13 +688,15 @@
void
CalcView::AboutRequested()
{
- BAlert* alert = new BAlert(B_TRANSLATE("about"),B_TRANSLATE(
- "DeskCalc v2.1.0\n\n"
- "written by Timothy Wayper,\nStephan Aßmus and Ingo
Weinhold\n\n"
- B_UTF8_COPYRIGHT "1997, 1998 R3 Software Ltd.\n"
- B_UTF8_COPYRIGHT "2006-2009 Haiku, Inc.\n\n"
- "All Rights Reserved."), "OK");
- alert->Go(NULL);
+ const char* authors[] = {
+ "Timothy Wayper",
+ "nStephan Aßmus",
+ "Ingo Weinhold",
+ NULL
+ };
+ BAboutWindow about(B_TRANSLATE_APP_NAME("DeskCalc"), 2006, authors,
+ B_UTF8_COPYRIGHT "1997, 1998 R3 Software Ltd.");
+ about.Show();
}
@@ -1108,8 +1112,7 @@
new BMessage(MSG_OPTIONS_AUDIO_FEEDBACK));
fShowKeypadItem = new BMenuItem(B_TRANSLATE("Show keypad"),
new BMessage(MSG_OPTIONS_SHOW_KEYPAD));
- fAboutItem = new BMenuItem(B_TRANSLATE("About DeskCalc"
B_UTF8_ELLIPSIS),
- new BMessage(B_ABOUT_REQUESTED));
+ fAboutItem = new BAboutMenuItem();
// apply current settings
fAutoNumlockItem->SetMarked(fOptions->auto_num_lock);
Modified: haiku/trunk/src/apps/deskcalc/Jamfile
===================================================================
--- haiku/trunk/src/apps/deskcalc/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/deskcalc/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -13,7 +13,7 @@
ExpressionTextView.cpp
InputTextView.cpp
: be $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS) media
libexpression_parser.a
- libmapm.a
+ libmapm.a libshared.a
: DeskCalc.rdef
;
Modified: haiku/trunk/src/apps/devices/DevicesApplication.cpp
===================================================================
--- haiku/trunk/src/apps/devices/DevicesApplication.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/devices/DevicesApplication.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -6,6 +6,7 @@
* Pieter Panman
*/
+#include <AboutWindow.h>
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
@@ -53,24 +54,14 @@
void
DevicesApplication::ShowAbout()
{
- BAlert* alert = new BAlert(B_TRANSLATE("About"), B_TRANSLATE("Devices\n"
- "\twritten by Pieter Panman\n"
- "\n"
- "\tBased on listdev by Jérôme Duval\n"
- "\tand the previous Devices preference\n"
- "\tby Jérôme Duval and Sikosis\n"
- "\tCopyright 2009, Haiku, Inc.\n"), B_TRANSLATE("OK"));
- BTextView* view = alert->TextView();
- BFont font;
-
- view->SetStylable(true);
-
- view->GetFont(&font);
- font.SetSize(18);
- font.SetFace(B_BOLD_FACE);
- view->SetFontAndColor(0, 7, &font);
-
- alert->Go();
+ const char* authors[] = {
+ "Pieter Panman",
+ NULL
+ };
+ BAboutWindow about(B_TRANSLATE_APP_NAME("Devices"), 2009, authors,
+ "Based on listdev by Jérôme Duval and the previous Devices "
+ "preference by Jérôme Duval and Sikosis.");
+ about.Show();
}
Modified: haiku/trunk/src/apps/devices/DevicesView.cpp
===================================================================
--- haiku/trunk/src/apps/devices/DevicesView.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/devices/DevicesView.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -7,6 +7,7 @@
*/
+#include <AboutMenuItem.h>
#include <Application.h>
#include <Catalog.h>
#include <MenuBar.h>
@@ -44,8 +45,7 @@
"Generate system information"), new
BMessage(kMsgGenerateSysInfo)));
item->SetEnabled(false);
menu->AddSeparatorItem();
- menu->AddItem(item = new BMenuItem(B_TRANSLATE("About Devices"
- B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)));
+ menu->AddItem(item = new BAboutMenuItem());
menu->AddSeparatorItem();
menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
new BMessage(B_QUIT_REQUESTED), 'Q'));
Modified: haiku/trunk/src/apps/devices/Jamfile
===================================================================
--- haiku/trunk/src/apps/devices/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/devices/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -72,7 +72,8 @@
Device.cpp
PropertyList.cpp
PropertyListPlain.cpp
- : be libcolumnlistview.a tracker $(TARGET_LIBSUPC++)
$(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
+ : be libcolumnlistview.a libshared.a tracker $(TARGET_LIBSUPC++)
+ $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
: Devices.rdef
;
Modified: haiku/trunk/src/apps/expander/ExpanderApp.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderApp.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/expander/ExpanderApp.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -5,15 +5,19 @@
#include "ExpanderApp.h"
-#include "ExpanderWindow.h"
+#include <AboutWindow.h>
#include <Alert.h>
#include <Catalog.h>
#include <Locale.h>
#include <TextView.h>
+#include "ExpanderWindow.h"
+
+
ExpanderApp::ExpanderApp()
- : BApplication("application/x-vnd.Haiku-Expander")
+ :
+ BApplication("application/x-vnd.Haiku-Expander")
{
BPoint windowPosition =
fSettings.Message().FindPoint("window_position");
BRect windowFrame(0, 0, 450, 120);
@@ -29,24 +33,13 @@
void
ExpanderApp::AboutRequested()
{
- 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"
- "\tCopyright 2004-2006, Haiku Inc.\n\noriginal Be
version by \n"
- "Dominic, Hiroshi, Peter, Pavel and Robert\n")),
- B_TRANSLATE("OK"));
- BTextView* view = alert->TextView();
- BFont font;
-
- view->SetStylable(true);
-
- view->GetFont(&font);
- font.SetSize(18);
- font.SetFace(B_BOLD_FACE);
- view->SetFontAndColor(0, nameLength, &font);
-
- alert->Go();
+ const char* authors[] = {
+ "Jérôme Duval",
+ NULL
+ };
+ BAboutWindow about(B_TRANSLATE_APP_NAME("Expander"), 2004, authors,
+ "Original Be version by Dominic, Hiroshi, Peter, Pavel and
Robert.");
+ about.Show();
}
Modified: haiku/trunk/src/apps/expander/Jamfile
===================================================================
--- haiku/trunk/src/apps/expander/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/expander/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -1,5 +1,7 @@
SubDir HAIKU_TOP src apps expander ;
+UsePrivateHeaders shared ;
+
Application Expander :
ExpanderApp.cpp
ExpanderWindow.cpp
@@ -10,7 +12,7 @@
DirectoryFilePanel.cpp
ExpanderRules.cpp
PasswordAlert.cpp
- : be tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+ : be libshared.a tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
: Expander.rdef
;
Modified: haiku/trunk/src/apps/installedpackages/UninstallWindow.cpp
===================================================================
--- haiku/trunk/src/apps/installedpackages/UninstallWindow.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/installedpackages/UninstallWindow.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -20,9 +20,9 @@
UninstallWindow::UninstallWindow()
:
- BWindow(BRect(100, 100, 600, 300), B_TRANSLATE("Installed packages"),
- B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_QUIT_ON_WINDOW_CLOSE
- | B_AUTO_UPDATE_SIZE_LIMITS)
+ BWindow(BRect(100, 100, 600, 300),
+ B_TRANSLATE_APP_NAME("InstalledPackages"), B_TITLED_WINDOW,
+ B_NOT_ZOOMABLE | B_QUIT_ON_WINDOW_CLOSE |
B_AUTO_UPDATE_SIZE_LIMITS)
{
SetLayout(new BGroupLayout(B_HORIZONTAL));
AddChild(new UninstallView());
Modified: haiku/trunk/src/apps/launchbox/App.cpp
===================================================================
--- haiku/trunk/src/apps/launchbox/App.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/launchbox/App.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -110,7 +110,7 @@
const char* authors[2];
authors[0] = B_TRANSLATE("Stephan Aßmus (aka stippi)");
authors[1] = NULL;
- BString appName = B_TRANSLATE("LaunchBox");
+ BString appName = B_TRANSLATE_APP_NAME("LaunchBox");
BAboutWindow(appName, 2004, authors).Show();
}
Modified: haiku/trunk/src/apps/launchbox/PadView.cpp
===================================================================
--- haiku/trunk/src/apps/launchbox/PadView.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/launchbox/PadView.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -423,7 +423,7 @@
padM->AddItem(item);
menu->AddItem(padM);
// app commands
- BMenu* appM = new BMenu(B_TRANSLATE("LaunchBox"));
+ BMenu* appM = new BMenu(B_TRANSLATE_APP_NAME("LaunchBox"));
appM->SetFont(be_plain_font);
// about
item = new BMenuItem(B_TRANSLATE("About"), new
BMessage(B_ABOUT_REQUESTED));
Modified: haiku/trunk/src/apps/magnify/Jamfile
===================================================================
--- haiku/trunk/src/apps/magnify/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/magnify/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -4,14 +4,16 @@
AddSubDirSupportedPlatforms libbe_test ;
+UsePrivateHeaders shared ;
+
Application Magnify :
Magnify.cpp
- : be tracker game $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
+ : be game $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSUPC++) tracker
: Magnify.rdef
;
DoCatalogs Magnify :
- x-vnd.Haiku-Magnify
+ x-vnd.Haiku-Magnify
:
Magnify.cpp
;
Modified: haiku/trunk/src/apps/magnify/Magnify.cpp
===================================================================
--- haiku/trunk/src/apps/magnify/Magnify.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/magnify/Magnify.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -10,6 +10,7 @@
#include "Magnify.h"
+#include <AboutMenuItem.h>
#include <Alert.h>
#include <Bitmap.h>
#include <Catalog.h>
@@ -131,11 +132,9 @@
BuildInfoMenu(BMenu *menu)
{
BMenuItem* menuItem;
-
- menuItem = new BMenuItem(B_TRANSLATE("About Magnify" B_UTF8_ELLIPSIS),
- new BMessage(B_ABOUT_REQUESTED));
+ menuItem = new BAboutMenuItem();
menu->AddItem(menuItem);
- menuItem = new BMenuItem(B_TRANSLATE("Help" B_UTF8_ELLIPSIS),
+ menuItem = new BMenuItem(B_TRANSLATE("Help"),
new BMessage(msg_help));
menu->AddItem(menuItem);
menu->AddSeparatorItem();
@@ -239,7 +238,7 @@
TWindow::TWindow(int32 pixelCount)
:
- BWindow(BRect(0, 0, 0, 0), B_TRANSLATE("Magnify"),
+ BWindow(BRect(0, 0, 0, 0), B_TRANSLATE_APP_NAME("Magnify"),
B_TITLED_WINDOW, B_OUTLINE_RESIZE)
{
GetPrefs(pixelCount);
Modified: haiku/trunk/src/apps/mail/MailApp.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailApp.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/mail/MailApp.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -1123,7 +1123,7 @@
}
}
if (title == "")
- title = B_TRANSLATE("Mail");
+ title = B_TRANSLATE_APP_NAME("Mail");
TMailWindow* window = new TMailWindow(r, title.String(), this, ref, to,
&fContentFont, resend, trackerMessenger);
Modified: haiku/trunk/src/apps/mail/MailWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailWindow.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/mail/MailWindow.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -976,7 +976,7 @@
if (!fIncoming && fieldMask & FIELD_SUBJECT) {
// If no subject, set to "Mail"
if
(!fHeaderView->fSubject->TextView()->TextLength())
- SetTitle("Mail");
+ SetTitle(B_TRANSLATE_APP_NAME("Mail"));
else
SetTitle(fHeaderView->fSubject->Text());
}
@@ -2741,7 +2741,7 @@
//
// Figure out the title of this message and set the title bar
//
- BString title = "Mail";
+ BString title = B_TRANSLATE_APP_NAME("Mail");
if (fIncoming) {
if (fMail->GetName(&title) == B_OK)
Modified: haiku/trunk/src/apps/mediaconverter/Jamfile
===================================================================
--- haiku/trunk/src/apps/mediaconverter/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/mediaconverter/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -2,6 +2,8 @@
SetSubDirSupportedPlatformsBeOSCompatible ;
+UsePrivateHeaders shared ;
+
Application MediaConverter :
MediaConverterApp.cpp
MediaConverterWindow.cpp
@@ -10,7 +12,7 @@
MediaFileInfoView.cpp
MediaFileListView.cpp
- : be media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
+ : be libshared.a media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
: MediaConverter.rdef
;
Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
2011-03-15 21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
2011-03-16 00:42:18 UTC (rev 40968)
@@ -9,6 +9,7 @@
#include <stdio.h>
#include <string.h>
+#include <AboutMenuItem.h>
#include <Alert.h>
#include <Application.h>
#include <Box.h>
@@ -110,7 +111,7 @@
MediaConverterWindow::MediaConverterWindow(BRect frame)
:
- BWindow(frame, B_TRANSLATE("MediaConverter"), B_TITLED_WINDOW_LOOK,
+ BWindow(frame, B_TRANSLATE_APP_NAME("MediaConverter"),
B_TITLED_WINDOW_LOOK,
B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
|
B_AUTO_UPDATE_SIZE_LIMITS),
fVideoQuality(75),
@@ -383,7 +384,7 @@
case B_CANCEL:
break;
- case DISP_ABOUT_MESSAGE:
+ case B_ABOUT_REQUESTED:
{
BString title(B_TRANSLATE("About" B_UTF8_ELLIPSIS));
(new BAlert(title,
@@ -932,10 +933,7 @@
new BMessage(OPEN_FILE_MESSAGE), 'O');
menu->AddItem(item);
menu->AddSeparatorItem();
-
- item = new BMenuItem(B_TRANSLATE_WITH_CONTEXT(
- "About MediaConverter" B_UTF8_ELLIPSIS, "Menu"),
- new BMessage(DISP_ABOUT_MESSAGE));
+ item = new BAboutMenuItem(),
menu->AddItem(item);
menu->AddSeparatorItem();
item = new BMenuItem(B_TRANSLATE_WITH_CONTEXT("Quit", "Menu"),
Modified: haiku/trunk/src/apps/mediaconverter/MessageConstants.h
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MessageConstants.h 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/mediaconverter/MessageConstants.h 2011-03-16
00:42:18 UTC (rev 40968)
@@ -17,7 +17,6 @@
#define OUTPUT_FOLDER_MESSAGE 'oUTF'
#define FOLDER_SELECT_MESSAGE 'sLFO'
#define OPEN_FILE_MESSAGE 'oFIL'
-#define DISP_ABOUT_MESSAGE 'aBUT'
#define QUIT_MESSAGE 'qUIT'
#define PREVIEW_MESSAGE 'pVEW'
#define PRIORITY_CHANGED_MESSAGE 'cPRI'
Modified: haiku/trunk/src/apps/mediaplayer/MainApp.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainApp.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/mediaplayer/MainApp.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -410,9 +410,11 @@
void
MainApp::AboutRequested()
{
- BAlert* alert = new BAlert("about", B_TRANSLATE(
- NAME"\n\nWritten by Marcus Overhagen, "
- "Stephan Aßmus and Frederik Modéen"),
+ const char* appName = B_TRANSLATE_APP_NAME("MediaPlayer");
+ BString message = B_TRANSLATE("%app%\n\nWritten by Marcus Overhagen, "
+ "Stephan Aßmus and Frederik Modéen");
+ message.ReplaceFirst("%app%", appName);
+ BAlert* alert = new BAlert(appName, message.String(),
B_TRANSLATE("Thanks"));
alert->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
// Make sure it is on top of any player windows that may have
the
Modified: haiku/trunk/src/apps/mediaplayer/MainWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainWin.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/mediaplayer/MainWin.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <string.h>
+#include <AboutMenuItem.h>
#include <Alert.h>
#include <Application.h>
#include <Autolock.h>
@@ -166,7 +167,7 @@
static const char* kDisabledSeekMessage = B_TRANSLATE("Drop files to play");
-static const char* kApplicationName = B_TRANSLATE(NAME);
+static const char* kApplicationName = B_TRANSLATE_APP_NAME(NAME);
//#define printf(a...)
@@ -1084,9 +1085,11 @@
if (ret != B_OK) {
fprintf(stderr, "MainWin::OpenPlaylistItem() - Failed to send
message "
"to Controller.\n");
- (new BAlert(B_TRANSLATE("error"),
- B_TRANSLATE(NAME" encountered an internal error. "
- "The file could not be opened."),
B_TRANSLATE("OK")))->Go();
+ BString message = B_TRANSLATE("%app% encountered an internal
error. "
+ "The file could not be opened.");
+ message.ReplaceFirst("%app%", kApplicationName);
+ (new BAlert(kApplicationName, message.String(),
+ B_TRANSLATE("OK")))->Go();
_PlaylistItemOpened(item, ret);
} else {
BString string;
@@ -1473,8 +1476,7 @@
fFileMenu->AddSeparatorItem();
- item = new BMenuItem(B_TRANSLATE("About " NAME B_UTF8_ELLIPSIS),
- new BMessage(B_ABOUT_REQUESTED));
+ item = new BAboutMenuItem();
fFileMenu->AddItem(item);
item->SetTarget(be_app);
Modified: haiku/trunk/src/apps/midiplayer/MidiPlayerWindow.cpp
===================================================================
--- haiku/trunk/src/apps/midiplayer/MidiPlayerWindow.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/midiplayer/MidiPlayerWindow.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -44,8 +44,10 @@
//------------------------------------------------------------------------------
MidiPlayerWindow::MidiPlayerWindow()
- : BWindow(BRect(0, 0, 1, 1), B_TRANSLATE("MidiPlayer"), B_TITLED_WINDOW,
- B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE |
B_AUTO_UPDATE_SIZE_LIMITS)
+ :
+ BWindow(BRect(0, 0, 1, 1), B_TRANSLATE_APP_NAME("MidiPlayer"),
+ B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE
+ | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
{
playing = false;
scopeEnabled = true;
Modified: haiku/trunk/src/apps/networkstatus/NetworkStatusWindow.cpp
===================================================================
--- haiku/trunk/src/apps/networkstatus/NetworkStatusWindow.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/networkstatus/NetworkStatusWindow.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -19,7 +19,8 @@
NetworkStatusWindow::NetworkStatusWindow()
- : BWindow(BRect(150, 150, 249, 249), B_TRANSLATE("NetworkStatus"),
+ :
+ BWindow(BRect(150, 150, 249, 249),
B_TRANSLATE_APP_NAME("NetworkStatus"),
B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
{
BView* topView = new BView(Bounds(), NULL, B_FOLLOW_ALL, B_WILL_DRAW);
Modified: haiku/trunk/src/apps/overlayimage/Jamfile
===================================================================
--- haiku/trunk/src/apps/overlayimage/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/overlayimage/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -13,4 +13,5 @@
x-vnd.Haiku-OverlayImage
:
OverlayView.cpp
+ OverlayWindow.cpp
;
Modified: haiku/trunk/src/apps/overlayimage/OverlayWindow.cpp
===================================================================
--- haiku/trunk/src/apps/overlayimage/OverlayWindow.cpp 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/overlayimage/OverlayWindow.cpp 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -25,7 +25,7 @@
OverlayWindow::OverlayWindow()
:
- BWindow(BRect(50, 50, 500, 200), "OverlayImage",
+ BWindow(BRect(50, 50, 500, 200), B_TRANSLATE_APP_NAME("OverlayImage"),
B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
{
OverlayView *replView = new OverlayView(Bounds());
Modified: haiku/trunk/src/apps/packageinstaller/Jamfile
===================================================================
--- haiku/trunk/src/apps/packageinstaller/Jamfile 2011-03-15 21:00:16 UTC
(rev 40967)
+++ haiku/trunk/src/apps/packageinstaller/Jamfile 2011-03-16 00:42:18 UTC
(rev 40968)
@@ -20,3 +20,16 @@
: PackageInstaller.rdef
;
+DoCatalogs PackageInstaller :
+ x-vnd.Haiku-PackageInstaller
+ :
+ main.cpp
+ PackageImageViewer.cpp
+ PackageInfo.cpp
+ PackageInstall.cpp
+ PackageItem.cpp
+ PackageStatus.cpp
+ PackageTextViewer.cpp
+ PackageView.cpp
+ PackageWindow.cpp
+;
Modified: haiku/trunk/src/apps/packageinstaller/PackageWindow.cpp
===================================================================
--- haiku/trunk/src/apps/packageinstaller/PackageWindow.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/packageinstaller/PackageWindow.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -21,7 +21,7 @@
PackageWindow::PackageWindow(const entry_ref *ref)
:
- BWindow(BRect(100, 100, 600, 300), B_TRANSLATE("PackageInstaller"),
+ BWindow(BRect(100, 100, 600, 300),
B_TRANSLATE_APP_NAME("PackageInstaller"),
B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
{
//SetLayout(new BGroupLayout(B_HORIZONTAL));
Modified: haiku/trunk/src/apps/packagemanager/ApplicationWindow.cpp
===================================================================
--- haiku/trunk/src/apps/packagemanager/ApplicationWindow.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/packagemanager/ApplicationWindow.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -11,6 +11,7 @@
#include <Alert.h>
#include <Button.h>
+#include <Catalog.h>
#include <ControlLook.h>
#include <Entry.h>
#include <File.h>
@@ -99,7 +100,8 @@
ApplicationWindow::ApplicationWindow(BRect frame, bool visible)
- : BWindow(frame, "Package Manager",
+ :
+ BWindow(frame, B_TRANSLATE_APP_NAME("PackageManager"),
B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
B_AUTO_UPDATE_SIZE_LIMITS | B_ASYNCHRONOUS_CONTROLS |
B_NOT_ZOOMABLE),
fMinimizeOnClose(false)
Modified: haiku/trunk/src/apps/packagemanager/Jamfile
===================================================================
--- haiku/trunk/src/apps/packagemanager/Jamfile 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/packagemanager/Jamfile 2011-03-16 00:42:18 UTC (rev
40968)
@@ -1,15 +1,18 @@
SubDir HAIKU_TOP src apps packagemanager ;
-# UsePrivateHeaders shared interface ;
-# SubDirHdrs $(HAIKU_TOP) headers libs zlib ;
+UsePrivateHeaders shared ;
-#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits interface ] ;
-
Application PackageManager :
ApplicationView.cpp
ApplicationWindow.cpp
PackageManager.cpp
- : be $(HAIKU_LOCALE_LIBS) translation $(TARGET_LIBSUPC++)
+ : be $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSUPC++) translation
: PackageManager.rdef
;
+DoCatalogs PackageManager :
+ x-vnd.Haiku-PackageManager
+ :
+ ApplicationWindow.cpp
+ PackageManager.cpp
+;
Modified: haiku/trunk/src/apps/packagemanager/PackageManager.cpp
===================================================================
--- haiku/trunk/src/apps/packagemanager/PackageManager.cpp 2011-03-15
21:00:16 UTC (rev 40967)
+++ haiku/trunk/src/apps/packagemanager/PackageManager.cpp 2011-03-16
00:42:18 UTC (rev 40968)
@@ -9,6 +9,7 @@
#include "ApplicationWindow.h"
+#include <AboutWindow.h>
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
@@ -115,21 +116,13 @@
void
PackageManager::AboutRequested()
{
- BAlert *about = new BAlert("about",
- B_TRANSLATE("PackageManager\n"
- "Written by Adrien Destugues\n"
- "Copyright 2010 Haiku, Inc. \n"),
- B_TRANSLATE("OK"));
-
- BTextView *view = about->TextView();
- BFont font;
- view->SetStylable(true);
- view->GetFont(&font);
- font.SetFace(B_BOLD_FACE);
- font.SetSize(font.Size() * 1.5);
- view->SetFontAndColor(0, 17, &font);
-
- about->Go();
+ const char* authors[] = {
+ "Adrien Destugues",
+ NULL
+ };
+
+ BAboutWindow about(B_TRANSLATE_APP_NAME("PackageManager"), 2010,
authors);
+ about.Show();
}
Modified: haiku/trunk/src/apps/pairs/PairsWindow.cpp
===================================================================
--- haiku/trunk/src/apps/pairs/PairsWindow.cpp 2011-03-15 21:00:16 UTC (rev
40967)
+++ haiku/trunk/src/apps/pairs/PairsWindow.cpp 2011-03-16 00:42:18 UTC (rev
40968)
@@ -39,9 +39,9 @@
PairsWindow::PairsWindow()
:
[... truncated: 161 lines follow ...]
Other related posts:
