# HG changeset patch
# User smxx
# Date 1268906122 0
# Node ID d6e19f35d98d14d8757671f327da846c3c142c12
# Parent 13ceaad4767e8af51257c890ceb7d402bbf1edb2
Frontend:
* Updated stylesheets and resized icons
* Forced Frontend's minimum size to 800x600
* Fixed some swapped texts in German locale
Graphics:
* Added two hats by DJ. LisT
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/chatwidget.cpp
--- a/QTfrontend/chatwidget.cpp Thu Mar 18 02:55:42 2010 +0000
+++ b/QTfrontend/chatwidget.cpp Thu Mar 18 09:55:22 2010 +0000
@@ -39,7 +39,7 @@
this->gameSettings = gameSettings;
this->sdli = sdli;
this->notify = notify;
- if(notify && gameSettings->value("audio/frontendsound", true).toBool()) {
+ if(notify && gameSettings->value("frontend/sound", true).toBool()) {
QDir tmpdir;
tmpdir.cd(datadir->absolutePath());
@@ -238,7 +238,7 @@
updateIcon(item);
chatNicks->addItem(item);
- if(notifyNick && notify && gameSettings->value("audio/frontendsound", true).toBool()) {
+ if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) {
Mix_PlayChannel(-1, sound[rand()%4], 0);
}
}
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/gameuiconfig.cpp
--- a/QTfrontend/gameuiconfig.cpp Thu Mar 18 02:55:42 2010 +0000
+++ b/QTfrontend/gameuiconfig.cpp Thu Mar 18 09:55:22 2010 +0000
@@ -36,26 +36,26 @@
connect(Form->ui.pageOptions->CBEnableFrontendMusic, SIGNAL(toggled(bool)), Form, SLOT(Music(bool)));
- //Form->resize(value("window/width", 640).toUInt(), value("window/height", 450).toUInt());
+ //Form->resize(value("frontend/width", 640).toUInt(), value("frontend/height", 450).toUInt());
resizeToConfigValues();
- Form->ui.pageOptions->WeaponTooltip->setChecked(value("misc/weaponTooltip", true).toBool());
+ Form->ui.pageOptions->WeaponTooltip->setChecked(value("misc/weaponTooltips", true).toBool());
int t = Form->ui.pageOptions->CBResolution->findText(value("video/resolution").toString());
Form->ui.pageOptions->CBResolution->setCurrentIndex((t < 0) ? 0 : t);
Form->ui.pageOptions->CBFullscreen->setChecked(value("video/fullscreen", false).toBool());
- bool ffscr=value("video/frontendfullscreen", false).toBool();
+ bool ffscr=value("frontend/fullscreen", false).toBool();
Form->ui.pageOptions->CBFrontendFullscreen->setChecked(ffscr);
Form->ui.pageOptions->CBReduceQuality->setChecked(value("video/reducequality", false).toBool());
Form->ui.pageOptions->CBFrontendEffects->setChecked(frontendEffects);
Form->ui.pageOptions->CBEnableSound->setChecked(value("audio/sound", true).toBool());
- Form->ui.pageOptions->CBEnableFrontendSound->setChecked(value("audio/frontendsound", true).toBool());
+ Form->ui.pageOptions->CBEnableFrontendSound->setChecked(value("frontend/sound", true).toBool());
#ifdef _WIN32
// Form->ui.pageOptions->CBHardwareSound->setChecked(value("audio/hardware", false).toBool());
#endif
Form->ui.pageOptions->CBEnableMusic->setChecked(value("audio/music", true).toBool());
- Form->ui.pageOptions->CBEnableFrontendMusic->setChecked(value("audio/frontendmusic", true).toBool());
+ Form->ui.pageOptions->CBEnableFrontendMusic->setChecked(value("frontend/music", true).toBool());
Form->ui.pageOptions->volumeBox->setValue(value("audio/volume", 100).toUInt());
QString netNick = value("net/nick", "").toString();
@@ -76,7 +76,7 @@
Form->ui.pageNetServer->sbPort->setValue(value("net/serverport", 46631).toUInt());
Form->ui.pageOptions->CBShowFPS->setChecked(value("fps/show", false).toBool());
- Form->ui.pageOptions->fpsedit->setValue(value("fps/interval", 27).toUInt());
+ Form->ui.pageOptions->fpsedit->setValue(value("fps/limit", 27).toUInt());
Form->ui.pageOptions->CBAltDamage->setChecked(value("misc/altdamage", false).toBool());
Form->ui.pageOptions->CBNameWithDate->setChecked(value("misc/appendTimeToRecords", false).toBool());
@@ -105,7 +105,7 @@
void GameUIConfig::resizeToConfigValues()
{
- Form->resize(value("window/width", 720).toUInt(), value("window/height", 450).toUInt());
+ Form->resize(value("frontend/width", 800).toUInt(), value("frontend/height", 600).toUInt());
}
void GameUIConfig::SaveOptions()
@@ -115,27 +115,27 @@
setValue("video/reducequality", isReducedQuality());
- setValue("video/frontendeffects", isFrontendEffects());
+ setValue("frontend/effects", isFrontendEffects());
- setValue("misc/weaponTooltip", isWeaponTooltip());
+ setValue("misc/weaponTooltips", isWeaponTooltip());
bool ffscr = isFrontendFullscreen();
- setValue("video/frontendfullscreen", ffscr);
+ setValue("frontend/fullscreen", ffscr);
emit frontendFullscreen(ffscr);
if (!ffscr) {
- setValue("window/width", Form->width());
- setValue("window/height", Form->height());
+ setValue("frontend/width", Form->width());
+ setValue("frontend/height", Form->height());
} else {
//resizeToConfigValues(); // TODO: why this has been made?
}
setValue("audio/sound", isSoundEnabled());
- setValue("audio/frontendsound", isFrontendSoundEnabled());
+ setValue("frontend/sound", isFrontendSoundEnabled());
#ifdef _WIN32
// setValue("audio/hardware", isSoundHardware());
#endif
setValue("audio/music", isMusicEnabled());
- setValue("audio/frontendmusic", isFrontendMusicEnabled());
+ setValue("frontend/music", isFrontendMusicEnabled());
setValue("audio/volume", Form->ui.pageOptions->volumeBox->value());
setValue("net/nick", netNick());
@@ -145,7 +145,7 @@
setValue("net/serverport", Form->ui.pageNetServer->sbPort->value());
setValue("fps/show", isShowFPSEnabled());
- setValue("fps/interval", Form->ui.pageOptions->fpsedit->value());
+ setValue("fps/limit", Form->ui.pageOptions->fpsedit->value());
setValue("misc/altdamage", isAltDamageEnabled());
setValue("misc/appendTimeToRecords", appendDateTimeToRecordName());
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp Thu Mar 18 02:55:42 2010 +0000
+++ b/QTfrontend/hwform.cpp Thu Mar 18 09:55:22 2010 +0000
@@ -78,10 +78,11 @@
xfire_init();
#endif
gameSettings = new QSettings(cfgdir->absolutePath() + "/hedgewars.ini", QSettings::IniFormat);
- frontendEffects = gameSettings->value("video/frontendeffects", true).toBool();
+ frontendEffects = gameSettings->value("frontend/effects", true).toBool();
playerHash = QString(QCryptographicHash::hash(gameSettings->value("net/nick","").toString().toLatin1(), QCryptographicHash::Md5).toHex());
ui.setupUi(this);
+ setMinimumSize(800, 600);
CustomizePalettes();
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/igbox.cpp
--- a/QTfrontend/igbox.cpp Thu Mar 18 02:55:42 2010 +0000
+++ b/QTfrontend/igbox.cpp Thu Mar 18 09:55:22 2010 +0000
@@ -27,8 +27,8 @@
{
// Has issues with border-radius on children
// setAttribute(Qt::WA_PaintOnScreen, true);
- titleLeftPadding = 82;
- contentTopPadding = 22;
+ titleLeftPadding = 49;
+ contentTopPadding = 15;
}
void IconedGroupBox::setIcon(const QIcon & icon)
@@ -44,7 +44,7 @@
"subcontrol-origin: margin;"
"subcontrol-position: top left;"
"padding-left: %2px;"
- "padding-top: 25px;"
+ "padding-top: %1px;"
"text-align: left;"
"}"
).arg(contentTopPadding).arg(titleLeftPadding)
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/main.cpp
--- a/QTfrontend/main.cpp Thu Mar 18 02:55:42 2010 +0000
+++ b/QTfrontend/main.cpp Thu Mar 18 09:55:22 2010 +0000
@@ -121,14 +121,14 @@
"QLineEdit, QListWidget,QTableView, QTextBrowser, "
"QSpinBox, QToolBox { "
- "border-radius: 12px;"
+ "border-radius: 10px;"
"}"
"QLineEdit, QLabel, QHeaderView, QListWidget, QTableView, "
"QSpinBox, QToolBox::tab, QComboBox, QComboBox QAbstractItemView, "
"IconedGroupBox, .QGroupBox, GameCFGWidget, TeamSelWidget, "
- "SelWeaponWidget, QCheckBox, QRadioButton {"
- "font: bold 14px;"
+ "SelWeaponWidget, QCheckBox, QRadioButton, QPushButton {"
+ "font: bold 13px;"
"}"
"SelWeaponWidget QTabWidget::pane, SelWeaponWidget QTabBar::tab:selected {"
"background-position: bottom center;"
@@ -154,7 +154,7 @@
"QPushButton {"
- "border-radius: 10px;"
+ "border-radius: 8px;"
"background-origin: margin;"
"background-position: top left;"
"background-color: rgba(18, 42, 5, 70%);"
@@ -206,7 +206,7 @@
"}"
"QComboBox {"
- "border-radius: 15px;"
+ "border-radius: 10px;"
"padding: 3px;"
"}"
"QComboBox:pressed{"
@@ -277,6 +277,7 @@
"QToolTip{"
"background-color: #0d0544;"
+ "border: 1px solid #ffcc00;"
"}"
":disabled{"
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/res/graphicsicon.png
Binary file QTfrontend/res/graphicsicon.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/res/graphicsicon2.png
Binary file QTfrontend/res/graphicsicon2.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/res/miscicon.png
Binary file QTfrontend/res/miscicon.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/res/teamicon.png
Binary file QTfrontend/res/teamicon.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/res/teamicon2.png
Binary file QTfrontend/res/teamicon2.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d QTfrontend/res/weaponsicon.png
Binary file QTfrontend/res/weaponsicon.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc Thu Mar 18 02:55:42 2010 +0000
+++ b/hedgewars/GSHandlers.inc Thu Mar 18 09:55:22 2010 +0000
@@ -166,7 +166,6 @@
////////////////////////////////////////////////////////////////////////////////
procedure doStepFallingGear(Gear: PGear);
var isFalling: boolean;
- tmp: QWord;
tdX, tdY: hwFloat;
collV, collH: LongInt;
begin
diff -r 13ceaad4767e -r d6e19f35d98d share/hedgewars/Data/Graphics/Hats/angel.png
Binary file share/hedgewars/Data/Graphics/Hats/angel.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d share/hedgewars/Data/Graphics/Hats/stormcloud.png
Binary file share/hedgewars/Data/Graphics/Hats/stormcloud.png has changed
diff -r 13ceaad4767e -r d6e19f35d98d share/hedgewars/Data/Locale/hedgewars_de.qm
Binary file share/hedgewars/Data/Locale/hedgewars_de.qm has changed
diff -r 13ceaad4767e -r d6e19f35d98d share/hedgewars/Data/Locale/hedgewars_de.ts
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts Thu Mar 18 02:55:42 2010 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Thu Mar 18 09:55:22 2010 +0000
@@ -625,7 +625,7 @@
Enable sound
- Sound an
+ Klänge im Spiel
Show FPS
@@ -637,7 +637,7 @@
Enable music
- Musik an
+ Musik im Spiel
Frontend fullscreen
@@ -661,19 +661,19 @@
Show ammo menu tooltips
- Hilfefenster für Waffen anzeigen
+ Kurzinfos für Waffen anzeigen
Enable frontend sounds
- Musik an (Frontend)
+ Klänge im Frontend
Enable frontend music
- Sounds an (Frontend)
+ Musik im Frontend
Frontend effects
- Frontendeffekte
+ Animationen im Frontend
@@ -818,7 +818,7 @@
Damage Modifier
- Prozentualer Schaden
+ Prozentualer Schaden
Turn Time