mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-11 23:54:18 +00:00
Code Activity

Changed OSX native alert boxes to use TRANS to translate their ok/yes/no/cancel button text.

Browse source
This commit is contained in:
jules 2012-08-07 14:50:35 +01:00
parent c7e3550514
commit 7829d1e4bf
1 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

92
modules/juce_gui_basics/native/juce_mac_Windowing.mm
View file

@ -29,31 +29,22 @@ void LookAndFeel::playAlertSound()
}
//==============================================================================
class OSXMessageBox : public AsyncUpdater
class OSXMessageBox : private AsyncUpdater
{
public:
OSXMessageBox (AlertWindow::AlertIconType iconType_,
OSXMessageBox (AlertWindow::AlertIconType type,
const String& title_, const String& message_,
NSString* button1_, NSString* button2_, NSString* button3_,
const char* b1, const char* b2, const char* b3,
ModalComponentManager::Callback* callback_,
const bool runAsync)
: iconType (iconType_), title (title_),
: iconType (type), title (title_),
message (message_), callback (callback_),
button1 ([button1_ retain]),
button2 ([button2_ retain]),
button3 ([button3_ retain])
button1 (b1), button2 (b2), button3 (b3)
{
if (runAsync)
triggerAsyncUpdate();
}
~OSXMessageBox()
{
[button1 release];
[button2 release];
[button3 release];
}
int getResult() const
{
JUCE_AUTORELEASEPOOL
@ -61,6 +52,26 @@ public:
return r == NSAlertDefaultReturn ? 1 : (r == NSAlertOtherReturn ? 2 : 0);
}
static int show (AlertWindow::AlertIconType iconType, const String& title, const String& message,
ModalComponentManager::Callback* callback, const char* b1, const char* b2, const char* b3)
{
ScopedPointer<OSXMessageBox> mb (new OSXMessageBox (iconType, title, message, b1, b2, b3,
callback, callback != nullptr));
if (callback == nullptr)
return mb->getResult();
mb.release();
return 0;
}
private:
AlertWindow::AlertIconType iconType;
String title, message;
ModalComponentManager::Callback* callback;
const char* button1;
const char* button2;
const char* button3;
void handleAsyncUpdate()
{
const int result = getResult();
@ -71,24 +82,24 @@ public:
delete this;
}
private:
AlertWindow::AlertIconType iconType;
String title, message;
ModalComponentManager::Callback* callback;
NSString* button1;
NSString* button2;
NSString* button3;
static NSString* translateIfNotNull (const char* s)
{
return s != nullptr ? juceStringToNS (TRANS (s)) : nil;
}
NSInteger getRawResult() const
{
NSString* messageString = juceStringToNS (message);
NSString* titleString = juceStringToNS (title);
NSString* msg = juceStringToNS (message);
NSString* ttl = juceStringToNS (title);
NSString* b1 = translateIfNotNull (button1);
NSString* b2 = translateIfNotNull (button2);
NSString* b3 = translateIfNotNull (button3);
switch (iconType)
{
case AlertWindow::InfoIcon: return NSRunInformationalAlertPanel (titleString, messageString, button1, button2, button3);
case AlertWindow::WarningIcon: return NSRunCriticalAlertPanel (titleString, messageString, button1, button2, button3);
default: return NSRunAlertPanel (titleString, messageString, button1, button2, button3);
case AlertWindow::InfoIcon: return NSRunInformationalAlertPanel (ttl, msg, b1, b2, b3);
case AlertWindow::WarningIcon: return NSRunCriticalAlertPanel (ttl, msg, b1, b2, b3);
default: return NSRunAlertPanel (ttl, msg, b1, b2, b3);
}
}
};
@ -98,7 +109,7 @@ void JUCE_CALLTYPE NativeMessageBox::showMessageBox (AlertWindow::AlertIconType
const String& title, const String& message,
Component* associatedComponent)
{
OSXMessageBox box (iconType, title, message, nsStringLiteral ("OK"), nil, nil, 0, false);
OSXMessageBox box (iconType, title, message, "OK", nullptr, nullptr, nullptr, false);
(void) box.getResult();
}
@ -106,40 +117,23 @@ void JUCE_CALLTYPE NativeMessageBox::showMessageBoxAsync (AlertWindow::AlertIcon
const String& title, const String& message,
Component* associatedComponent)
{
new OSXMessageBox (iconType, title, message, nsStringLiteral ("OK"), nil, nil, 0, true);
new OSXMessageBox (iconType, title, message, "OK", nullptr, nullptr, nullptr, true);
}
bool JUCE_CALLTYPE NativeMessageBox::showOkCancelBox (AlertWindow::AlertIconType iconType,
const String& title, const String& message,
Component* associatedComponent,
Component* /*associatedComponent*/,
ModalComponentManager::Callback* callback)
{
ScopedPointer<OSXMessageBox> mb (new OSXMessageBox (iconType, title, message,
nsStringLiteral ("OK"),
nsStringLiteral ("Cancel"),
nil, callback, callback != nullptr));
if (callback == nullptr)
return mb->getResult() == 1;
mb.release();
return false;
return OSXMessageBox::show (iconType, title, message, callback, "OK", "Cancel", nullptr) == 1;
}
int JUCE_CALLTYPE NativeMessageBox::showYesNoCancelBox (AlertWindow::AlertIconType iconType,
const String& title, const String& message,
Component* associatedComponent,
Component* /*associatedComponent*/,
ModalComponentManager::Callback* callback)
{
ScopedPointer<OSXMessageBox> mb (new OSXMessageBox (iconType, title, message,
nsStringLiteral ("Yes"),
nsStringLiteral ("Cancel"),
nsStringLiteral ("No"),
callback, callback != nullptr));
if (callback == nullptr)
return mb->getResult();
mb.release();
return 0;
return OSXMessageBox::show (iconType, title, message, callback, "Yes", "Cancel", "No");
}