hedgewars: comparison QTfrontend/hwform.cpp

equal deleted inserted replaced

-:a6e7a95f3b2e
+:9e8924ff9813
 #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"
 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)),
 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_FEEDBACK :     pageName = "PAGE_FEEDBACK"; break;
 case ID_PAGE_VIDEOS :       pageName = "PAGE_VIDEOS"; break;
 case MAX_PAGE :             pageName = "MAX_PAGE"; break;
 default :                   pageName = "UNKNOWN_PAGE"; break;
 }
 return pageName;
 }
 if (id == ID_PAGE_MAIN)
 {
 ui.pageOptions->setTeamOptionsEnabled(true);
-}
-if (id == ID_PAGE_FEEDBACK)
-{
-ui.pageFeedback->LoadCaptchaImage();
 }
 }
 void HWForm::GoToPage(int id)
 {
 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"));
 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;
 }
 while(!fileName.isEmpty() && !ok);
 }
 }
-void HWForm::SendFeedback()
-{
-// Get form data
-QString summary = ui.pageFeedback->summary->text();
-QString description = ui.pageFeedback->description->toPlainText();
-QString email = ui.pageFeedback->email->text();
-QString captchaCode = ui.pageFeedback->captcha_code->text();
-QString captchaID = QString::number(ui.pageFeedback->captchaID);
-QString version = "HedgewarsFoundation-Hedgewars-" + (cVersionString?(*cVersionString):QString(""));
-if (summary.isEmpty() || description.isEmpty())
-{
-MessageDialog::ShowErrorMessage(QMessageBox::tr("Please fill out all fields. Email is optional."), this);
-return;
-}
-// Submit issue to PHP script
-QByteArray body;
-body.append("captcha=");
-body.append(captchaID);
-body.append("&code=");
-body.append(captchaCode);
-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
-{
-MessageDialog::ShowErrorMessage(QString("Error: ") + reply->readAll(), this);
-ui.pageFeedback->LoadCaptchaImage();
-}
-}
 void HWForm::ShowErrorMessage(const QString & msg)
 {
 MessageDialog::ShowErrorMessage(msg, this);
 }
+void HWForm::showFeedbackDialog()
+{
+FeedbackDialog dialog(this);
+dialog.exec();
+}

changeset 8385	9e8924ff9813
parent 8384	a6e7a95f3b2e
child 8396	5123eac2f9d6