Merged 2 msgboxes into 1 when first startup #4240

This commit is contained in:
Xinyu Hou 2014-11-27 19:08:30 +00:00
parent a0cc3d6e7f
commit d448fb777b
1 changed files with 28 additions and 10 deletions

View File

@ -1138,6 +1138,7 @@ void MainWindow::installBonjour()
void MainWindow::promptAutoConnect() void MainWindow::promptAutoConnect()
{ {
if (isBonjourRunning()) {
int r = QMessageBox::question( int r = QMessageBox::question(
this, tr("Synergy"), this, tr("Synergy"),
tr("Do you want to enable auto connect?\n\n" tr("Do you want to enable auto connect?\n\n"
@ -1152,6 +1153,23 @@ void MainWindow::promptAutoConnect()
m_AppConfig.setAutoConnect(false); m_AppConfig.setAutoConnect(false);
m_pCheckBoxAutoConnect->setChecked(false); m_pCheckBoxAutoConnect->setChecked(false);
} }
}
else {
int r = QMessageBox::question(
this, tr("Synergy"),
tr("Do you want to enable auto connect and install Bonjour?\n\n"
"This feature helps you establish the connection."),
QMessageBox::Yes | QMessageBox::No);
if (r == QMessageBox::Yes) {
m_AppConfig.setAutoConnect(true);
downloadBonjour();
}
else {
m_AppConfig.setAutoConnect(false);
m_pCheckBoxAutoConnect->setChecked(false);
}
}
m_AppConfig.setAutoConnectPrompted(true); m_AppConfig.setAutoConnectPrompted(true);
} }