hedgewars: comparison QTfrontend/hwform.cpp

equal deleted inserted replaced

-:46a9fde631f4
+:75db7bb8dce8
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QSpinBox>
 #include <QListWidget>
 #include <QStackedLayout>
 #include <QLineEdit>
 #include <QLabel>
 #include <QRadioButton>
 #include "pageoptions.h"
 #include "pageeditteam.h"
 #include "pagemultiplayer.h"
 #include "pagenet.h"
 #include "pagemain.h"
-#include "pagefeedback.h"
 #include "pagenetserver.h"
 #include "pagedrawmap.h"
 #include "pagegamestats.h"
 #include "pageplayrecord.h"
 #include "pagedata.h"
 #include "drawmapwidget.h"
 #include "mouseoverfilter.h"
 #include "roomslistmodel.h"
 #include "recorder.h"
 #include "playerslistmodel.h"
+#include "feedbackdialog.h"
+#include "MessageDialog.h"
 #include "DataManager.h"
 #include "AutoUpdater.h"
 #ifdef Q_WS_WIN
 #define WINVER 0x0500
 playerHash = QString(QCryptographicHash::hash(config->value("net/nick","").toString().toUtf8(), QCryptographicHash::Md5).toHex());
 ui.pageRoomsList->setSettings(config);
 ui.pageNetGame->chatWidget->setSettings(config);
 ui.pageRoomsList->chatWidget->setSettings(config);
+ui.pageOptions->setConfig(config);
 #ifdef VIDEOREC
 ui.pageVideos->init(config);
-ui.pageOptions->setConfig(config);
 #endif
 #ifdef __APPLE__
 AutoUpdater* updater = NULL;
 if (config->isAutoUpdateEnabled())
 pageSwitchMapper->setMapping(ui.pageMain->BtnSinglePlayer, ID_PAGE_SINGLEPLAYER);
 connect(ui.pageMain->BtnSetup, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
 pageSwitchMapper->setMapping(ui.pageMain->BtnSetup, ID_PAGE_SETUP);
-connect(ui.pageMain->BtnFeedback, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
+connect(ui.pageMain->BtnFeedback, SIGNAL(clicked()), this, SLOT(showFeedbackDialog()));
-pageSwitchMapper->setMapping(ui.pageMain->BtnFeedback, ID_PAGE_FEEDBACK);
 connect(ui.pageMain->BtnInfo, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
 pageSwitchMapper->setMapping(ui.pageMain->BtnInfo, ID_PAGE_INFO);
 connect(ui.pageMain->BtnDataDownload, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
 pageSwitchMapper->setMapping(ui.pageMain->BtnVideos, ID_PAGE_VIDEOS);
 #endif
 //connect(ui.pageMain->BtnExit, SIGNAL(pressed()), this, SLOT(btnExitPressed()));
 //connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
-connect(ui.pageFeedback->BtnSend, SIGNAL(clicked()), this, SLOT(SendFeedback()));
 connect(ui.pageEditTeam, SIGNAL(goBack()), this, SLOT(AfterTeamEdit()));
 connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
 connect(ui.pageMultiplayer->teamsSelect, SIGNAL(setEnabledGameStart(bool)),
 widgets.at(i)->installEventFilter(filter);
 }
 }
 PagesStack.push(ID_PAGE_MAIN);
+((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageEnter();
 GoBack();
 }
 #ifdef USE_XFIRE
 void HWForm::updateXfire(void)
 void HWForm::GoToVideos()
 {
 GoToPage(ID_PAGE_VIDEOS);
 }
+//TODO: maybe find a better place for this?
+QString HWForm::stringifyPageId(quint32 id)
+{
+QString pageName;
+switch (id)
+{
+case ID_PAGE_SETUP_TEAM :   pageName = "PAGE_SETUP_TEAM"; break;
+case ID_PAGE_SETUP :        pageName = "PAGE_SETUP"; break;
+case ID_PAGE_MULTIPLAYER :  pageName = "PAGE_MULTIPLAYER"; break;
+case ID_PAGE_DEMOS :        pageName = "PAGE_DEMOS"; break;
+case ID_PAGE_NET :          pageName = "PAGE_NET"; break;
+case ID_PAGE_NETGAME :      pageName = "PAGE_NETGAME"; break;
+case ID_PAGE_INFO :         pageName = "PAGE_INFO"; break;
+case ID_PAGE_MAIN :         pageName = "PAGE_MAIN"; break;
+case ID_PAGE_GAMESTATS :    pageName = "PAGE_GAMESTATS"; break;
+case ID_PAGE_SINGLEPLAYER : pageName = "PAGE_SINGLEPLAYER"; break;
+case ID_PAGE_TRAINING :     pageName = "PAGE_TRAINING"; break;
+case ID_PAGE_SELECTWEAPON : pageName = "PAGE_SELECTWEAPON"; break;
+case ID_PAGE_NETSERVER :    pageName = "PAGE_NETSERVER"; break;
+case ID_PAGE_INGAME :       pageName = "PAGE_INGAME"; break;
+case ID_PAGE_ROOMSLIST :    pageName = "PAGE_ROOMSLIST"; break;
+case ID_PAGE_CONNECTING :   pageName = "PAGE_CONNECTING"; break;
+case ID_PAGE_SCHEME :       pageName = "PAGE_SCHEME"; break;
+case ID_PAGE_ADMIN :        pageName = "PAGE_ADMIN"; break;
+case ID_PAGE_CAMPAIGN :     pageName = "PAGE_CAMPAIGN"; break;
+case ID_PAGE_DRAWMAP :      pageName = "PAGE_DRAWMAP"; break;
+case ID_PAGE_DATADOWNLOAD : pageName = "PAGE_DATADOWNLOAD"; break;
+case ID_PAGE_VIDEOS :       pageName = "PAGE_VIDEOS"; break;
+case MAX_PAGE :             pageName = "MAX_PAGE"; break;
+default :                   pageName = "UNKNOWN_PAGE"; break;
+}
+return pageName;
+}
 void HWForm::OnPageShown(quint8 id, quint8 lastid)
 {
 #ifdef USE_XFIRE
 updateXfire();
 #endif
-QString openPrefix = "Debug:   (PAGE_OPENED: ";
+qDebug("Leaving %s, entering %s", qPrintable(stringifyPageId(lastid)), qPrintable(stringifyPageId(id)));
-QString openSuffix = ")";
-QString closePrefix = "Debug:   (PAGE_LEFT: ";
+// pageEnter and pageLeave events
-QString closeSuffix = ")";
+((AbstractPage*)ui.Pages->widget(lastid))->triggerPageLeave();
+((AbstractPage*)ui.Pages->widget(id))->triggerPageEnter();
-switch (lastid) { //Print the id of the page we're leaving
-case ID_PAGE_SETUP_TEAM : qDebug("%sPAGE_SETUP_TEAM%s", qPrintable(closePrefix), qPrintable(closeSuffix));    break;
-case ID_PAGE_SETUP :      qDebug("%sPAGE_SETUP%s", qPrintable(closePrefix), qPrintable(closeSuffix));     break;
-case ID_PAGE_MULTIPLAYER :    qDebug("%sPAGE_MULTIPLAYER%s", qPrintable(closePrefix), qPrintable(closeSuffix));   break;
-case ID_PAGE_DEMOS :      qDebug("%sPAGE_DEMOS%s", qPrintable(closePrefix), qPrintable(closeSuffix));     break;
-case ID_PAGE_NET :        qDebug("%sPAGE_NET%s", qPrintable(closePrefix), qPrintable(closeSuffix));       break;
-case ID_PAGE_NETGAME :        qDebug("%sPAGE_NETGAME%s", qPrintable(closePrefix), qPrintable(closeSuffix));       break;
-case ID_PAGE_INFO :       qDebug("%sPAGE_INFO%s", qPrintable(closePrefix), qPrintable(closeSuffix));      break;
-case ID_PAGE_MAIN :       qDebug("%sPAGE_MAIN%s", qPrintable(closePrefix), qPrintable(closeSuffix));      break;
-case ID_PAGE_GAMESTATS :      qDebug("%sPAGE_GAMESTATS%s", qPrintable(closePrefix), qPrintable(closeSuffix));     break;
-case ID_PAGE_SINGLEPLAYER :   qDebug("%sPAGE_SINGLEPLAYER%s", qPrintable(closePrefix), qPrintable(closeSuffix));  break;
-case ID_PAGE_TRAINING :       qDebug("%sPAGE_TRAINING%s", qPrintable(closePrefix), qPrintable(closeSuffix));      break;
-case ID_PAGE_SELECTWEAPON :   qDebug("%sPAGE_SELECTWEAPON%s", qPrintable(closePrefix), qPrintable(closeSuffix));  break;
-case ID_PAGE_NETSERVER :      qDebug("%sPAGE_NETSERVER%s", qPrintable(closePrefix), qPrintable(closeSuffix));     break;
-case ID_PAGE_INGAME :     qDebug("%sPAGE_INGAME%s", qPrintable(closePrefix), qPrintable(closeSuffix));        break;
-case ID_PAGE_ROOMSLIST :      qDebug("%sPAGE_ROOMSLIST%s", qPrintable(closePrefix), qPrintable(closeSuffix));     break;
-case ID_PAGE_CONNECTING : qDebug("%sPAGE_CONNECTING%s", qPrintable(closePrefix), qPrintable(closeSuffix));    break;
-case ID_PAGE_SCHEME :     qDebug("%sPAGE_SCHEME%s", qPrintable(closePrefix), qPrintable(closeSuffix));        break;
-case ID_PAGE_ADMIN :      qDebug("%sPAGE_ADMIN%s", qPrintable(closePrefix), qPrintable(closeSuffix));     break;
-case ID_PAGE_CAMPAIGN :       qDebug("%sPAGE_CAMPAIGN%s", qPrintable(closePrefix), qPrintable(closeSuffix));      break;
-case ID_PAGE_DRAWMAP :        qDebug("%sPAGE_DRAWMAP%s", qPrintable(closePrefix), qPrintable(closeSuffix));       break;
-case ID_PAGE_DATADOWNLOAD :   qDebug("%sPAGE_DATADOWNLOAD%s", qPrintable(closePrefix), qPrintable(closeSuffix));  break;
-case ID_PAGE_FEEDBACK :       qDebug("%sPAGE_FEEDBACK%s", qPrintable(closePrefix), qPrintable(closeSuffix));      break;
-case ID_PAGE_VIDEOS :     qDebug("%sPAGE_VIDEOS%s", qPrintable(closePrefix), qPrintable(closeSuffix));        break;
-case MAX_PAGE :           qDebug("%sMAX_PAGE%s", qPrintable(closePrefix), qPrintable(closeSuffix));       break;
-default :         qDebug("%sUNKNOWN PAGE%s", qPrintable(closePrefix), qPrintable(closeSuffix));       break;
-} //end switch(lastid)
-switch (id) { //Print the id of the opened page
-case ID_PAGE_SETUP_TEAM : qDebug("%sPAGE_SETUP_TEAM%s", qPrintable(openPrefix), qPrintable(openSuffix));      break;
-case ID_PAGE_SETUP :      qDebug("%sPAGE_SETUP%s", qPrintable(openPrefix), qPrintable(openSuffix));       break;
-case ID_PAGE_MULTIPLAYER :    qDebug("%sPAGE_MULTIPLAYER%s", qPrintable(openPrefix), qPrintable(openSuffix));     break;
-case ID_PAGE_DEMOS :      qDebug("%sPAGE_DEMOS%s", qPrintable(openPrefix), qPrintable(openSuffix));       break;
-case ID_PAGE_NET :        qDebug("%sPAGE_NET%s", qPrintable(openPrefix), qPrintable(openSuffix));         break;
-case ID_PAGE_NETGAME :        qDebug("%sPAGE_NETGAME%s", qPrintable(openPrefix), qPrintable(openSuffix));     break;
-case ID_PAGE_INFO :       qDebug("%sPAGE_INFO%s", qPrintable(openPrefix), qPrintable(openSuffix));        break;
-case ID_PAGE_MAIN :       qDebug("%sPAGE_MAIN%s", qPrintable(openPrefix), qPrintable(openSuffix));        break;
-case ID_PAGE_GAMESTATS :      qDebug("%sPAGE_GAMESTATS%s", qPrintable(openPrefix), qPrintable(openSuffix));       break;
-case ID_PAGE_SINGLEPLAYER :   qDebug("%sPAGE_SINGLEPLAYER%s", qPrintable(openPrefix), qPrintable(openSuffix));    break;
-case ID_PAGE_TRAINING :       qDebug("%sPAGE_TRAINING%s", qPrintable(openPrefix), qPrintable(openSuffix));        break;
-case ID_PAGE_SELECTWEAPON :   qDebug("%sPAGE_SELECTWEAPON%s", qPrintable(openPrefix), qPrintable(openSuffix));    break;
-case ID_PAGE_NETSERVER :      qDebug("%sPAGE_NETSERVER%s", qPrintable(openPrefix), qPrintable(openSuffix));       break;
-case ID_PAGE_INGAME :     qDebug("%sPAGE_INGAME%s", qPrintable(openPrefix), qPrintable(openSuffix));      break;
-case ID_PAGE_ROOMSLIST :      qDebug("%sPAGE_ROOMSLIST%s", qPrintable(openPrefix), qPrintable(openSuffix));       break;
-case ID_PAGE_CONNECTING : qDebug("%sPAGE_CONNECTING%s", qPrintable(openPrefix), qPrintable(openSuffix));      break;
-case ID_PAGE_SCHEME :     qDebug("%sPAGE_SCHEME%s", qPrintable(openPrefix), qPrintable(openSuffix));      break;
-case ID_PAGE_ADMIN :      qDebug("%sPAGE_ADMIN%s", qPrintable(openPrefix), qPrintable(openSuffix));       break;
-case ID_PAGE_CAMPAIGN :       qDebug("%sPAGE_CAMPAIGN%s", qPrintable(openPrefix), qPrintable(openSuffix));        break;
-case ID_PAGE_DRAWMAP :        qDebug("%sPAGE_DRAWMAP%s", qPrintable(openPrefix), qPrintable(openSuffix));     break;
-case ID_PAGE_DATADOWNLOAD :   qDebug("%sPAGE_DATADOWNLOAD%s", qPrintable(openPrefix), qPrintable(openSuffix));    break;
-case ID_PAGE_FEEDBACK :       qDebug("%sPAGE_FEEDBACK%s", qPrintable(openPrefix), qPrintable(openSuffix));        break;
-case ID_PAGE_VIDEOS :     qDebug("%sPAGE_VIDEOS%s", qPrintable(openPrefix), qPrintable(openSuffix));      break;
-case MAX_PAGE :           qDebug("%sMAX_PAGE%s", qPrintable(openPrefix), qPrintable(openSuffix));         break;
-default :         qDebug("%sUNKNOWN PAGE%s", qPrintable(openPrefix), qPrintable(openSuffix));     break;
-} //end switch(id)
 if (id == ID_PAGE_DATADOWNLOAD)
 {
 ui.pageDataDownload->fetchList();
 }
 && lastid != ID_PAGE_SELECTWEAPON)
 {
 curTeamSelWidget->resetPlayingTeams(teamsList);
 }
 }
-else if (id == ID_PAGE_GAMESTATS)
-{
-ui.pageGameStats->renderStats();
-}
 if (id == ID_PAGE_MAIN)
 {
 ui.pageOptions->setTeamOptionsEnabled(true);
-}
-if (id == ID_PAGE_FEEDBACK)
-{
-ui.pageFeedback->LoadCaptchaImage();
 }
 }
 void HWForm::GoToPage(int id)
 {
 /* if (id == ID_PAGE_DRAWMAP || id == ID_PAGE_GAMESTATS)
 stopAnim = true;
 This were disabled due to broken flake animations.  I believe the more general problems w/ opacity that forced its disable makes blocking these
 unnecessary.
 */
 #if (QT_VERSION >= 0x040600)
 if (!stopAnim)
 {
 /**Start animation :**/
 {
 bool stopAnim = false;
 int curid = ui.Pages->currentIndex();
 if (curid == ID_PAGE_MAIN)
 {
+((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageLeave();
 if (!ui.pageVideos->tryQuit(this))
 return;
 stopAnim = true;
 exit();
 }
 }
 void HWForm::DeleteTeam(const QString & teamName)
 {
-QMessageBox reallyDeleteMsg(this);
+ui.pageEditTeam->deleteTeam(teamName);
-reallyDeleteMsg.setIcon(QMessageBox::Question);
+UpdateTeamsLists();
-reallyDeleteMsg.setWindowTitle(QMessageBox::tr("Teams - Are you sure?"));
-reallyDeleteMsg.setText(QMessageBox::tr("Do you really want to delete the team '%1'?").arg(teamName));
-reallyDeleteMsg.setWindowModality(Qt::WindowModal);
-reallyDeleteMsg.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-if (reallyDeleteMsg.exec() == QMessageBox::Ok)
-{
-ui.pageEditTeam->deleteTeam(teamName);
-UpdateTeamsLists();
-}
 }
 void HWForm::DeleteScheme()
 {
 ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex());
 if (ui.pageOptions->SchemesName->currentIndex() < ammoSchemeModel->numberOfDefaultSchemes)
 {
-ShowErrorMessage(QMessageBox::tr("Cannot delete default scheme '%1'!").arg(ui.pageOptions->SchemesName->currentText()));
+MessageDialog::ShowErrorMessage(QMessageBox::tr("Cannot delete default scheme '%1'!").arg(ui.pageOptions->SchemesName->currentText()), this);
 }
 else
 {
 ui.pageScheme->deleteRow();
 ammoSchemeModel->Save();
 void HWForm::PlayDemo()
 {
 QListWidgetItem * curritem = ui.pagePlayDemo->DemosList->currentItem();
 if (!curritem)
 {
-ShowErrorMessage(QMessageBox::tr("Please select a record from the list"));
+MessageDialog::ShowErrorMessage(QMessageBox::tr("Please select a record from the list"), this);
 return;
 }
 CreateGame(0, 0, 0);
 game->PlayDemo(curritem->data(Qt::UserRole).toString(), ui.pagePlayDemo->isSave());
 }
 NetConnectServer("netserver.hedgewars.org", 46631);
 }
 void HWForm::NetPassword(const QString & nick)
 {
+Q_UNUSED(nick);
 //Get hashes
 QString hash =  config->passwordHash();
 QString temphash =  config->tempHash();
 //Check them
 NetPassword(nick);
 }
 void HWForm::NetNickNotRegistered(const QString & nick)
 {
+Q_UNUSED(nick);
 QMessageBox noRegMsg(this);
 noRegMsg.setIcon(QMessageBox::Information);
 noRegMsg.setWindowTitle(QMessageBox::tr("Hedgewars - Nick not registered"));
 noRegMsg.setWindowModality(Qt::WindowModal);
 noRegMsg.setText(tr("Your nickname is not registered.\nTo prevent someone else from using it,\nplease register it at www.hedgewars.org"));
 {
 //ForcedDisconnect(tr("No nickname supplied."));
 bool retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied."));
 GoBack();
 if (retry) {
 NetConnectOfficialServer();
 }
 return;
 }
 hwnet->NewNick(newNick);
 void HWForm::NetError(const QString & errmsg)
 {
 switch (ui.Pages->currentIndex())
 {
 case ID_PAGE_INGAME:
-ShowErrorMessage(errmsg);
+MessageDialog::ShowErrorMessage(errmsg, this);
 // no break
 case ID_PAGE_NETGAME:
 ui.pageNetGame->displayError(errmsg);
 break;
 default:
 ui.pageRoomsList->displayWarning(wrnmsg);
 }
 void HWForm::_NetConnect(const QString & hostName, quint16 port, QString nick)
 {
+Q_UNUSED(nick);
 if(hwnet)
 {
 hwnet->Disconnect();
 delete hwnet;
 hwnet=0;
 hwnet, SLOT(banPlayer(const QString&)));
 connect(ui.pageNetGame->chatWidget, SIGNAL(info(const QString&)),
 hwnet, SLOT(infoPlayer(const QString&)));
 connect(ui.pageNetGame->chatWidget, SIGNAL(follow(const QString&)),
 hwnet, SLOT(followPlayer(const QString&)));
+connect(ui.pageNetGame->chatWidget, SIGNAL(consoleCommand(const QString&)),
+hwnet, SLOT(consoleCommand(const QString&)));
 connect(ui.pageRoomsList->chatWidget, SIGNAL(kick(const QString&)),
 hwnet, SLOT(kickPlayer(const QString&)));
 connect(ui.pageRoomsList->chatWidget, SIGNAL(ban(const QString&)),
 hwnet, SLOT(banPlayer(const QString&)));
 connect(ui.pageRoomsList->chatWidget, SIGNAL(info(const QString&)),
 hwnet, SLOT(infoPlayer(const QString&)));
 connect(ui.pageRoomsList->chatWidget, SIGNAL(follow(const QString&)),
 hwnet, SLOT(followPlayer(const QString&)));
+connect(ui.pageRoomsList->chatWidget, SIGNAL(consoleCommand(const QString&)),
+hwnet, SLOT(consoleCommand(const QString&)));
 // chatting
 connect(ui.pageRoomsList->chatWidget, SIGNAL(chatLine(const QString&)),
 hwnet, SLOT(chatLineToLobby(const QString&)));
 connect(hwnet, SIGNAL(chatStringLobby(const QString&)),
 QString hash = config->passwordHash();
 QString temphash = config->tempHash();
 QString nickname = config->value("net/nick", "").toString();
 QString password;
-if (nickname.isEmpty() || hash.isEmpty()) { //if something from login is missing, start dialog loop
+//if something from login is missing, start dialog loop
+if (nickname.isEmpty() || hash.isEmpty())
+{
 while (nickname.isEmpty() || (hash.isEmpty() && temphash.isEmpty())) //while a nickname, or both hashes are missing
 {
 //open dialog
 HWPasswordDialog * pwDialog = new HWPasswordDialog(this);
+// make the "new account" button dialog open a browser with the registration page
+connect(pwDialog->pbNewAccount, SIGNAL(clicked()), this, SLOT(openRegistrationPage()));
 pwDialog->cbSave->setChecked(config->value("net/savepassword", true).toBool());
 //if nickname is present, put it into the field
 if (!nickname.isEmpty()) {
 pwDialog->leNickname->setText(nickname);
 pwDialog->lePassword->setFocus();
 }
 //if dialog close, create an error message
 if (pwDialog->exec() != QDialog::Accepted) {
+delete pwDialog;
+GoBack();
+return;
+}
+//set nick and pass from the dialog
+nickname = pwDialog->leNickname->text();
+password = pwDialog->lePassword->text();
+//check the nickname variable
+if (nickname.isEmpty()) {
+int retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied."));
+GoBack();
+delete pwDialog;
+if (retry) {
+NetConnectOfficialServer();
+}
+return;
+}
+if (!password.isEmpty()) {
+//calculate temphash and set it into config
+temphash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex();
+config->setTempHash(temphash);
+//if user wants to save password
+bool save = pwDialog->cbSave->isChecked();
+config->setValue("net/savepassword", save);
+if (save) // user wants to save password
+{
+ui.pageOptions->CBSavePassword->setChecked(true);
+config->setPasswordHash(temphash);
+}
+}
+else {
+delete pwDialog;
+config->setValue("net/nick", nickname);
+config->updNetNick();
+config->clearPasswordHash();
+break;
+}
 delete pwDialog;
-GoBack();
-return;
+//update nickname
-}
-//set nick and pass from the dialog
-nickname = pwDialog->leNickname->text();
-password = pwDialog->lePassword->text();
-//check the nickname variable
-if (nickname.isEmpty()) {
-int retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied."));
-GoBack();
-delete pwDialog;
-if (retry) {
-NetConnectOfficialServer();
-}
-return;
-}
-if (!password.isEmpty()) {
-//calculate temphash and set it into config
-temphash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex();
-config->setTempHash(temphash);
-//if user wants to save password
-bool save = pwDialog->cbSave->isChecked();
-config->setValue("net/savepassword", save);
-if (save) // user wants to save password
-{
-config->setPasswordHash(temphash);
-}
-}
-else {
-delete pwDialog;
 config->setValue("net/nick", nickname);
 config->updNetNick();
-config->clearPasswordHash();
-break;
+//and all the variables
-}
+hash = config->passwordHash();
+temphash = config->tempHash();
-delete pwDialog;
+nickname = config->value("net/nick", "").toString();
-//update nickname
-config->setValue("net/nick", nickname);
-config->updNetNick();
-//and all the variables
-hash = config->passwordHash();
-temphash = config->tempHash();
-nickname = config->value("net/nick", "").toString();
 }
 }
 ui.pageRoomsList->setUser(nickname);
 ui.pageNetGame->setUser(nickname);
 config->SaveOptions();
 pnetserver = new HWNetServer;
 if (!pnetserver->StartServer(ui.pageNetServer->sbPort->value()))
 {
-ShowErrorMessage(QMessageBox::tr("Unable to start server"));
+MessageDialog::ShowErrorMessage(QMessageBox::tr("Unable to start server"), this);
 delete pnetserver;
 pnetserver = 0;
 return;
 }
 if (pnetserver)
 return; // we have server - let it care of all things
 if (hwnet)
 {
 QString errorStr = QMessageBox::tr("Connection to server is lost") + (reason.isEmpty()?"":("\n\n" + HWNewNet::tr("Quit reason: ") + '"' + reason +'"'));
-ShowErrorMessage(errorStr);
+MessageDialog::ShowErrorMessage(errorStr, this);
 }
 while (ui.Pages->currentIndex() != ID_PAGE_NET
 && ui.Pages->currentIndex() != ID_PAGE_MAIN)
 {
 connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
 connect(game, SIGNAL(HaveRecord(RecordType, const QByteArray &)), this, SLOT(GetRecord(RecordType, const QByteArray &)));
 m_lastDemo = QByteArray();
 }
-void HWForm::ShowErrorMessage(const QString & msg)
-{
-QMessageBox msgMsg(this);
-msgMsg.setIcon(QMessageBox::Warning);
-msgMsg.setWindowTitle(QMessageBox::tr("Hedgewars - Error"));
-msgMsg.setText(msg);
-msgMsg.setWindowModality(Qt::WindowModal);
-msgMsg.exec();
-}
 void HWForm::GetRecord(RecordType type, const QByteArray & record)
 {
 if (type != rtNeither)
 {
 QString filename;
 filename = cfgdir->absolutePath() + "/Saves/" + recordFileName + "." + *cProtoVer + ".hws";
 }
 QFile demofile(filename);
 if (!demofile.open(QIODevice::WriteOnly))
-ShowErrorMessage(tr("Cannot save record to file %1").arg(filename));
+MessageDialog::ShowErrorMessage(tr("Cannot save record to file %1").arg(filename), this);
 else
 {
 demofile.write(demo);
 demofile.close();
 }
 SDLInteraction::instance().stopMusic();
 }
 void HWForm::NetGameChangeStatus(bool isMaster)
 {
-ui.pageNetGame->pGameCFG->setEnabled(isMaster);
+ui.pageNetGame->pGameCFG->setMaster(isMaster);
 ui.pageNetGame->pNetTeamsWidget->setInteractivity(isMaster);
 if (isMaster)
 NetGameMaster();
 else
 {
 ui.pageNetGame->setMasterMode(true);
 ui.pageNetGame->restrictJoins->setChecked(false);
 ui.pageNetGame->restrictTeamAdds->setChecked(false);
 ui.pageNetGame->pGameCFG->GameSchemes->setModel(ammoSchemeModel);
-ui.pageNetGame->pGameCFG->setEnabled(true);
+ui.pageNetGame->pGameCFG->setMaster(true);
 ui.pageNetGame->pNetTeamsWidget->setInteractivity(true);
 if (hwnet)
 {
 // disconnect connections first to ensure their inexistance and not to connect twice
-ui.pageNetGame->BtnStart->disconnect(hwnet);
+ui.pageNetGame->BtnStart->disconnect(this);
 ui.pageNetGame->BtnUpdate->disconnect(hwnet);
+ui.pageNetGame->leRoomName->disconnect(hwnet);
 ui.pageNetGame->restrictJoins->disconnect(hwnet);
 ui.pageNetGame->restrictTeamAdds->disconnect(hwnet);
 ui.pageNetGame->disconnect(hwnet, SLOT(updateRoomName(const QString&)));
 ui.pageNetGame->setRoomName(hwnet->getRoom());
-connect(ui.pageNetGame->BtnStart, SIGNAL(clicked()), hwnet, SLOT(startGame()));
+connect(ui.pageNetGame->BtnStart, SIGNAL(clicked()), this, SLOT(startGame()));
 connect(ui.pageNetGame, SIGNAL(askForUpdateRoomName(const QString &)), hwnet, SLOT(updateRoomName(const QString &)));
 connect(ui.pageNetGame->restrictJoins, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictJoins()));
 connect(ui.pageNetGame->restrictTeamAdds, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictTeamAdds()));
 connect(ui.pageNetGame->pGameCFG->GameSchemes->model(),
 SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
 }
 }
 void HWForm::NetGameSlave()
 {
-ui.pageNetGame->pGameCFG->setEnabled(false);
+ui.pageNetGame->pGameCFG->setMaster(false);
 ui.pageNetGame->pNetTeamsWidget->setInteractivity(false);
 if (hwnet)
 {
 NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
 connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &)));
 ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo);
+ui.pageNetGame->setRoomName(hwnet->getRoom());
 ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet);
 connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)),
 this, SLOT(selectFirstNetScheme()));
 }
 #ifdef Q_WS_WIN
 prefix = prefix.replace("/","\\");
 userPrefix = userPrefix.replace("/","\\");
 #endif
-QRect resolution = config->vid_Resolution();
+std::pair<QRect, QRect> resolutions = config->vid_ResolutionPair();
 return QString("--prefix " + prefix
 + " --user-prefix " + userPrefix
-+ " --width " + QString::number(resolution.width())
++ " --fullscreen-width " + QString::number(resolutions.first.width())
-+ " --height " + QString::number(resolution.height())
++ " --fullscreen-height " + QString::number(resolutions.first.height())
++ " --width " + QString::number(resolutions.second.width())
++ " --height " + QString::number(resolutions.second.height())
 + " --volume " + QString::number(config->volume())
 + (config->isMusicEnabled() ? "" : " --nomusic")
 + (config->isSoundEnabled() ? "" : " --nosound")
 + " --locale " + config->language() + ".txt"
 + (config->vid_Fullscreen() ? " --fullscreen" : "")
 infoMsg.setText(QMessageBox::tr("All file associations have been set"));
 infoMsg.setWindowModality(Qt::WindowModal);
 infoMsg.exec();
 }
 else
-ShowErrorMessage(QMessageBox::tr("File association failed."));
+MessageDialog::ShowErrorMessage(QMessageBox::tr("File association failed."), this);
+}
+void HWForm::openRegistrationPage()
+{
+QDesktopServices::openUrl(QUrl("http://www.hedgewars.org/user/register"));
 }
 void HWForm::saveDemoWithCustomName()
 {
 if(!m_lastDemo.isEmpty())
 {
 QString filePath = cfgdir->absolutePath() + "/Demos/" + fileName + "." + *cProtoVer + ".hwd";
 QFile demofile(filePath);
 ok = demofile.open(QIODevice::WriteOnly);
 if (!ok)
-ShowErrorMessage(tr("Cannot save record to file %1").arg(filePath));
+MessageDialog::ShowErrorMessage(tr("Cannot save record to file %1").arg(filePath), this);
 else
 {
 ok = -1 != demofile.write(m_lastDemo);
 demofile.close();
 }
 }
 while(!fileName.isEmpty() && !ok);
 }
 }
-void HWForm::SendFeedback()
-{
+void HWForm::ShowErrorMessage(const QString & msg)
-// Get form data
+{
+MessageDialog::ShowErrorMessage(msg, this);
-QString summary = ui.pageFeedback->summary->text();
+}
-QString description = ui.pageFeedback->description->toPlainText();
-QString email = ui.pageFeedback->email->text();
+void HWForm::showFeedbackDialog()
-QString captchaCode = ui.pageFeedback->captcha_code->text();
+{
-QString captchaID = QString::number(ui.pageFeedback->captchaID);
+FeedbackDialog dialog(this);
-QString version = "HedgewarsFoundation-Hedgewars-" + (cVersionString?(*cVersionString):QString(""));
+dialog.exec();
+}
-if (summary.isEmpty() || description.isEmpty())
-{
+void HWForm::startGame()
-ShowErrorMessage(QMessageBox::tr("Please fill out all fields. Email is optional."));
+{
-return;
+QMessageBox questionMsg(this);
-}
+questionMsg.setIcon(QMessageBox::Question);
+questionMsg.setWindowTitle(QMessageBox::tr("Not all players are ready"));
-// Submit issue to PHP script
+questionMsg.setText(QMessageBox::tr("Are you sure you want to start this game?\nNot all players are ready."));
+questionMsg.setWindowModality(Qt::WindowModal);
-QByteArray body;
+questionMsg.addButton(QMessageBox::Yes);
-body.append("captcha=");
+questionMsg.addButton(QMessageBox::Cancel);
-body.append(captchaID);
-body.append("&code=");
+if (hwnet->allPlayersReady() || questionMsg.exec() == QMessageBox::Yes)
-body.append(captchaCode);
+hwnet->startGame();
-body.append("&version=");
+}
-body.append(QUrl::toPercentEncoding(version));
-body.append("&title=");
-body.append(QUrl::toPercentEncoding(summary));
-body.append("&body=");
-body.append(QUrl::toPercentEncoding(description));
-body.append("&email=");
-body.append(QUrl::toPercentEncoding(email));
-if (ui.pageFeedback->CheckSendSpecs->isChecked())
-{
-body.append("&specs=");
-body.append(QUrl::toPercentEncoding(ui.pageFeedback->specs));
-}
-nam = new QNetworkAccessManager(this);
-connect(nam, SIGNAL(finished(QNetworkReply*)),
-this, SLOT(finishedSlot(QNetworkReply*)));
-QNetworkRequest header(QUrl("http://hedgewars.org/feedback/?submit"));
-header.setRawHeader("Content-Length", QString::number(body.size()).toAscii());
-nam->post(header, body);
-}
-void HWForm::finishedSlot(QNetworkReply* reply)
-{
-if (reply && reply->error() == QNetworkReply::NoError)
-{
-QMessageBox infoMsg(this);
-infoMsg.setIcon(QMessageBox::Information);
-infoMsg.setWindowTitle(QMessageBox::tr("Hedgewars - Success"));
-infoMsg.setText(reply->readAll());
-infoMsg.setWindowModality(Qt::WindowModal);
-infoMsg.exec();
-ui.pageFeedback->summary->clear();
-ui.pageFeedback->email->clear();
-ui.pageFeedback->description->clear();
-ui.pageFeedback->LoadCaptchaImage();
-return;
-}
-else
-{
-ShowErrorMessage(QString("Error: ") + reply->readAll());
-ui.pageFeedback->LoadCaptchaImage();
-}
-}

branch	webgl
changeset 8444	75db7bb8dce8
parent 8330	aaefa587e277
parent 8436	b89aacebb9db
child 8833	c13ebed437cb