b=502799 fix some misspelled words r+sr=roc
This commit is contained in:
Родитель
02a5352736
Коммит
147e8f3cd4
|
@ -141,7 +141,7 @@ nsPromptService::Alert(nsIDOMWindow *parent,
|
||||||
NS_ConvertASCIItoUTF16 styleClass(kAlertIconClass);
|
NS_ConvertASCIItoUTF16 styleClass(kAlertIconClass);
|
||||||
block->SetString(eIconClass, styleClass.get());
|
block->SetString(eIconClass, styleClass.get());
|
||||||
block->SetString(eOpeningSound, NS_SYSSOUND_ALERT_DIALOG.get());
|
block->SetString(eOpeningSound, NS_SYSSOUND_ALERT_DIALOG.get());
|
||||||
block->SetInt(eSoundEventId, nsISound::EVENT_AELRT_DIALOG_OPEN);
|
block->SetInt(eSoundEventId, nsISound::EVENT_ALERT_DIALOG_OPEN);
|
||||||
|
|
||||||
rv = DoDialog(parent, block, kPromptURL);
|
rv = DoDialog(parent, block, kPromptURL);
|
||||||
|
|
||||||
|
@ -187,7 +187,7 @@ nsPromptService::AlertCheck(nsIDOMWindow *parent,
|
||||||
block->SetString(eCheckboxMsg, checkMsg);
|
block->SetString(eCheckboxMsg, checkMsg);
|
||||||
block->SetInt(eCheckboxState, *checkValue);
|
block->SetInt(eCheckboxState, *checkValue);
|
||||||
block->SetString(eOpeningSound, NS_SYSSOUND_ALERT_DIALOG.get());
|
block->SetString(eOpeningSound, NS_SYSSOUND_ALERT_DIALOG.get());
|
||||||
block->SetInt(eSoundEventId, nsISound::EVENT_AELRT_DIALOG_OPEN);
|
block->SetInt(eSoundEventId, nsISound::EVENT_ALERT_DIALOG_OPEN);
|
||||||
|
|
||||||
rv = DoDialog(parent, block, kPromptURL);
|
rv = DoDialog(parent, block, kPromptURL);
|
||||||
if (NS_FAILED(rv))
|
if (NS_FAILED(rv))
|
||||||
|
@ -759,7 +759,7 @@ nsPromptService::ShowNonBlockingAlert(nsIDOMWindow *aParent,
|
||||||
paramBlock->SetString(eDialogTitle, aDialogTitle);
|
paramBlock->SetString(eDialogTitle, aDialogTitle);
|
||||||
paramBlock->SetString(eMsg, aText);
|
paramBlock->SetString(eMsg, aText);
|
||||||
paramBlock->SetString(eOpeningSound, NS_SYSSOUND_ALERT_DIALOG.get());
|
paramBlock->SetString(eOpeningSound, NS_SYSSOUND_ALERT_DIALOG.get());
|
||||||
paramBlock->SetInt(eSoundEventId, nsISound::EVENT_AELRT_DIALOG_OPEN);
|
paramBlock->SetInt(eSoundEventId, nsISound::EVENT_ALERT_DIALOG_OPEN);
|
||||||
|
|
||||||
nsCOMPtr<nsIDOMWindow> dialog;
|
nsCOMPtr<nsIDOMWindow> dialog;
|
||||||
mWatcher->OpenWindow(aParent, "chrome://global/content/commonDialog.xul",
|
mWatcher->OpenWindow(aParent, "chrome://global/content/commonDialog.xul",
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
interface nsIURL;
|
interface nsIURL;
|
||||||
|
|
||||||
[scriptable, uuid(53FC43F2-26BC-46be-8E38-1BBA94806061)]
|
[scriptable, uuid(86B75B05-DB60-4c3e-97A7-82B363A41A01)]
|
||||||
interface nsISound : nsISupports
|
interface nsISound : nsISupports
|
||||||
{
|
{
|
||||||
void play(in nsIURL aURL);
|
void play(in nsIURL aURL);
|
||||||
|
@ -68,8 +68,8 @@ interface nsISound : nsISupports
|
||||||
* nsPIPromptService.idl. So, if they are changed, that makes big impact for
|
* nsPIPromptService.idl. So, if they are changed, that makes big impact for
|
||||||
* the embedders.
|
* the embedders.
|
||||||
*/
|
*/
|
||||||
const unsigned long EVENT_NEW_MAIL_RECIEVED = 0;
|
const unsigned long EVENT_NEW_MAIL_RECEIVED = 0;
|
||||||
const unsigned long EVENT_AELRT_DIALOG_OPEN = 1;
|
const unsigned long EVENT_ALERT_DIALOG_OPEN = 1;
|
||||||
const unsigned long EVENT_CONFIRM_DIALOG_OPEN = 2;
|
const unsigned long EVENT_CONFIRM_DIALOG_OPEN = 2;
|
||||||
const unsigned long EVENT_PROMPT_DIALOG_OPEN = 3;
|
const unsigned long EVENT_PROMPT_DIALOG_OPEN = 3;
|
||||||
const unsigned long EVENT_SELECT_DIALOG_OPEN = 4;
|
const unsigned long EVENT_SELECT_DIALOG_OPEN = 4;
|
||||||
|
|
|
@ -175,5 +175,5 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
|
||||||
|
|
||||||
NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
||||||
{
|
{
|
||||||
return aEventId == EVENT_NEW_MAIL_RECIEVED ? Beep() : NS_OK;
|
return aEventId == EVENT_NEW_MAIL_RECEIVED ? Beep() : NS_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -482,13 +482,13 @@ NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (aEventId) {
|
switch (aEventId) {
|
||||||
case EVENT_AELRT_DIALOG_OPEN:
|
case EVENT_ALERT_DIALOG_OPEN:
|
||||||
ca_context_play(ctx, 0, "event.id", "dialog-warning", NULL);
|
ca_context_play(ctx, 0, "event.id", "dialog-warning", NULL);
|
||||||
break;
|
break;
|
||||||
case EVENT_CONFIRM_DIALOG_OPEN:
|
case EVENT_CONFIRM_DIALOG_OPEN:
|
||||||
ca_context_play(ctx, 0, "event.id", "dialog-question", NULL);
|
ca_context_play(ctx, 0, "event.id", "dialog-question", NULL);
|
||||||
break;
|
break;
|
||||||
case EVENT_NEW_MAIL_RECIEVED:
|
case EVENT_NEW_MAIL_RECEIVED:
|
||||||
ca_context_play(ctx, 0, "event.id", "message-new-email", NULL);
|
ca_context_play(ctx, 0, "event.id", "message-new-email", NULL);
|
||||||
break;
|
break;
|
||||||
case EVENT_MENU_EXECUTE:
|
case EVENT_MENU_EXECUTE:
|
||||||
|
@ -510,11 +510,11 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
|
||||||
NS_WARNING("nsISound::playSystemSound is called with \"_moz_\" events, they are obsolete, use nsISound::playEventSound instead");
|
NS_WARNING("nsISound::playSystemSound is called with \"_moz_\" events, they are obsolete, use nsISound::playEventSound instead");
|
||||||
PRUint32 eventId;
|
PRUint32 eventId;
|
||||||
if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
|
if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
|
||||||
eventId = EVENT_AELRT_DIALOG_OPEN;
|
eventId = EVENT_ALERT_DIALOG_OPEN;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
|
||||||
eventId = EVENT_CONFIRM_DIALOG_OPEN;
|
eventId = EVENT_CONFIRM_DIALOG_OPEN;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
|
||||||
eventId = EVENT_NEW_MAIL_RECIEVED;
|
eventId = EVENT_NEW_MAIL_RECEIVED;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_EXECUTE))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_EXECUTE))
|
||||||
eventId = EVENT_MENU_EXECUTE;
|
eventId = EVENT_MENU_EXECUTE;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_POPUP))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_POPUP))
|
||||||
|
|
|
@ -521,5 +521,5 @@ NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
||||||
}
|
}
|
||||||
|
|
||||||
// We don't have a default mail sound on OS/2, so just beep.
|
// We don't have a default mail sound on OS/2, so just beep.
|
||||||
return aEventId == EVENT_NEW_MAIL_RECIEVED ? Beep() : NS_OK;
|
return aEventId == EVENT_NEW_MAIL_RECEIVED ? Beep() : NS_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,7 +141,7 @@ printf( "\n\n\nnsSound::PlaySystemSound aSoundAlias=%s\n\n",
|
||||||
|
|
||||||
NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
||||||
{
|
{
|
||||||
if (aEventId != EVENT_NEW_MAIL_RECIEVED) {
|
if (aEventId != EVENT_NEW_MAIL_RECEIVED) {
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -407,6 +407,6 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
|
||||||
|
|
||||||
NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
||||||
{
|
{
|
||||||
return aEventId == EVENT_NEW_MAIL_RECIEVED ? Beep() : NS_OK;
|
return aEventId == EVENT_NEW_MAIL_RECEIVED ? Beep() : NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -250,11 +250,11 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
|
||||||
|
|
||||||
PRUint32 eventId;
|
PRUint32 eventId;
|
||||||
if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
|
if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
|
||||||
eventId = EVENT_NEW_MAIL_RECIEVED;
|
eventId = EVENT_NEW_MAIL_RECEIVED;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
|
||||||
eventId = EVENT_CONFIRM_DIALOG_OPEN;
|
eventId = EVENT_CONFIRM_DIALOG_OPEN;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
|
||||||
eventId = EVENT_AELRT_DIALOG_OPEN;
|
eventId = EVENT_ALERT_DIALOG_OPEN;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_EXECUTE))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_EXECUTE))
|
||||||
eventId = EVENT_MENU_EXECUTE;
|
eventId = EVENT_MENU_EXECUTE;
|
||||||
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_POPUP))
|
else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_POPUP))
|
||||||
|
@ -271,10 +271,10 @@ NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
|
||||||
|
|
||||||
const wchar_t *sound = nsnull;
|
const wchar_t *sound = nsnull;
|
||||||
switch (aEventId) {
|
switch (aEventId) {
|
||||||
case EVENT_NEW_MAIL_RECIEVED:
|
case EVENT_NEW_MAIL_RECEIVED:
|
||||||
sound = L"MailBeep";
|
sound = L"MailBeep";
|
||||||
break;
|
break;
|
||||||
case EVENT_AELRT_DIALOG_OPEN:
|
case EVENT_ALERT_DIALOG_OPEN:
|
||||||
sound = L"SystemExclamation";
|
sound = L"SystemExclamation";
|
||||||
break;
|
break;
|
||||||
case EVENT_CONFIRM_DIALOG_OPEN:
|
case EVENT_CONFIRM_DIALOG_OPEN:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче