piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

NetPlay: Add cancel button for chunked data transfers

Browse Source
This commit is contained in:
Techjar
2019-03-30 06:20:24 -04:00
parent 7870704087
commit c90df946ba
5 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp
View File

@ -53,15 +53,18 @@ void ChunkedProgressDialog::CreateWidgets()
m_main_layout = new QVBoxLayout;
m_progress_box = new QGroupBox;
m_progress_layout = new QVBoxLayout;
m_button_box = new QDialogButtonBox(QDialogButtonBox::NoButton);
m_progress_box->setLayout(m_progress_layout);
m_main_layout->addWidget(m_progress_box);
m_main_layout->addWidget(m_button_box);
setLayout(m_main_layout);
}
void ChunkedProgressDialog::ConnectWidgets()
{
connect(m_button_box, &QDialogButtonBox::rejected, this, &ChunkedProgressDialog::reject);
}
void ChunkedProgressDialog::show(const QString& title, const u64 data_size,
@ -89,6 +92,21 @@ void ChunkedProgressDialog::show(const QString& title, const u64 data_size,
if (!client)
return;
if (Settings::Instance().GetNetPlayServer())
{
m_button_box->setStandardButtons(QDialogButtonBox::Cancel);
QPushButton* cancel_button = m_button_box->button(QDialogButtonBox::Cancel);
cancel_button->setAutoDefault(false);
cancel_button->setDefault(false);
}
else
{
m_button_box->setStandardButtons(QDialogButtonBox::Close);
QPushButton* close_button = m_button_box->button(QDialogButtonBox::Close);
close_button->setAutoDefault(false);
close_button->setDefault(false);
}
for (const auto* player : client->GetPlayers())
{
if (std::find(players.begin(), players.end(), player->pid) == players.end())
@ -121,3 +139,13 @@ void ChunkedProgressDialog::SetProgress(const int pid, const u64 progress)
QString::fromStdString(StringFromFormat("%.2f", total))));
m_progress_bars[pid]->setValue(prog);
}
void ChunkedProgressDialog::reject()
{
auto server = Settings::Instance().GetNetPlayServer();
if (server)
server->AbortGameStart();
QDialog::reject();
}