aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename from update to check (#2505)

Browse source
This commit is contained in:
Zach H 2017-03-18 18:46:19 -04:00 committed by GitHub
parent 2048aac387
commit 127a91147c
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/tab_room.cpp
View file

@ -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());

2
cockatrice/src/tab_supervisor.cpp
View file

@ -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: {

6
cockatrice/src/window_main.cpp
View file

@ -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()