From 127a91147c528b2a2f0330840998ea7b595b00a9 Mon Sep 17 00:00:00 2001 From: Zach H Date: Sat, 18 Mar 2017 18:46:19 -0400 Subject: [PATCH] rename from update to check (#2505) --- cockatrice/src/tab_room.cpp | 6 +++--- cockatrice/src/tab_supervisor.cpp | 2 +- cockatrice/src/window_main.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp index ce4577b6..a6adfb8d 100644 --- a/cockatrice/src/tab_room.cpp +++ b/cockatrice/src/tab_room.cpp @@ -185,12 +185,12 @@ QString TabRoom::sanitizeHtml(QString dirty) const void TabRoom::sendMessage() { - if (sayEdit->text().isEmpty()){ + if (sayEdit->text().isEmpty()) { return; - }else if (completer->popup()->isVisible()){ + } else if (completer->popup()->isVisible()) { completer->popup()->hide(); return; - }else{ + } else { Command_RoomSay cmd; cmd.set_message(sayEdit->text().toStdString()); diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index fd61cf56..c5ca20eb 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -579,7 +579,7 @@ void TabSupervisor::processNotifyUserEvent(const Event_NotifyUser &event) { switch ((Event_NotifyUser::NotificationType) event.type()) { - case Event_NotifyUser::UNKNOWN: QMessageBox::information(this, tr("Unknown Event"), tr("The server has sent you a message that your client does not understand.\nThis message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.\n\nTo update your client, go to Help -> Update Cockatrice.")); break; + case Event_NotifyUser::UNKNOWN: QMessageBox::information(this, tr("Unknown Event"), tr("The server has sent you a message that your client does not understand.\nThis message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.\n\nTo update your client, go to Help -> Check for Updates.")); break; case Event_NotifyUser::IDLEWARNING: QMessageBox::information(this, tr("Idle Timeout"), tr("You are about to be logged out due to inactivity.")); break; case Event_NotifyUser::PROMOTED: QMessageBox::information(this, tr("Promotion"), tr("You have been promoted to moderator. Please log out and back in for changes to take effect.")); break; case Event_NotifyUser::WARNING: { diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index 79b7b7cf..3b6c1b32 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -332,7 +332,7 @@ void MainWindow::loginError(Response::ResponseCode r, QString reasonStr, quint32 formattedMissingFeatures = "Missing Features: "; for (int i = 0; i < missingFeatures.size(); ++i) formattedMissingFeatures.append(QString("\n %1").arg(QChar(0x2022)) + " " + missingFeatures.value(i) ); - formattedMissingFeatures.append("\nTo update your client, go to Help -> Update Cockatrice."); + formattedMissingFeatures.append("\nTo update your client, go to Help -> Check for Updates."); QMessageBox msgBox; msgBox.setIcon(QMessageBox::Critical); @@ -545,7 +545,7 @@ void MainWindow::retranslateUi() aEditTokens->setText(tr("Edit &tokens...")); aAbout->setText(tr("&About Cockatrice")); - aUpdate->setText(tr("&Update Cockatrice")); + aUpdate->setText(tr("Check for Updates")); aViewLog->setText(tr("View &debug log")); helpMenu->setTitle(tr("&Help")); aCheckCardUpdates->setText(tr("Check for card updates...")); @@ -977,7 +977,7 @@ void MainWindow::refreshShortcuts() void MainWindow::notifyUserAboutUpdate() { - QMessageBox::information(this, tr("Information"), tr("This server supports additional features that your client doesn't have.\nThis is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.\n\nTo update your client, go to Help -> Update Cockatrice.")); + QMessageBox::information(this, tr("Information"), tr("This server supports additional features that your client doesn't have.\nThis is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.\n\nTo update your client, go to Help -> Check for Updates.")); } void MainWindow::actOpenCustomFolder()