Apply patch by 'mt' from ticket #7622 to localize the debug_server alert. Thanks!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42979 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -16,9 +16,11 @@
|
|||||||
#include <AppMisc.h>
|
#include <AppMisc.h>
|
||||||
#include <AutoDeleter.h>
|
#include <AutoDeleter.h>
|
||||||
#include <Autolock.h>
|
#include <Autolock.h>
|
||||||
|
#include <Catalog.h>
|
||||||
#include <debug_support.h>
|
#include <debug_support.h>
|
||||||
#include <Entry.h>
|
#include <Entry.h>
|
||||||
#include <Invoker.h>
|
#include <Invoker.h>
|
||||||
|
#include <Locale.h>
|
||||||
|
|
||||||
#include <RegistrarDefs.h>
|
#include <RegistrarDefs.h>
|
||||||
#include <RosterPrivate.h>
|
#include <RosterPrivate.h>
|
||||||
@@ -30,6 +32,9 @@
|
|||||||
#define HANDOVER_USE_GDB 1
|
#define HANDOVER_USE_GDB 1
|
||||||
//#define HANDOVER_USE_DEBUGGER 1
|
//#define HANDOVER_USE_DEBUGGER 1
|
||||||
|
|
||||||
|
#undef B_TRANSLATE_CONTEXT
|
||||||
|
#define B_TRANSLATE_CONTEXT "DebugServer"
|
||||||
|
|
||||||
#define USE_GUI true
|
#define USE_GUI true
|
||||||
// define to false if the debug server shouldn't use GUI (i.e. an alert)
|
// define to false if the debug server shouldn't use GUI (i.e. an alert)
|
||||||
|
|
||||||
@@ -605,14 +610,16 @@ TeamDebugHandler::_HandleMessage(DebugMessage *message)
|
|||||||
_NotifyAppServer(fTeam);
|
_NotifyAppServer(fTeam);
|
||||||
_NotifyRegistrar(fTeam, true, false);
|
_NotifyRegistrar(fTeam, true, false);
|
||||||
|
|
||||||
char buffer[1024];
|
BString buffer(
|
||||||
snprintf(buffer, sizeof(buffer), "The application:\n\n %s\n\n"
|
B_TRANSLATE("The application:\n\n %app\n\n"
|
||||||
"has encountered an error which prevents it from continuing. Haiku "
|
"has encountered an error which prevents it from continuing. Haiku "
|
||||||
"will terminate the application and clean up.", fTeamInfo.args);
|
"will terminate the application and clean up."));
|
||||||
|
buffer.ReplaceFirst("%app", fTeamInfo.args);
|
||||||
|
|
||||||
// TODO: It would be nice if the alert would go away automatically
|
// TODO: It would be nice if the alert would go away automatically
|
||||||
// if someone else kills our teams.
|
// if someone else kills our teams.
|
||||||
BAlert *alert = new BAlert(NULL, buffer, "Debug", "OK", NULL,
|
BAlert *alert = new BAlert(NULL, buffer.String(),
|
||||||
|
B_TRANSLATE("Debug"), B_TRANSLATE("OK"), NULL,
|
||||||
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
|
||||||
int32 result = alert->Go();
|
int32 result = alert->Go();
|
||||||
kill = (result == 1);
|
kill = (result == 1);
|
||||||
|
|||||||
@@ -15,4 +15,12 @@ Server debug_server
|
|||||||
libbe.so # Haiku libbe
|
libbe.so # Haiku libbe
|
||||||
libdebug.so
|
libdebug.so
|
||||||
$(TARGET_LIBSTDC++)
|
$(TARGET_LIBSTDC++)
|
||||||
|
$(HAIKU_LOCALE_LIBS)
|
||||||
;
|
;
|
||||||
|
|
||||||
|
DoCatalogs debug_server :
|
||||||
|
x-vnd.Haiku-debug_server
|
||||||
|
:
|
||||||
|
DebugServer.cpp
|
||||||
|
;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user