@@ -528,14 +528,28 @@ void AccountModifyDlg::save() acc.proxyID = pc->currentItem(); - if(pa && pa->isActive()) { - QMessageBox::information(this, tr("Warning"), tr("This account is currently active, so certain changes may not take effect until the next login.")); - } - - if (pa) + if (pa) { pa->setUserAccount(acc); - else + + if (pa->isActive()) { + QMessageBox messageBox(QMessageBox::Information, tr("Warning"), + tr("This account is currently active, so certain changes may not take effect until the next login."), + QMessageBox::NoButton, this); + QPushButton* cancel = messageBox.addButton(tr("Reconnect &Later"), QMessageBox::RejectRole); + QPushButton* reconnect = messageBox.addButton(tr("Reconnect &Now"), QMessageBox::AcceptRole); + messageBox.setDefaultButton(reconnect); + messageBox.exec(); + Q_UNUSED(cancel); + if (messageBox.clickedButton() == reconnect) { + XMPP::Status status = pa->status(); + pa->setStatus(XMPP::Status::Offline); + pa->setStatus(status); + } + } + } + else { psi->contactList()->createAccount(acc); + } accept(); } src/accountmodifydlg.cpp @@ -699,8 +699,15 @@ void PsiCon::changeProfile() { ActiveProfiles::instance()->unsetThisProfile(); if(d->contactList->haveActiveAccounts()) { - QMessageBox::information(0, CAP(tr("Error")), tr("Please disconnect before changing the profile.")); - return; + QMessageBox messageBox(QMessageBox::Information, CAP(tr("Error")), tr("Please disconnect before changing the profile.")); + QPushButton* cancel = messageBox.addButton(QMessageBox::Cancel); + QPushButton* disconnect = messageBox.addButton(tr("&Disconnect"), QMessageBox::AcceptRole); + messageBox.setDefaultButton(disconnect); + messageBox.exec(); + if (messageBox.clickedButton() == cancel) + return; + + setStatusFromDialog(XMPP::Status::Offline, false); } quit(QuitProfile); src/psicon.cpp 4721ec6b8537dcb6d5e20c87ab65ddc851a2d915 Michail Pishchagin mblsha@users.sourceforge.net http://github.com/mblsha/psi/commit/e60bd8f3260108f80560aff4728ad2994542e5d4 e60bd8f3260108f80560aff4728ad2994542e5d4 2009-10-16T12:55:18-07:00 2009-10-16T12:55:18-07:00 Improved PsiCon::changeProfile() and AccountModifyDlg::save() messageboxes. 66107519a4a1acae0400ed6a2ecf799d6b471896 Michail Pishchagin mblsha@users.sourceforge.net