--- a/QTfrontend/CocoaInitializer.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/CocoaInitializer.h Thu Sep 10 15:30:11 2009 +0000
@@ -10,7 +10,7 @@
public:
CocoaInitializer();
~CocoaInitializer();
-
+
private:
class Private;
Private* d;
--- a/QTfrontend/SparkleAutoUpdater.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/SparkleAutoUpdater.h Thu Sep 10 15:30:11 2009 +0000
@@ -16,7 +16,7 @@
~SparkleAutoUpdater();
void checkForUpdates();
-
+
private:
class Private;
Private* d;
--- a/QTfrontend/about.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/about.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -38,7 +38,7 @@
"<style type=\"text/css\">"
"a { color: #ffcc00; }"
// "a:hover { color: yellow; }"
- "</style>"
+ "</style>"
"<div align=\"center\"><h1>Hedgewars</h1>"
"<h3>" + QLabel::tr("Version") + " " + *cVersionString + "</h3>"
"<p><a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a></p><br>" +
@@ -68,7 +68,7 @@
"Frontend improvements: Kristian Lehmann <<a href=\"mailto:email@thexception.net\">email@thexception.net</a>><br>"
"Mac OS X port: Vittorio Giovara <<a href=\"mailto:vittorio.giovara@gmail.com\">vittorio.giovara@gmail.com</a>>"
"</p><h2>" +
-
+
QLabel::tr("Art:") + "</h2>"
+ QString::fromUtf8(
"<p>Finn Brice <<a href=\"mailto:tiyuri@gmail.com\">tiyuri@gmail.com</a>>"
@@ -94,7 +94,7 @@
"<br>"
"Daniel Martin <<a href=\"mailto:elhombresinremedio@gmail.com\">elhombresinremedio@gmail.com</a>>"
"</p><h2>" +
-
+
QLabel::tr("Translations:") + "</h2><p>"
+ QString::fromUtf8(
"Brazilian Portuguese: Romulo Fernandes Machado <<a href=\"mailto:abra185@gmail.com\">abra185@gmail.com</a>><br>"
@@ -114,7 +114,7 @@
"Swedish: Niklas Grahn <<a href=\"mailto:raewolusjoon@yaoo.com\">raewolusjoon@yaoo.com</a>><br>"
"Ukrainian: Eugene V. Lyubimkin <<a href=\"mailto:jackyf.devel@gmail.com\">jackyf.devel@gmail.com</a>>"
"</p><h2>") +
-
+
QLabel::tr("Special thanks:") + "</h2><p>"
"Aleksey Andreev <<a href=\"mailto:blaknayabr@gmail.com\">blaknayabr@gmail.com</a>><br>"
"Aleksander Rudalev <<a href=\"mailto:alexv@pomorsu.ru\">alexv@pomorsu.ru</a>><br>"
--- a/QTfrontend/ammoSchemeModel.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/ammoSchemeModel.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -56,7 +56,7 @@
<< "Shoppa"
<< "Basketball"
<< "Minefield";
-
+
spNames = QStringList()
<< "name" // 0
<< "fortsmode" // 1
@@ -244,11 +244,11 @@
QList<QVariant> newScheme = defaultScheme;
newScheme[0] = QVariant(tr("new"));
-
+
schemes.insert(row, newScheme);
endInsertRows();
-
+
return true;
}
@@ -258,7 +258,7 @@
|| row < numberOfDefaultSchemes
|| row >= schemes.size())
return false;
-
+
beginRemoveRows(parent, row, row);
schemes.removeAt(row);
@@ -283,12 +283,12 @@
void AmmoSchemeModel::Save()
{
fileConfig.beginWriteArray("schemes", schemes.size());
-
+
for (int i = 0; i < schemes.size(); ++i) {
fileConfig.setArrayIndex(i);
QList<QVariant> scheme = schemes[i];
-
+
for (int k = 0; k < scheme.size(); ++k)
fileConfig.setValue(spNames[k], scheme[k]);
}
--- a/QTfrontend/bgwidget.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/bgwidget.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -67,11 +67,11 @@
{
setAttribute(Qt::WA_NoSystemBackground, true);
sprite.load(":/res/Star.png");
-
+
setAutoFillBackground(false);
for (int i = 0; i < SPRITE_MAX; i++) spritePositions[i] = new SpritePosition(this, sprite.height());
-
+
for (int i = 0; i < 360; i++)
{
rotatedSprites[i] = new QImage(sprite.width(), sprite.height(), QImage::Format_ARGB32);
--- a/QTfrontend/bgwidget.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/bgwidget.h Thu Sep 10 15:30:11 2009 +0000
@@ -41,7 +41,7 @@
float fY;
float fXMov;
float fYMov;
- int iAngle;
+ int iAngle;
QWidget * wParent;
int iSpriteHeight;
public:
--- a/QTfrontend/chatwidget.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/chatwidget.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -63,7 +63,7 @@
connect(acKick, SIGNAL(triggered(bool)), this, SLOT(onKick()));
acBan = new QAction(QAction::tr("Ban"), chatNicks);
connect(acBan, SIGNAL(triggered(bool)), this, SLOT(onBan()));
-
+
chatNicks->insertAction(0, acInfo);
}
@@ -81,9 +81,9 @@
QString formattedStr = Qt::escape(str);
if (formattedStr.startsWith("***"))
formattedStr = QString("<font color=grey>%1</font>").arg(formattedStr);
-
+
chatStrings.append(formattedStr);
-
+
chatText->setHtml(chatStrings.join("<br>"));
chatText->moveCursor(QTextCursor::End);
@@ -93,9 +93,9 @@
{
if (chatStrings.size() > 250)
chatStrings.removeFirst();
-
+
chatStrings.append("<hr>" + str + "<hr>");
-
+
chatText->setHtml(chatStrings.join("<br>"));
chatText->moveCursor(QTextCursor::End);
@@ -163,7 +163,7 @@
{
chatNicks->removeAction(acKick);
chatNicks->removeAction(acBan);
-
+
if(b)
{
chatNicks->insertAction(0, acKick);
--- a/QTfrontend/frameTeam.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/frameTeam.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -31,10 +31,10 @@
newPalette.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
setPalette(newPalette);
setAutoFillBackground(true);
-
+
mainLayout.setSpacing(1);
mainLayout.setContentsMargins(4, 4, 4, 4);
-
+
availableColors.push_back(*color1);
availableColors.push_back(*color2);
availableColors.push_back(*color3);
--- a/QTfrontend/game.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/game.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -147,7 +147,7 @@
emit ErrorMessage(tr("Error reading training config file"));
return;
}
-
+
QTextStream stream(&file);
while(!stream.atEnd())
{
--- a/QTfrontend/gamecfgwidget.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/gamecfgwidget.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -57,14 +57,14 @@
goToSchemePage->setText(tr("Edit schemes"));
GBoxOptionsLayout->addWidget(goToSchemePage, 1, 0, 1, 2);
connect(goToSchemePage, SIGNAL(clicked()), this, SIGNAL(goToSchemes()));
-
+
GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Weapons"), GBoxOptions), 2, 0);
WeaponsName = new QComboBox(GBoxOptions);
GBoxOptionsLayout->addWidget(WeaponsName, 2, 1);
-
+
connect(WeaponsName, SIGNAL(currentIndexChanged(int)), this, SLOT(ammoChanged(int)));
-
+
QPushButton * goToWeaponPage = new QPushButton(GBoxOptions);
goToWeaponPage->setText(tr("Edit weapons"));
GBoxOptionsLayout->addWidget(goToWeaponPage, 3, 0, 1, 2);
@@ -160,7 +160,7 @@
void GameCFGWidget::fullNetConfig()
{
ammoChanged(WeaponsName->currentIndex());
-
+
seedChanged(pMapContainer->getCurrentSeed());
templateFilterChanged(pMapContainer->getTemplateFilter());
themeChanged(pMapContainer->getCurrentTheme());
@@ -203,7 +203,7 @@
return;
}
}
-
+
qWarning("Got bad config param from net");
}
@@ -243,7 +243,7 @@
int size = GameSchemes->model()->columnCount();
for(int i = 0; i < size; ++i)
sl << schemeData(i).toString();
-
+
emit paramChanged("SCHEME", sl);
}
--- a/QTfrontend/gameuiconfig.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/gameuiconfig.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -58,7 +58,7 @@
QObject::tr("Please, enter your nickname"),
QLineEdit::Normal,
QDir::home().dirName());
-
+
Form->ui.pageOptions->editNetNick->setText(netNick);
delete netHost;
@@ -73,12 +73,12 @@
Form->ui.pageOptions->CBAltDamage->setChecked(value("misc/altdamage", false).toBool());
Form->ui.pageOptions->CBNameWithDate->setChecked(value("misc/appendTimeToRecords", false).toBool());
-
+
#ifdef __APPLE__
//autoupdate
Form->ui.pageOptions->CBAutoUpdate->setChecked(value("misc/autoUpdate", true).toBool());
#endif
-
+
depth = QApplication::desktop()->depth();
if (depth < 16) depth = 16;
else if (depth > 16) depth = 32;
@@ -134,11 +134,11 @@
setValue("misc/altdamage", isAltDamageEnabled());
setValue("misc/appendTimeToRecords", appendDateTimeToRecordName());
-
+
#ifdef __APPLE__
//autoupdate
setValue("misc/autoUpdate", isAutoUpdateEnabled());
-#endif
+#endif
}
QRect GameUIConfig::vid_Resolution()
--- a/QTfrontend/gameuiconfig.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/gameuiconfig.h Thu Sep 10 15:30:11 2009 +0000
@@ -48,12 +48,12 @@
bool isFrontendEffects() const;
bool isFrontendFullscreen() const;
void resizeToConfigValues();
-
+
#ifdef __APPLE__
//autoupdate
bool isAutoUpdateEnabled();
#endif
-
+
signals:
void frontendFullscreen(bool value);
--- a/QTfrontend/hats.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/hats.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -43,7 +43,7 @@
QPixmap tmppix(32, 37);
tmppix.fill(QColor(Qt::transparent));
-
+
QPainter painter(&tmppix);
painter.drawPixmap(QPoint(0, 5), hhpix);
painter.drawPixmap(QPoint(0, 0), pix.copy(0, 0, 32, 32));
--- a/QTfrontend/hwform.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/hwform.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -78,9 +78,9 @@
ui.pageOptions->CBResolution->addItems(sdli.getResolutions());
config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini");
-
+
namegen = new HWNamegen();
-
+
#ifdef __APPLE__
//autoupdate
AutoUpdater* updater;
@@ -89,7 +89,7 @@
if(updater && config->isAutoUpdateEnabled())
updater->checkForUpdates();
#endif
-
+
UpdateTeamsLists();
UpdateWeapons();
@@ -135,7 +135,7 @@
connect(ui.pageNet->BtnSpecifyServer, SIGNAL(clicked()), this, SLOT(NetConnect()));
connect(ui.pageNet->BtnNetSvrStart, SIGNAL(clicked()), this, SLOT(GoToNetServer()));
connect(ui.pageNet, SIGNAL(connectClicked(const QString &, quint16)), this, SLOT(NetConnectServer(const QString &, quint16)));
-
+
connect(ui.pageNetServer->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageNetServer->BtnStart, SIGNAL(clicked()), this, SLOT(NetStartServer()));
@@ -236,7 +236,7 @@
for(int i = 0; i < names.size(); ++i)
(*it)->addItem(names[i], ui.pageSelectWeapon->pWeapons->getWeaponsString(names[i]));
-
+
int pos = (*it)->findText("Default");
if (pos != -1) {
(*it)->setCurrentIndex(pos);
@@ -357,20 +357,20 @@
if (id == ID_PAGE_MULTIPLAYER || id == ID_PAGE_NETGAME) {
QStringList tmNames = config->GetTeamsList();
TeamSelWidget* curTeamSelWidget;
-
+
if(id == ID_PAGE_MULTIPLAYER) {
curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
} else {
curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
}
-
+
QList<HWTeam> teamsList;
for(QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++) {
HWTeam team(*it);
team.LoadFromFile();
teamsList.push_back(team);
}
-
+
if(lastid == ID_PAGE_SETUP) { // _TEAM
if (editedTeam) {
curTeamSelWidget->addTeam(*editedTeam);
@@ -402,14 +402,14 @@
quint8 curid = ui.Pages->currentIndex();
ui.Pages->setCurrentIndex(id);
OnPageShown(id, curid);
-
+
if (id == ID_PAGE_CONNECTING)
GoBack();
if (id == ID_PAGE_NETSERVER)
GoBack();
if ((!hwnet) && (id == ID_PAGE_ROOMSLIST))
GoBack();
-
+
if ((!hwnet) || (!hwnet->isInRoom()))
if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME)
GoBack();
@@ -443,13 +443,13 @@
{
quint8 id=ui.Pages->currentIndex();
TeamSelWidget* curTeamSelWidget;
-
+
if(id == ID_PAGE_MULTIPLAYER) {
curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
} else {
curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
}
-
+
QList<HWTeam> teams = curTeamSelWidget->getDontPlayingTeams();
QStringList tmnames;
for(QList<HWTeam>::iterator it = teams.begin(); it != teams.end(); ++it) {
@@ -544,9 +544,9 @@
delete hwnet;
hwnet=0;
}
-
+
ui.pageRoomsList->chatWidget->clear();
-
+
hwnet = new HWNewNet(config, ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget);
GoToPage(ID_PAGE_CONNECTING);
@@ -567,7 +567,7 @@
ui.pageRoomsList, SLOT(setAdmin(bool)));
connect(hwnet, SIGNAL(adminAccess(bool)),
ui.pageRoomsList->chatWidget, SLOT(adminAccess(bool)));
-
+
connect(hwnet, SIGNAL(serverMessage(const QString&)),
ui.pageRoomsList->chatWidget, SLOT(onServerMessage(const QString&)));
@@ -653,7 +653,7 @@
// disconnect
connect(hwnet, SIGNAL(Disconnected()), this, SLOT(ForcedDisconnect()), Qt::QueuedConnection);
-
+
hwnet->Connect(hostName, port, nick);
}
@@ -728,7 +728,7 @@
hwnet = 0;
QMessageBox::warning(this, QMessageBox::tr("Network"),
QMessageBox::tr("Connection to server is lost"));
-
+
}
if (ui.Pages->currentIndex() != ID_PAGE_NET) GoBack();
}
@@ -766,7 +766,7 @@
switch(gameState) {
case gsStarted: {
Music(false);
- if (wBackground) wBackground->stopAnimation();
+ if (wBackground) wBackground->stopAnimation();
GoToPage(ID_PAGE_INGAME);
ui.pageGameStats->clear();
if (pRegisterServer)
@@ -779,7 +779,7 @@
case gsFinished: {
GoBack();
Music(ui.pageOptions->CBEnableMusic->isChecked());
- if (wBackground) wBackground->startAnimation();
+ if (wBackground) wBackground->startAnimation();
GoToPage(ID_PAGE_GAMESTATS);
if (hwnet) hwnet->gameFinished();
break;
@@ -789,7 +789,7 @@
if (id == ID_PAGE_INGAME) {
GoBack();
Music(ui.pageOptions->CBEnableMusic->isChecked());
- if (wBackground) wBackground->startAnimation();
+ if (wBackground) wBackground->startAnimation();
if (hwnet) hwnet->gameFinished();
}
};
@@ -899,7 +899,7 @@
ui.pageNetGame->pGameCFG->GameSchemes->setModel(ammoSchemeModel);
ui.pageNetGame->pGameCFG->setEnabled(true);
ui.pageNetGame->pNetTeamsWidget->setInteractivity(true);
-
+
if (hwnet)
{
// disconnect connections first to ensure their inexistance and not to connect twice
@@ -921,7 +921,7 @@
{
ui.pageNetGame->pGameCFG->setEnabled(false);
ui.pageNetGame->pNetTeamsWidget->setInteractivity(false);
-
+
if (hwnet)
{
NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
--- a/QTfrontend/hwform.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/hwform.h Thu Sep 10 15:30:11 2009 +0000
@@ -100,7 +100,7 @@
void NetGameChangeStatus(bool isMaster);
void NetGameMaster();
void NetGameSlave();
-
+
void AsyncNetServerStart();
void NetLeftRoom();
void selectFirstNetScheme();
@@ -112,7 +112,7 @@
void closeEvent(QCloseEvent *event);
void CustomizePalettes();
void resizeEvent(QResizeEvent * event);
-
+
enum PageIDs {
ID_PAGE_SETUP_TEAM = 0,
ID_PAGE_SETUP = 1,
--- a/QTfrontend/hwmap.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/hwmap.h Thu Sep 10 15:30:11 2009 +0000
@@ -30,7 +30,7 @@
class HWMap : public TCPBase
{
Q_OBJECT
-
+
public:
HWMap();
virtual ~HWMap();
--- a/QTfrontend/itemNum.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/itemNum.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-
+
#include "itemNum.h"
#include "hwform.h"
--- a/QTfrontend/itemNum.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/itemNum.h Thu Sep 10 15:30:11 2009 +0000
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-
+
#include <QFrame>
#include <QImage>
--- a/QTfrontend/main.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/main.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -74,7 +74,7 @@
}
app.setStyle(new QPlastiqueStyle);
-
+
QDateTime now = QDateTime::currentDateTime();
QDateTime zero;
srand(now.secsTo(zero));
@@ -212,13 +212,13 @@
"QComboBox::down-arrow {"
"image: url(\":/res/dropdown.png\");"
"}"
-
+
"VertScrArea {"
"background-image: url(\":/res/panelbg.png\");"
"background-position: bottom center;"
"background-repeat: repeat-x;"
"}"
-
+
"IconedGroupBox {"
"border-radius: 16px;"
"padding: 2px;"
@@ -238,7 +238,7 @@
"QCheckBox::indicator:unchecked{"
"image: url(\":/res/unchecked.png\");"
"}"
-
+
".QWidget{"
"background: transparent;"
"}"
@@ -274,7 +274,7 @@
"QToolTip{"
"background-color: #0d0544;"
"}"
-
+
":disabled{"
"color: #a0a0a0;"
"}"
@@ -289,7 +289,7 @@
cfgdir->setPath(cfgdir->homePath());
#ifdef __APPLE__
-
+
if (checkForDir(cfgdir->absolutePath() + "/Library/Application Support/Hedgewars"))
{
checkForDir(cfgdir->absolutePath() + "/Library/Application Support/Hedgewars/Demos");
@@ -340,7 +340,7 @@
mapList = new QStringList(tmpdir.entryList(QStringList("*")));
HWForm *Form = new HWForm();
-
+
Form->show();
return app.exec();
--- a/QTfrontend/mapContainer.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/mapContainer.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -42,12 +42,12 @@
hhSmall.load(":/res/hh_small.png");
hhLimit = 18;
templateFilter = 0;
-
+
mainLayout.setContentsMargins(QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
1,
QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin),
QApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
-
+
imageButt = new QPushButton(this);
imageButt->setObjectName("imageButt");
imageButt->setFixedSize(256 + 6, 128 + 6);
@@ -83,7 +83,7 @@
mapCfgFile.close();
}
}
-
+
connect(chooseMap, SIGNAL(currentIndexChanged(int)), this, SLOT(mapChanged(int)));
mainLayout.addWidget(chooseMap, 1, 1);
@@ -111,7 +111,7 @@
//gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon
mainLayout.addWidget(gbThemes, 0, 2, 3, 1);
-
+
QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes);
gbTLayout->setContentsMargins(0, 0, 0 ,0);
gbTLayout->setSpacing(0);
@@ -139,10 +139,10 @@
"}"
)
);
-
+
gbTLayout->addWidget(lwThemes);
lwThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
-
+
mainLayout.setSizeConstraint(QLayout::SetFixedSize);//SetMinimumSize
setRandomSeed();
@@ -212,7 +212,7 @@
{
QPixmap finalImage = QPixmap(image.size());
finalImage.fill(QColor(0, 0, 0, 0));
-
+
QPainter p(&finalImage);
p.drawPixmap(image.rect(), image);
//p.setPen(QColor(0xf4,0x9e,0xe9));
@@ -297,7 +297,7 @@
changeImage();
return;
}
-
+
int id = chooseMap->findText(map);
if(id > 0) {
if (pMap)
--- a/QTfrontend/netserver.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/netserver.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -34,7 +34,7 @@
QStringList params;
params << QString("--port=%1").arg(port);
params << "--dedicated=False";
-
+
process.start(bindir->absolutePath() + "/hedgewars-server", params);
return process.waitForStarted(5000);
--- a/QTfrontend/newnetclient.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/newnetclient.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -75,7 +75,7 @@
if (m_game_connected)
RawSendNet(QString("QUIT%1%2").arg(delimeter).arg("User quit"));
m_game_connected = false;
-
+
NetSocket.disconnectFromHost();
}
@@ -86,7 +86,7 @@
qWarning("Illegal try to create room!");
return;
}
-
+
RawSendNet(QString("CREATE_ROOM%1%2").arg(delimeter).arg(room));
isChief = true;
}
@@ -98,7 +98,7 @@
qWarning("Illegal try to join room!");
return;
}
-
+
RawSendNet(QString("JOIN_ROOM%1%2").arg(delimeter).arg(room));
isChief = false;
}
@@ -179,7 +179,7 @@
void HWNewNet::displayError(QAbstractSocket::SocketError socketError)
{
emit Disconnected();
-
+
switch (socketError) {
case QAbstractSocket::RemoteHostClosedError:
break;
@@ -305,7 +305,7 @@
}
return;
}
-
+
if (lst[0] == "NOT_READY") {
if(lst.size() < 2)
{
@@ -363,7 +363,7 @@
qWarning("Net: Bad JOINED message");
return;
}
-
+
for(int i = 1; i < lst.size(); ++i)
{
if (lst[i] == mynick)
@@ -386,7 +386,7 @@
qWarning("Net: Bad JOINED message");
return;
}
-
+
for(int i = 1; i < lst.size(); ++i)
{
if (lst[i] == mynick)
--- a/QTfrontend/newnetclient.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/newnetclient.h Thu Sep 10 15:30:11 2009 +0000
@@ -128,7 +128,7 @@
void onHedgehogsNumChanged(const HWTeam& team);
void onTeamColorChanged(const HWTeam& team);
void onParamChanged(const QString & param, const QStringList & value);
-
+
void newServerMessage(const QString &);
--- a/QTfrontend/pages.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/pages.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -62,7 +62,7 @@
#include "hwform.h"
#include "SDLs.h"
-PageMain::PageMain(QWidget* parent) :
+PageMain::PageMain(QWidget* parent) :
AbstractPage(parent)
{
if(frontendEffects) setAttribute(Qt::WA_NoSystemBackground, true);
@@ -111,7 +111,7 @@
BtnTeamDiscard = addButton(":/res/Exit.png", pageLayout, 1, 0, true);
BtnTeamSave = addButton(":/res/Save.png", pageLayout, 1, 2, true);;
BtnTeamSave->setStyleSheet("QPushButton{margin: 12px 0px 12px 0px;}");
-
+
QHBoxLayout * page1Layout = new QHBoxLayout(page1);
page1Layout->setAlignment(Qt::AlignTop);
QGridLayout * page2Layout = new QGridLayout(page2);
@@ -123,14 +123,14 @@
page1Layout->addLayout(vbox1);
page1Layout->addLayout(vbox2);
page1Layout->addLayout(vbox3);
-
+
GBoxHedgehogs = new QGroupBox(this);
GBoxHedgehogs->setTitle(QGroupBox::tr("Team Members"));
GBoxHedgehogs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
QGridLayout * GBHLayout = new QGridLayout(GBoxHedgehogs);
signalMapper = new QSignalMapper(this);
-
+
HatsModel * hatsModel = new HatsModel(GBoxHedgehogs);
for(int i = 0; i < 8; i++)
{
@@ -146,7 +146,7 @@
HHNameEdit[i]->setMaxLength(64);
HHNameEdit[i]->setMinimumWidth(120);
GBHLayout->addWidget(HHNameEdit[i], i, 1);
-
+
randButton[i] = addButton(":/res/dice.png", GBHLayout, i, 3, true);
connect(randButton[i], SIGNAL(clicked()), signalMapper, SLOT(map()));
@@ -167,7 +167,7 @@
TeamNameEdit->setMaxLength(64);
GBTLayout->addWidget(TeamNameEdit);
vbox2->addWidget(GBoxTeam);
-
+
CBTeamLvl = new QComboBox(GBoxTeam);
CBTeamLvl->setIconSize(QSize(48, 48));
CBTeamLvl->addItem(QIcon(":/res/botlevels/0.png"), QComboBox::tr("Human"));
@@ -177,7 +177,7 @@
QString("%1 %2").arg(QComboBox::tr("Level")).arg(i)
);
GBTLayout->addWidget(CBTeamLvl);
-
+
CBGrave = new QComboBox(GBoxTeam);
CBGrave->setMaxCount(65535);
CBGrave->setIconSize(QSize(32, 32));
@@ -222,7 +222,7 @@
connect(CBFort, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(CBFort_activated(const QString &)));
CBFort->addItems(tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1"));
-
+
tmpdir.cd("../Graphics/Graves");
QStringList list = tmpdir.entryList(QStringList("*.png"));
for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -295,7 +295,7 @@
QStringList list = tmpdir.entryList(QStringList() << "Illgetyou.ogg" << "Incoming.ogg" << "Stupid.ogg" << "Coward.ogg" << "Firstblood.ogg", QDir::Files);
if (list.size()) {
sound = openal_loadfile(QString(tmpdir.absolutePath() + "/" + list[rand() % list.size()]).toLocal8Bit().constData());
- openal_playsound(sound);
+ openal_playsound(sound);
}
}
@@ -354,10 +354,10 @@
BtnEditTeam = addButton(tr("Edit team"), layout1, 1);
layout1->setStretchFactor(BtnNewTeam, 100);
layout1->setStretchFactor(BtnEditTeam, 100);
-
+
QHBoxLayout * layout2 = new QHBoxLayout;
GBTlayout->addLayout(layout2);
-
+
labelNN = new QLabel(teamsBox);
labelNN->setText(QLabel::tr("Net nick"));
layout2->addWidget(labelNN);
@@ -366,7 +366,7 @@
editNetNick->setMaxLength(20);
editNetNick->setText(QLineEdit::tr("unnamed"));
layout2->addWidget(editNetNick);
-
+
gbTBLayout->addWidget(teamsBox, 0, 0);
}
@@ -394,7 +394,7 @@
QVBoxLayout * GBAlayout = new QVBoxLayout(AGGroupBox);
QHBoxLayout * GBAreslayout = new QHBoxLayout(0);
-
+
QLabel * resolution = new QLabel(AGGroupBox);
resolution->setText(QLabel::tr("Resolution"));
GBAreslayout->addWidget(resolution);
@@ -464,7 +464,7 @@
CBAutoUpdate->setText(QCheckBox::tr("Check for updates at startup"));
GBAlayout->addWidget(CBAutoUpdate);
#endif
-
+
fpsedit = new FPSEdit(AGGroupBox);
GBAfpslayout->addWidget(fpsedit);
gbTBLayout->addWidget(AGGroupBox, 0, 1, 2, 1);
@@ -491,7 +491,7 @@
pageLayout->addWidget(BtnNetSvrStart, 4, 2);
BtnBack = addButton(":/res/Exit.png", pageLayout, 4, 0, true);
-
+
ConnGroupBox = new QGroupBox(this);
ConnGroupBox->setTitle(QGroupBox::tr("Net game"));
pageLayout->addWidget(ConnGroupBox, 2, 0, 1, 3);
@@ -636,7 +636,7 @@
pageLayout->addLayout(bottomLayout, 3, 0, 1, 2);
BtnBack = addButton(":/res/Exit.png", bottomLayout, 0, true);
-
+
BtnGo = new QPushButton(this);
BtnGo->setToolTip(QPushButton::tr("Ready"));
BtnGo->setIcon(QIcon(":/res/lightbulb_off.png"));
@@ -655,7 +655,7 @@
//menu->addAction(startGame);
menu->addAction(restrictJoins);
menu->addAction(restrictTeamAdds);
-
+
BtnMaster->setMenu(menu);
BtnStart = addButton(QAction::tr("Start"), bottomLayout, 3);
@@ -710,11 +710,11 @@
BtnMultiplayer = addButton(":/res/Multiplayer.png", topLine, 1, true);
BtnMultiplayer->setToolTip(tr("Multiplayer (play a hotseat game against your friends, or AI teams)"));
topLine->addStretch();
-
+
BtnTrainPage = addButton(":/res/Trainings.png", middleLine, 0, true);
BtnTrainPage->setToolTip(tr("Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT"));
-
+
BtnBack = addButton(":/res/Exit.png", bottomLine, 0, true);
bottomLine->addStretch();
@@ -744,7 +744,7 @@
AbstractPage(parent)
{
QGridLayout * pageLayout = new QGridLayout(this);
-
+
pWeapons = new SelWeaponWidget(cAmmoNumber, this);
pageLayout->addWidget(pWeapons, 0, 0, 1, 4);
@@ -773,7 +773,7 @@
roomName = new QLineEdit(this);
roomName->setMaxLength(60);
pageLayout->addWidget(roomName, 0, 0);
-
+
roomsList = new QTableWidget(this);
roomsList->setColumnCount(3);
roomsList->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -782,7 +782,7 @@
roomsList->setAlternatingRowColors(true);
pageLayout->addWidget(roomsList, 1, 0, 3, 1);
pageLayout->setRowStretch(2, 100);
-
+
chatWidget = new HWChatWidget(this);
pageLayout->addWidget(chatWidget, 4, 0, 1, 2);
pageLayout->setRowStretch(4, 350);
@@ -790,7 +790,7 @@
BtnCreate = addButton(tr("Create"), pageLayout, 0, 1);
BtnJoin = addButton(tr("Join"), pageLayout, 1, 1);
BtnRefresh = addButton(tr("Refresh"), pageLayout, 3, 1);
-
+
BtnBack = addButton(":/res/Exit.png", pageLayout, 5, 0, true);
BtnAdmin = addButton(tr("Admin features"), pageLayout, 5, 1);
@@ -819,7 +819,7 @@
roomsList->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
roomsList->horizontalHeader()->setResizeMode(2, QHeaderView::ResizeToContents);
-
+
if (list.size() % 3)
return;
@@ -880,7 +880,7 @@
{
QGridLayout * pageLayout = new QGridLayout(this);
QGroupBox * gb = new QGroupBox(this);
-
+
QGridLayout * gl = new QGridLayout();
gb->setLayout(gl);
QSizePolicy sp;
@@ -888,7 +888,7 @@
sp.setHorizontalPolicy(QSizePolicy::Expanding);
pageLayout->addWidget(gb, 1,0,13,4);
-
+
gbGameModes = new QGroupBox(QGroupBox::tr("Game Modifiers"), gb);
gbBasicSettings = new QGroupBox(QGroupBox::tr("Basic Settings"), gb);
@@ -903,13 +903,13 @@
gbBasicSettings->setSizePolicy(sp);
gl->addWidget(gbGameModes,0,0,1,3,Qt::AlignTop);
gl->addWidget(gbBasicSettings,0,3,1,3,Qt::AlignTop);
-
+
QGridLayout * glGMLayout = new QGridLayout(gbGameModes);
QGridLayout * glBSLayout = new QGridLayout(gbBasicSettings);
gbGameModes->setLayout(glGMLayout);
gbBasicSettings->setLayout(glBSLayout);
// Left
-
+
TBW_mode_Forts = new ToggleButtonWidget(gbGameModes, ":/res/btnForts.png");
TBW_mode_Forts->setText(ToggleButtonWidget::tr("Fort Mode"));
TBW_mode_Forts->setToolTip(tr("Defend your fort and destroy the opponents, two team colours max!"));
@@ -967,7 +967,7 @@
// Right
QLabel * l;
-
+
l = new QLabel(gbBasicSettings);
l->setText(QLabel::tr("Damage Modifier"));
l->setWordWrap(true);
@@ -976,7 +976,7 @@
l->setFixedSize(32,32);
l->setPixmap(QPixmap(":/res/iconDamage.png"));
glBSLayout->addWidget(l,0,1,1,1);
-
+
SB_DamageModifier = new QSpinBox(gbBasicSettings);
SB_DamageModifier->setRange(10, 300);
SB_DamageModifier->setValue(100);
@@ -991,13 +991,13 @@
l->setFixedSize(32,32);
l->setPixmap(QPixmap(":/res/iconTime.png"));
glBSLayout->addWidget(l,1,1,1,1);
-
+
SB_TurnTime = new QSpinBox(gbBasicSettings);
SB_TurnTime->setRange(1, 99);
SB_TurnTime->setValue(45);
SB_TurnTime->setSingleStep(15);
glBSLayout->addWidget(SB_TurnTime,1,2,1,1);
-
+
l = new QLabel(gbBasicSettings);
l->setText(QLabel::tr("Initial Health"));
l->setWordWrap(true);
@@ -1006,13 +1006,13 @@
l->setFixedSize(32,32);
l->setPixmap(QPixmap(":/res/iconHealth.png"));
glBSLayout->addWidget(l,2,1,1,1);
-
+
SB_InitHealth = new QSpinBox(gbBasicSettings);
SB_InitHealth->setRange(50, 200);
SB_InitHealth->setValue(100);
SB_InitHealth->setSingleStep(25);
glBSLayout->addWidget(SB_InitHealth,2,2,1,1);
-
+
l = new QLabel(gbBasicSettings);
l->setText(QLabel::tr("Sudden Death Timeout"));
l->setWordWrap(true);
@@ -1027,7 +1027,7 @@
SB_SuddenDeath->setValue(15);
SB_SuddenDeath->setSingleStep(3);
glBSLayout->addWidget(SB_SuddenDeath,3,2,1,1);
-
+
l = new QLabel(gbBasicSettings);
l->setText(QLabel::tr("Crate Drops"));
l->setWordWrap(true);
@@ -1076,7 +1076,7 @@
l->setText(QLabel::tr("Scheme Name:"));
LE_name = new QLineEdit(this);
-
+
gl->addWidget(LE_name,14,1,1,5);
gl->addWidget(l,14,0,1,1);
@@ -1099,7 +1099,7 @@
{
mapper->setModel(model);
selectScheme->setModel(model);
-
+
mapper->addMapping(LE_name, 0);
mapper->addMapping(TBW_mode_Forts->button(), 1);
mapper->addMapping(TBW_teamsDivide->button(), 2);
--- a/QTfrontend/pages.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/pages.h Thu Sep 10 15:30:11 2009 +0000
@@ -224,7 +224,7 @@
#ifdef __APPLE__
QCheckBox *CBAutoUpdate;
#endif
-
+
FPSEdit *fpsedit;
QPushButton *BtnSaveOptions;
QLabel *labelNN;
@@ -292,7 +292,7 @@
QPushButton *BtnGo;
QPushButton *BtnMaster;
QPushButton *BtnStart;
-
+
QAction * restrictJoins;
QAction * restrictTeamAdds;
@@ -381,7 +381,7 @@
QPushButton * BtnRefresh;
QPushButton * BtnAdmin;
HWChatWidget * chatWidget;
-
+
public slots:
void setRoomsList(const QStringList & list);
void setAdmin(bool);
@@ -390,7 +390,7 @@
void onCreateClick();
void onJoinClick();
void onRefreshClick();
-
+
signals:
void askForCreateRoom(const QString &);
void askForJoinRoom(const QString &);
--- a/QTfrontend/sdlkeys.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/sdlkeys.h Thu Sep 10 15:30:11 2009 +0000
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-char sdlkeys[][2][16] =
+char sdlkeys[][2][16] =
{
{"mousel", "mousel"},
{"mousem", "mousem"},
--- a/QTfrontend/selectWeapon.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/selectWeapon.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -42,7 +42,7 @@
QHBoxLayout* hbLayout = new QHBoxLayout(this);
hbLayout->setSpacing(1);
hbLayout->setMargin(1);
-
+
QLabel* lbl = new QLabel(this);
lbl->setPixmap(QPixmap::fromImage(getAmmoImage(iconNum)));
lbl->setMaximumWidth(30);
@@ -97,10 +97,10 @@
p2Layout = new QGridLayout(page2);
p2Layout->setSpacing(1);
p2Layout->setMargin(1);
-
+
tbw->addTab(page1, tr("Weapon set"));
tbw->addTab(page2, tr("Probabilities"));
-
+
QGridLayout * pageLayout = new QGridLayout(this);
pageLayout->addWidget(tbw);
@@ -113,11 +113,11 @@
SelWeaponItem * swi = new SelWeaponItem(true, i, currentState[i].digitValue(), this);
weaponItems[i].append(swi);
p1Layout->addWidget(swi, j, k % 4);
-
+
SelWeaponItem * pwi = new SelWeaponItem(false, i, currentState[numItems + i].digitValue(), this);
weaponItems[i].append(pwi);
p2Layout->addWidget(pwi, j, k % 4);
-
+
++k;
}
@@ -149,12 +149,12 @@
impossible.exec();
return;
}
-
+
if (m_name->text() == "") return;
-
+
QString state1;
QString state2;
-
+
for(int i = 0; i < m_numItems; ++i) {
twi::const_iterator it = weaponItems.find(i);
int num = it == weaponItems.end() ? 9 : it.value()[0]->getItemsNum(); // 9 is for 'skip turn'
@@ -192,7 +192,7 @@
}
QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Weapons"), QMessageBox::tr("Really delete this weapon set?"), QMessageBox::Ok | QMessageBox::Cancel);
-
+
if (reallyDelete.exec() == QMessageBox::Ok) {
wconf->remove(curWeaponsName);
emit weaponsDeleted();
--- a/QTfrontend/selectWeapon.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/selectWeapon.h Thu Sep 10 15:30:11 2009 +0000
@@ -45,7 +45,7 @@
class SelWeaponWidget : public QFrame
{
Q_OBJECT
-
+
public:
SelWeaponWidget(int numItems, QWidget* parent=0);
QString getWeaponsString(const QString& name) const;
--- a/QTfrontend/statsPage.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/statsPage.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -76,7 +76,7 @@
QPainterPath path;
if (hps.size())
path.moveTo(0, hps[0]);
-
+
for(int t = 1; t < hps.size(); ++t)
path.lineTo(t, hps[t]);
--- a/QTfrontend/statsPage.h Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/statsPage.h Thu Sep 10 15:30:11 2009 +0000
@@ -50,7 +50,7 @@
void GameStats(char type, const QString & info);
void clear();
void renderStats();
-
+
private:
void AddStatText(const QString & msg);
--- a/QTfrontend/teamselect.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/teamselect.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -228,7 +228,7 @@
setTitle(QGroupBox::tr("Playing teams"));
framePlaying = new FrameTeams();
frameDontPlaying = new FrameTeams();
-
+
QPalette p;
p.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
addScrArea(framePlaying, p.color(QPalette::Window).light(105), 250);
--- a/QTfrontend/teamselhelper.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/teamselhelper.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -68,7 +68,7 @@
colorButt->setMaximumWidth(26);
colorButt->setMinimumHeight(26);
colorButt->setGeometry(0, 0, 26, 26);
-
+
changeTeamColor();
connect(colorButt, SIGNAL(clicked()), this, SLOT(changeTeamColor()));
mainLayout.addWidget(colorButt);
@@ -88,7 +88,7 @@
if(m_team.isNetTeam()) {
butt->setEnabled(interactive);
}
-
+
colorButt->setEnabled(interactive);
phhoger->setEnabled(interactive);
}
--- a/QTfrontend/togglebutton.cpp Thu Sep 10 15:29:28 2009 +0000
+++ b/QTfrontend/togglebutton.cpp Thu Sep 10 15:30:11 2009 +0000
@@ -25,7 +25,7 @@
pbMain = new QPushButton(this);
pbMain->setCheckable(true);
-
+
QPixmap pm(":/res/btnDisabled.png");
QPainter * painter = new QPainter();