# HG changeset patch # User unc0rr # Date 1156101732 0 # Node ID 6987769ced3da26e1f06d8dcddd6975bf2a6e99a # Parent 4911cf9c1924d7ba7aaa77cafd37e2017401ad12 Various small fixes diff -r 4911cf9c1924 -r 6987769ced3d CMakeLists.txt --- a/CMakeLists.txt Sun Aug 20 17:34:22 2006 +0000 +++ b/CMakeLists.txt Sun Aug 20 19:22:12 2006 +0000 @@ -27,6 +27,7 @@ set(CPACK_NSIS_URL_INFO_ABOUT "http://www.hedgewars.org/") set(CPACK_NSIS_CONTACT "unC0Rr@gmail.com") set(CPACK_NSIS_MODIFY_PATH ON) + set(CPACK_PACKAGE_EXECUTABLES "hedgewars" "hedgewars") else(WIN32 AND NOT UNIX) set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine") endif(WIN32 AND NOT UNIX) diff -r 4911cf9c1924 -r 6987769ced3d QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Sun Aug 20 17:34:22 2006 +0000 +++ b/QTfrontend/gamecfgwidget.cpp Sun Aug 20 19:22:12 2006 +0000 @@ -36,9 +36,6 @@ GameCFGWidget::GameCFGWidget(QWidget* parent) : QWidget(parent) { - QPalette newPalette = palette(); - newPalette.setColor(QPalette::Background, QColor(0, 128, 0)); - setPalette(newPalette); CB_mode_Forts = new QCheckBox(this); CB_mode_Forts->setText("Forts mode"); } diff -r 4911cf9c1924 -r 6987769ced3d QTfrontend/main.cpp --- a/QTfrontend/main.cpp Sun Aug 20 17:34:22 2006 +0000 +++ b/QTfrontend/main.cpp Sun Aug 20 19:22:12 2006 +0000 @@ -54,6 +54,8 @@ app.installTranslator(&Translator); QDir mydir("."); + mydir.cd("bin"); + bindir = new QDir(mydir); cfgdir = new QDir(); diff -r 4911cf9c1924 -r 6987769ced3d QTfrontend/main.cpp.in --- a/QTfrontend/main.cpp.in Sun Aug 20 17:34:22 2006 +0000 +++ b/QTfrontend/main.cpp.in Sun Aug 20 19:22:12 2006 +0000 @@ -54,6 +54,8 @@ app.installTranslator(&Translator); QDir mydir("${HEDGEWARS_BINDIR}"); + mydir.cd("bin"); + bindir = new QDir(mydir); cfgdir = new QDir(); diff -r 4911cf9c1924 -r 6987769ced3d QTfrontend/teamselhelper.cpp --- a/QTfrontend/teamselhelper.cpp Sun Aug 20 17:34:22 2006 +0000 +++ b/QTfrontend/teamselhelper.cpp Sun Aug 20 19:22:12 2006 +0000 @@ -2,6 +2,7 @@ #include #include +#include "hwconsts.h" void TeamLabel::teamButtonClicked() { @@ -12,7 +13,7 @@ QWidget(parent), mainLayout(this), m_team(team) { this->setMaximumHeight(40); - QPixmap* px=new QPixmap(QPixmap(QString("../share/hedgewars/Data/Forts/")+m_team.Fort+"L.png").scaled(40, 40)); + QPixmap* px=new QPixmap(QPixmap(datadir->absolutePath() + "/Forts/" + m_team.Fort + "L.png").scaled(40, 40)); QPushButton* butt=new QPushButton(*px, "", this); butt->setFlat(true);