hedgewars: comparison QTfrontend/hwform.cpp

equal deleted inserted replaced

-:404ddce27b23
+:c13ebed437cb
 config = new GameUIConfig(this, "physfs://hedgewars.ini");
 frontendEffects = config->value("frontend/effects", true).toBool();
 playerHash = QString(QCryptographicHash::hash(config->value("net/nick","").toString().toUtf8(), QCryptographicHash::Md5).toHex());
 ui.pageRoomsList->setSettings(config);
+ui.pageNetGame->setSettings(config);
 ui.pageNetGame->chatWidget->setSettings(config);
 ui.pageRoomsList->chatWidget->setSettings(config);
 ui.pageOptions->setConfig(config);
 #ifdef VIDEOREC
 ui.pageVideos->init(config);
 {
 widgets.at(i)->installEventFilter(filter);
 }
 }
+ui.Pages->setCurrentIndex(ID_PAGE_INFO);
 PagesStack.push(ID_PAGE_MAIN);
 ((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageEnter();
 GoBack();
 }
 #ifdef USE_XFIRE
 void HWForm::updateXfire(void)
 {
 if(hwnet && (hwnet->clientState() != HWNewNet::Disconnected))
 {
-xfire_setvalue(XFIRE_SERVER, !hwnet->getHost().compare("netserver.hedgewars.org:46631") ? "Official server" : hwnet->getHost().toAscii());
+xfire_setvalue(XFIRE_SERVER, !hwnet->getHost().compare(QString("%1:%2").arg(NETGAME_DEFAULT_SERVER).arg(NETGAME_DEFAULT_PORT)) ? "Official server" : hwnet->getHost().toAscii());
 switch(hwnet->clientState())
 {
 case HWNewNet::Connecting: // Connecting
 case HWNewNet::Connected:
 xfire_setvalue(XFIRE_STATUS, "Connecting");
 game->PlayDemo(curritem->data(Qt::UserRole).toString(), ui.pagePlayDemo->isSave());
 }
 void HWForm::PlayDemoQuick(const QString & demofilename)
 {
-if (game && game->gameState == gsStarted) return;
-GoBack(); //needed to cleanly disconnect from netgame
 GoToPage(ID_PAGE_MAIN);
+//GoBack() <- don't or you'll close the socket
 CreateGame(0, 0, 0);
 game->PlayDemo(demofilename, false);
 }
+void HWForm::NetConnectQuick(const QString & host, quint16 port)
+{
+GoToPage(ID_PAGE_MAIN);
+NetConnectServer(host, port);
+}
 void HWForm::NetConnectServer(const QString & host, quint16 port)
 {
+qDebug("connecting to %s:%d", qPrintable(host), port);
 _NetConnect(host, port, ui.pageOptions->editNetNick->text().trimmed());
 }
 void HWForm::NetConnectOfficialServer()
 {
-NetConnectServer("netserver.hedgewars.org", 46631);
+NetConnectServer(NETGAME_DEFAULT_SERVER, NETGAME_DEFAULT_PORT);
 }
 void HWForm::NetPassword(const QString & nick)
 {
 Q_UNUSED(nick);
 QString newNick = QInputDialog::getText(this, tr("Nickname"), tr("Someone already uses your nickname %1 on the server.\nPlease pick another nickname:").arg(nick), QLineEdit::Normal, nick, &ok);
 if (!ok || newNick.isEmpty())
 {
 //ForcedDisconnect(tr("No nickname supplied."));
 bool retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied."));
 GoBack();
 if (retry) {
-NetConnectOfficialServer();
+if (hwnet->m_private_game) {
+QStringList list = hwnet->getHost().split(":");
+NetConnectServer(list.at(0), list.at(1).toShort());
+} else
+NetConnectOfficialServer();
 }
 return;
 }
 hwnet->NewNick(newNick);
 void HWForm::_NetConnect(const QString & hostName, quint16 port, QString nick)
 {
 Q_UNUSED(nick);
-if(hwnet)
+if (hwnet) {
-{
+// destroy old connection
 hwnet->Disconnect();
 delete hwnet;
-hwnet=0;
+hwnet = NULL;
 }
 hwnet = new HWNewNet();
 GoToPage(ID_PAGE_CONNECTING);
-connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()));
+connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(connected()), this, SLOT(NetConnected()), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(Error(const QString&)), this, SLOT(NetError(const QString&)), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(Warning(const QString&)), this, SLOT(NetWarning(const QString&)), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(LeftRoom(const QString&)), this, SLOT(NetLeftRoom(const QString&)), Qt::QueuedConnection);
 // room status stuff
 connect(hwnet, SIGNAL(roomMaster(bool)),
 this, SLOT(NetGameChangeStatus(bool)), Qt::QueuedConnection);
 // net page stuff
+connect(hwnet, SIGNAL(roomNameUpdated(const QString &)),
+ui.pageNetGame, SLOT(setRoomName(const QString &)), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(chatStringFromNet(const QString&)),
 ui.pageNetGame->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(chatStringFromMe(const QString&)),
 ui.pageNetGame->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
 connect(ui.pageRoomsList->chatWidget, SIGNAL(chatLine(const QString&)),
 hwnet, SLOT(chatLineToLobby(const QString&)));
 connect(hwnet, SIGNAL(chatStringLobby(const QString&)),
 ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(chatStringLobby(const QString&, const QString&)),
-ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&, const QString&)));
+ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&, const QString&)), Qt::QueuedConnection);
 connect(hwnet, SIGNAL(chatStringFromMeLobby(const QString&)),
 ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
 // nick list stuff
 connect(hwnet, SIGNAL(nickAdded(const QString&, bool)),
 // config stuff
 connect(hwnet, SIGNAL(paramChanged(const QString &, const QStringList &)), ui.pageNetGame->pGameCFG, SLOT(setParam(const QString &, const QStringList &)));
 connect(ui.pageNetGame->pGameCFG, SIGNAL(paramChanged(const QString &, const QStringList &)), hwnet, SLOT(onParamChanged(const QString &, const QStringList &)));
 connect(hwnet, SIGNAL(configAsked()), ui.pageNetGame->pGameCFG, SLOT(fullNetConfig()));
 //nick and pass stuff
+QString nickname = config->value("net/nick", "").toString();
+hwnet->m_private_game = !(hostName == NETGAME_DEFAULT_SERVER && port == NETGAME_DEFAULT_PORT);
+if (hwnet->m_private_game == false)
+if (AskForNickAndPwd() != 0)
+return;
+ui.pageRoomsList->setUser(nickname);
+ui.pageNetGame->setUser(nickname);
+hwnet->Connect(hostName, port, nickname);
+}
+int HWForm::AskForNickAndPwd(void)
+{
 //remove temppasswordhash just in case
 config->clearTempHash();
 //initialize
 QString hash = config->passwordHash();
 //if dialog close, create an error message
 if (pwDialog->exec() != QDialog::Accepted) {
 delete pwDialog;
 GoBack();
-return;
+return -1;
 }
 //set nick and pass from the dialog
 nickname = pwDialog->leNickname->text();
 password = pwDialog->lePassword->text();
 if (nickname.isEmpty()) {
 int retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied."));
 GoBack();
 delete pwDialog;
 if (retry) {
-NetConnectOfficialServer();
+if (hwnet->m_private_game) {
-}
+QStringList list = hwnet->getHost().split(":");
-return;
+NetConnectServer(list.at(0), list.at(1).toShort());
+} else
+NetConnectOfficialServer();
+}
+return -1;
 }
 if (!password.isEmpty()) {
 //calculate temphash and set it into config
 temphash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex();
 hash = config->passwordHash();
 temphash = config->tempHash();
 nickname = config->value("net/nick", "").toString();
 }
 }
+return 0;
-ui.pageRoomsList->setUser(nickname);
+}
-ui.pageNetGame->setUser(nickname);
-hwnet->Connect(hostName, port, nickname);
-}
 void HWForm::NetConnect()
 {
 HWHostPortDialog * hpd = new HWHostPortDialog(this);
 hpd->leHost->setText(*netHost);
 void HWForm::ForcedDisconnect(const QString & reason)
 {
 if (reason == "Reconnected too fast") { //TODO: this is a hack, which should be remade
 bool retry = RetryDialog(tr("Hedgewars - Connection error"), tr("You reconnected too fast.\nPlease wait a few seconds and try again."));
 if (retry) {
-NetConnectOfficialServer();
+if (hwnet->m_private_game) {
+QStringList list = hwnet->getHost().split(":");
+NetConnectServer(list.at(0), list.at(1).toShort());
+} else
+NetConnectOfficialServer();
 }
 else {
 while (ui.Pages->currentIndex() != ID_PAGE_NET
 && ui.Pages->currentIndex() != ID_PAGE_MAIN)
 {
 }
 return;
 }
 if (pnetserver)
 return; // we have server - let it care of all things
-if (hwnet)
+if (hwnet) {
-{
 QString errorStr = QMessageBox::tr("Connection to server is lost") + (reason.isEmpty()?"":("\n\n" + HWNewNet::tr("Quit reason: ") + '"' + reason +'"'));
 MessageDialog::ShowErrorMessage(errorStr, this);
 }
 while (ui.Pages->currentIndex() != ID_PAGE_NET
 QString recordFileName =
 config->appendDateTimeToRecordName() ?
 QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm") :
 "LastRound";
-QStringList versionParts = cVersionString->split('-');
+recordFileName += "_" + *cRevisionString + "-" + *cHashString;
-if ( (versionParts.size() == 2) && (!versionParts[1].isEmpty()) && (versionParts[1].contains(':')) )
-recordFileName = recordFileName + "_" + versionParts[1].replace(':','-');
 if (type == rtDemo)
 {
 demo.replace(QByteArray("\x02TL"), QByteArray("\x02TD"));
 demo.replace(QByteArray("\x02TN"), QByteArray("\x02TD"));
 void HWForm::NetGameMaster()
 {
 ui.pageNetGame->setMasterMode(true);
 ui.pageNetGame->restrictJoins->setChecked(false);
 ui.pageNetGame->restrictTeamAdds->setChecked(false);
+ui.pageNetGame->restrictUnregistered->setChecked(false);
 ui.pageNetGame->pGameCFG->GameSchemes->setModel(ammoSchemeModel);
 ui.pageNetGame->pGameCFG->setMaster(true);
 ui.pageNetGame->pNetTeamsWidget->setInteractivity(true);
 if (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->restrictUnregistered->disconnect(hwnet);
 ui.pageNetGame->disconnect(hwnet, SLOT(updateRoomName(const QString&)));
 ui.pageNetGame->setRoomName(hwnet->getRoom());
 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->restrictUnregistered, SIGNAL(triggered()), hwnet, SLOT(toggleRegisteredOnly()));
 connect(ui.pageNetGame->pGameCFG->GameSchemes->model(),
 SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
 ui.pageNetGame->pGameCFG,
 SLOT(resendSchemeData())
 );
 // used for --set-everything [screen width] [screen height] [color dept] [volume] [enable music] [enable sounds] [language file] [full screen] [show FPS] [alternate damage] [timer value] [reduced quality]
 QString HWForm::getDemoArguments()
 {
-QString prefix = datadir->absolutePath();
+QString prefix = "\"" + datadir->absolutePath() + "\"";
-QString userPrefix = cfgdir->absolutePath();
+QString userPrefix = "\"" + cfgdir->absolutePath() + "\"";
 #ifdef Q_WS_WIN
 prefix = prefix.replace("/","\\");
 userPrefix = userPrefix.replace("/","\\");
 #endif
 {
 bool success = true;
 QString arguments = getDemoArguments();
 #ifdef _WIN32
 QSettings registry_hkcr("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
+// file extension(s)
 registry_hkcr.setValue(".hwd/Default", "Hedgewars.Demo");
 registry_hkcr.setValue(".hws/Default", "Hedgewars.Save");
 registry_hkcr.setValue("Hedgewars.Demo/Default", tr("Hedgewars Demo File", "File Types"));
 registry_hkcr.setValue("Hedgewars.Save/Default", tr("Hedgewars Save File", "File Types"));
 registry_hkcr.setValue("Hedgewars.Demo/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwdfile.ico\",0");
 registry_hkcr.setValue("Hedgewars.Save/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwsfile.ico\",0");
-registry_hkcr.setValue("Hedgewars.Demo/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"%1\" "+arguments);
+registry_hkcr.setValue("Hedgewars.Demo/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" " + arguments + " %1");
-registry_hkcr.setValue("Hedgewars.Save/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"%1\" "+arguments);
+registry_hkcr.setValue("Hedgewars.Save/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" " + arguments + " %1");
+// custom url scheme(s)
+registry_hkcr.setValue("hwplay/Default", "\"URL:Hedgewars ServerAccess Scheme\"");
+registry_hkcr.setValue("hwplay/URL Protocol", "");
+registry_hkcr.setValue("hwplay/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hedgewars.exe\",0");
+registry_hkcr.setValue("hwplay/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hedgewars.exe\"  %1");
 #elif defined __APPLE__
 // only useful when other apps have taken precedence over our file extensions and you want to reset it
 system("defaults write com.apple.LaunchServices LSHandlers -array-add '<dict><key>LSHandlerContentTag</key><string>hwd</string><key>LSHandlerContentTagClass</key><string>public.filename-extension</string><key>LSHandlerRoleAll</key><string>org.hedgewars.desktop</string></dict>'");
 system("defaults write com.apple.LaunchServices LSHandlers -array-add '<dict><key>LSHandlerContentTag</key><string>hws</string><key>LSHandlerContentTagClass</key><string>public.filename-extension</string><key>LSHandlerRoleAll</key><string>org.hedgewars.desktop</string></dict>'");
 system("/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -kill -domain local -domain system -domain user");
 if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/mime/packages");
 if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
 if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share");
 if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/applications");
 if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars-mimeinfo.xml "+QDir::home().absolutePath()+"/.local/share/mime/packages").toLocal8Bit().constData())==0;
+if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars.desktop "+QDir::home().absolutePath()+"/.local/share/applications").toLocal8Bit().constData())==0;
 if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hwengine.desktop "+QDir::home().absolutePath()+"/.local/share/applications").toLocal8Bit().constData())==0;
 if (success) success = system(("update-mime-database "+QDir::home().absolutePath()+"/.local/share/mime").toLocal8Bit().constData())==0;
+if (success) success = system("xdg-mime default hedgewars.desktop x-scheme-handler/hwplay")==0;
 if (success) success = system("xdg-mime default hwengine.desktop application/x-hedgewars-demo")==0;
 if (success) success = system("xdg-mime default hwengine.desktop application/x-hedgewars-save")==0;
 // hack to add user's settings to hwengine. might be better at this point to read in the file, append it, and write it out to its new home.  This assumes no spaces in the data dir path
-if (success) success = system(("sed -i 's/^\\(Exec=.*\\) \\([^ ]* %f\\)/\\1 \\2 "+arguments+"/' "+QDir::home().absolutePath()+"/.local/share/applications/hwengine.desktop").toLocal8Bit().constData())==0;
+if (success) success = system(("sed -i 's|^\\(Exec=.*\\) \\(%f\\)|\\1 \\2 "+arguments+"|' "+QDir::home().absolutePath()+"/.local/share/applications/hwengine.desktop").toLocal8Bit().constData())==0;
 #endif
 if (success)
 {
 QMessageBox infoMsg(this);
 infoMsg.setIcon(QMessageBox::Information);

branch	webgl
changeset 8833	c13ebed437cb
parent 8444	75db7bb8dce8
parent 8803	b3f37e7f9ff4
child 9127	e350500c4edb