From 583c561cb259ab00c3621b9446268ab68ef6b6e5 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 16 Jul 2019 20:26:45 +0200 Subject: [PATCH] Button labels: "Ok" -> "OK" All caps is our standard. --- .../mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp | 2 +- src/add-ons/screen_savers/shelf/Shelf.cpp | 2 +- src/apps/serialconnect/CustomRateWindow.cpp | 2 +- src/apps/softwareupdater/SoftwareUpdaterWindow.cpp | 2 +- src/preferences/network/NetworkWindow.cpp | 2 +- src/preferences/shortcuts/EditWindow.cpp | 2 +- src/tests/kits/interface/bwindowstack/WindowStackTest.cpp | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp index 975e5957c2..67d3220758 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp @@ -324,7 +324,7 @@ FolderConfigWindow::_LoadFolders() message.ReplaceFirst("%server%", fSettings.Server()); message.ReplaceFirst("%error%", strerror(status)); BAlert* alert = new BAlert("IMAP error", message.String(), - B_TRANSLATE("Ok"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); + B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->Go(); PostMessage(B_QUIT_REQUESTED); diff --git a/src/add-ons/screen_savers/shelf/Shelf.cpp b/src/add-ons/screen_savers/shelf/Shelf.cpp index 0d4a7fafe0..aa3fb83b28 100644 --- a/src/add-ons/screen_savers/shelf/Shelf.cpp +++ b/src/add-ons/screen_savers/shelf/Shelf.cpp @@ -185,7 +185,7 @@ Shelf::StartSaver(BView *view, bool preview) s << "BApp:Name: " << be_app->Name(); PRINT(("%p:%s:%s\n", this, __FUNCTION__, s.String())); - //BAlert *a = new BAlert("debug", s.String(), "Ok"); + //BAlert *a = new BAlert("debug", s.String(), "OK"); //a->Go(); return B_ERROR; #if 0 diff --git a/src/apps/serialconnect/CustomRateWindow.cpp b/src/apps/serialconnect/CustomRateWindow.cpp index 53eb5e422c..e27b8c1769 100644 --- a/src/apps/serialconnect/CustomRateWindow.cpp +++ b/src/apps/serialconnect/CustomRateWindow.cpp @@ -38,7 +38,7 @@ CustomRateWindow::CustomRateWindow(int baudrate) .End() .AddGroup(B_HORIZONTAL) .AddGlue() - .Add(new BButton("ok", B_TRANSLATE("Ok"), new BMessage(kOkButtonMsg))) + .Add(new BButton("ok", B_TRANSLATE("OK"), new BMessage(kOkButtonMsg))) .Add(new BButton("cancel", B_TRANSLATE("Cancel"), new BMessage(B_QUIT_REQUESTED))) .End() diff --git a/src/apps/softwareupdater/SoftwareUpdaterWindow.cpp b/src/apps/softwareupdater/SoftwareUpdaterWindow.cpp index 9920b12eae..7ac7f3646e 100644 --- a/src/apps/softwareupdater/SoftwareUpdaterWindow.cpp +++ b/src/apps/softwareupdater/SoftwareUpdaterWindow.cpp @@ -333,7 +333,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message) if (error != B_OK) { BAlert* alert = new BAlert("reboot request", B_TRANSLATE( "For some reason, we could not reboot your computer."), - B_TRANSLATE("Ok"), NULL, NULL, + B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->Go(); } diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp index dbeb791329..b6d3566826 100644 --- a/src/preferences/network/NetworkWindow.cpp +++ b/src/preferences/network/NetworkWindow.cpp @@ -612,7 +612,7 @@ NetworkWindow::_ShowReplicant(bool show) B_TRANSLATE("Installing NetworkStatus in Deskbar failed: %s"), strerror(status)); BAlert* alert = new BAlert(B_TRANSLATE("launch error"), - errorMessage, B_TRANSLATE("Ok")); + errorMessage, B_TRANSLATE("OK")); alert->Go(NULL); } } else { diff --git a/src/preferences/shortcuts/EditWindow.cpp b/src/preferences/shortcuts/EditWindow.cpp index 04c8f7a922..b926dbe1ca 100644 --- a/src/preferences/shortcuts/EditWindow.cpp +++ b/src/preferences/shortcuts/EditWindow.cpp @@ -26,7 +26,7 @@ EditWindow::EditWindow(const char* placeholder, uint32 flags) { fTextControl = new BTextControl("", placeholder, NULL); - BButton* okButton = new BButton("Ok", new BMessage(B_CONTROL_MODIFIED)); + BButton* okButton = new BButton("OK", new BMessage(B_CONTROL_MODIFIED)); okButton->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT, B_ALIGN_TOP)); SetDefaultButton(okButton); diff --git a/src/tests/kits/interface/bwindowstack/WindowStackTest.cpp b/src/tests/kits/interface/bwindowstack/WindowStackTest.cpp index a6510af1c5..2718d69721 100644 --- a/src/tests/kits/interface/bwindowstack/WindowStackTest.cpp +++ b/src/tests/kits/interface/bwindowstack/WindowStackTest.cpp @@ -136,13 +136,13 @@ MainView::MessageReceived(BMessage* message) BWindowStack windowStack(Window()); if (windowStack.HasWindow(window)) { BAlert* alert = new BAlert("API Error", - "Window on stack but should not be there!", "Ok"); + "Window on stack but should not be there!", "OK"); alert->Go(); } windowStack.AddWindow(window); if (!windowStack.HasWindow(window)) { BAlert* alert = new BAlert("API Error", - "Window not on stack but should be there!", "Ok"); + "Window not on stack but should be there!", "OK"); alert->Go(); } break;