jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 17:14:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Server List from JSON (#3165)

Browse source
This commit is contained in:
Zach H 2018-04-09 22:38:21 -04:00 • committed by GitHub
parent 0c10b66a2d
commit 61e509585f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 376 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cockatrice/src/window_main.cpp
View file

@ -183,11 +183,13 @@ void MainWindow::activateAccepted()
void MainWindow::actConnect()
{
auto *dlg = new DlgConnect(this);
connect(dlg, SIGNAL(sigStartForgotPasswordRequest()), this, SLOT(actForgotPasswordRequest()));
if (dlg->exec())
client->connectToServer(dlg->getHost(), static_cast<unsigned int>(dlg->getPort()), dlg->getPlayerName(),
dlg->getPassword());
dlgConnect = new DlgConnect(this);
connect(dlgConnect, SIGNAL(sigStartForgotPasswordRequest()), this, SLOT(actForgotPasswordRequest()));
if (dlgConnect->exec()) {
client->connectToServer(dlgConnect->getHost(), static_cast<unsigned int>(dlgConnect->getPort()),
dlgConnect->getPlayerName(), dlgConnect->getPassword());
}
}
void MainWindow::actRegister()
@ -233,7 +235,7 @@ void MainWindow::actSinglePlayer()
Command_CreateGame createCommand;
createCommand.set_max_players(static_cast<google::protobuf::uint32>(numberPlayers));
mainClient->sendCommand(mainClient->prepareRoomCommand(createCommand, 0));
mainClient->sendCommand(LocalClient::prepareRoomCommand(createCommand, 0));
}
void MainWindow::actWatchReplay()
@ -251,7 +253,7 @@ void MainWindow::actWatchReplay()
QByteArray buf = file.readAll();
file.close();
auto *replay = new GameReplay;
replay = new GameReplay;
replay->ParseFromArray(buf.data(), buf.size());
tabSupervisor->openReplay(replay);
@ -832,7 +834,7 @@ MainWindow::~MainWindow()
void MainWindow::createTrayIcon()
{
auto *trayIconMenu = new QMenu(this);
trayIconMenu = new QMenu(this);
trayIconMenu->addAction(closeAction);
trayIcon = new QSystemTrayIcon(this);
@ -1205,9 +1207,9 @@ int MainWindow::getNextCustomSetPrefix(QDir dataDir)
void MainWindow::actManageSets()
{
auto *w = new WndSets;
w->setWindowModality(Qt::WindowModal);
w->show();
wndSets = new WndSets;
wndSets->setWindowModality(Qt::WindowModal);
wndSets->show();
}
void MainWindow::actEditTokens()