From a79aa7708d4a80f604bf7bc4c2acfc2d2fab1f6a Mon Sep 17 00:00:00 2001 From: doitux Date: Tue, 28 Aug 2007 01:10:41 +0000 Subject: [PATCH] --- data/gfx/logoChip3D.png | Bin 0 -> 13358 bytes pokerth_game.pro | 30 ++++++++++-------- src/gui/qt/mainwindow/mainwindowimpl.cpp | 1 + src/gui/qt/mainwindow/mainwindowimpl.h | 1 + .../qt/mainwindow/startsplash/startsplash.cpp | 3 +- .../qt/mainwindow/startsplash/startsplash.h | 2 ++ src/gui/qt/qttools/qthelper/qthelper.cpp | 29 ++++++++++++++++- src/gui/qt/qttools/qthelper/qthelper.h | 5 ++- src/gui/qt/resources.qrc | 1 - 9 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 data/gfx/logoChip3D.png diff --git a/data/gfx/logoChip3D.png b/data/gfx/logoChip3D.png new file mode 100644 index 0000000000000000000000000000000000000000..66161506c9734d6793e76a4a342e20a87b728cef GIT binary patch literal 13358 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 Ef}|47PXGV_ literal 0 HcmV?d00001 diff --git a/pokerth_game.pro b/pokerth_game.pro index a75ee2ef..3cef36e0 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -3,9 +3,12 @@ TEMPLATE = app CODECFORSRC = UTF-8 -INSTALLS += TARGET -TARGET.files += bin/* -TARGET.path = /usr/bin/ +CONFIG += qt thread embed_manifest_exe release +#CONFIG += qt thread embed_manifest_exe warn_on debug +UI_DIR = uics +MOC_DIR = mocs +OBJECTS_DIR = obj +TARGET = pokerth INCLUDEPATH += . \ src \ @@ -205,7 +208,6 @@ TRANSLATIONS = \ ts/pokerth_it.ts \ ts/pokerth_nl.ts - win32{ DEPENDPATH += src/net/win32/ src/core/win32 INCLUDEPATH += ../boost/ ../SDL/include ../SDL_mixer @@ -240,6 +242,17 @@ unix: !mac{ ## My release static libs #LIBS += -lcrypto -lSDL_mixer -lSDL -lmikmod + + #### INSTALL #### + + targets.files += pokerth + targets.path = /usr/bin/ + + data.path = /usr/share/pokerth/data + data.files = data/* + + INSTALLS += targets data + } mac{ @@ -273,12 +286,3 @@ mac{ INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers } - -#CONFIG += qt thread embed_manifest_exe release -CONFIG += qt thread embed_manifest_exe warn_on debug -UI_DIR = uics -TARGET = bin/pokerth -MOC_DIR = mocs -OBJECTS_DIR = obj -QT += -# QMAKE_CXXFLAGS_DEBUG += -g diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 3ec59bee..76e391db 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -42,6 +42,7 @@ #include "game.h" #include "session.h" #include "tools.h" +#include "qthelper.h" #include "configfile.h" #include "sdlplayer.h" diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 30b6365b..884e7de1 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -51,6 +51,7 @@ class startNetworkGameDialogImpl; class changeHumanPlayerNameDialogImpl; class gameLobbyDialogImpl; +class QtHelper; class QColor; class SDLPlayer; diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index 7c829eb3..deb17d7c 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -78,7 +78,8 @@ void StartSplash::paintEvent(QPaintEvent * event) { versionFont.setFamily("Nimbus Sans L"); versionFont.setPixelSize(12); - QPixmap logo(":/graphics/resources/graphics/logoChip3D.png"); +// std::cout << myQtHelper->getDataPath().toStdString() << endl; + QPixmap logo(myQtHelper->getDataPath()+"gfx/logoChip3D.png"); if(frameNo >= 52 && frameNo < 55) { diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.h b/src/gui/qt/mainwindow/startsplash/startsplash.h index 74780579..1114935e 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.h +++ b/src/gui/qt/mainwindow/startsplash/startsplash.h @@ -13,6 +13,7 @@ #define STARTSPLASH_H #include "mainwindowimpl.h" +#include "qthelper.h" #include #include @@ -38,6 +39,7 @@ public slots: private: mainWindowImpl *myW; + QtHelper *myQtHelper; }; diff --git a/src/gui/qt/qttools/qthelper/qthelper.cpp b/src/gui/qt/qttools/qthelper/qthelper.cpp index cf534744..273b65df 100644 --- a/src/gui/qt/qttools/qthelper/qthelper.cpp +++ b/src/gui/qt/qttools/qthelper/qthelper.cpp @@ -28,4 +28,31 @@ std::string QtHelper::stringToUtf8(const std::string &myString) { return myUtf8String; } -std::string QtHelper::getDefaultLanguage() { return QLocale::system().name().toStdString(); } \ No newline at end of file +std::string QtHelper::getDefaultLanguage() { return QLocale::system().name().toStdString(); } + +QString QtHelper::getDataPath() +{ + QString path = QCoreApplication::instance()->applicationDirPath(); + +#ifdef _WIN32 + path += "/data/"; +#else + #ifdef __APPLE__ + if (QRegExp("Contents/MacOS/?$").indexIn(path) != -1) { + // pointing into an macosx application bundle + path += "/../Resources/data/"; + } else { path += "/data/"; } + #else //Unix + if (QRegExp("pokerth/?$").indexIn(path) != -1) { + // there is an own application directory + path += "/data/"; + } else if (QRegExp("bin/?$").indexIn(path) != -1) { + // we are in a bin directory. e.g. /usr/bin + path += "/../share/pokerth/data/"; + } else { path += "/data/"; } + #endif +#endif + + + return QDir::cleanPath(path) + "/"; +} \ No newline at end of file diff --git a/src/gui/qt/qttools/qthelper/qthelper.h b/src/gui/qt/qttools/qthelper/qthelper.h index 644fbe0a..838b49bb 100644 --- a/src/gui/qt/qttools/qthelper/qthelper.h +++ b/src/gui/qt/qttools/qthelper/qthelper.h @@ -16,7 +16,8 @@ /** @author FThauer FHammer */ -class QtHelper{ +class QtHelper : public QObject{ +Q_OBJECT public: QtHelper(); @@ -25,6 +26,8 @@ public: std::string stringToUtf8(const std::string &); std::string getDefaultLanguage(); + QString getDataPath(); + }; #endif diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc index 032a6f61..9cd785a7 100755 --- a/src/gui/qt/resources.qrc +++ b/src/gui/qt/resources.qrc @@ -106,7 +106,6 @@ resources/graphics/bigblindPuck.png resources/graphics/fileopen16.png resources/graphics/handRanking_release.png - resources/graphics/logoChip3D.png resources/graphics/smallblindPuck.png resources/graphics/toolboxFrameBG.png resources/graphics/windowicon.png