maemo support in pokerth_game.pro with a simple CONFIG switch
This commit is contained in:
doitux
+45
-21
@@ -218,27 +218,6 @@ HEADERS += src/engine/game.h \
|
|||||||
src/gui/qt/changecontentdialog.ui
|
src/gui/qt/changecontentdialog.ui
|
||||||
}
|
}
|
||||||
|
|
||||||
gui_800x480 {
|
|
||||||
FORMS += src/gui/qt/gui_800x480/gametable_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/aboutpokerth_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/connecttoserverdialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/newgamedialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/settingsdialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/selectavatardialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/startwindow_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/mymessagedialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/serverlistdialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui \
|
|
||||||
src/gui/qt/gui_800x480/changecontentdialog_800x480.ui
|
|
||||||
}
|
|
||||||
|
|
||||||
SOURCES += src/pokerth.cpp \
|
SOURCES += src/pokerth.cpp \
|
||||||
src/gui/qt/chattools/chattools.cpp \
|
src/gui/qt/chattools/chattools.cpp \
|
||||||
src/gui/qt/sound/sdlplayer.cpp \
|
src/gui/qt/sound/sdlplayer.cpp \
|
||||||
@@ -569,3 +548,48 @@ official_server {
|
|||||||
-lmysqlpp
|
-lmysqlpp
|
||||||
DEFINES += POKERTH_OFFICIAL_SERVER
|
DEFINES += POKERTH_OFFICIAL_SERVER
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gui_800x480 {
|
||||||
|
|
||||||
|
DEFINES += GUI_800x480
|
||||||
|
INCLUDEPATH += src/gui/qt/gui_800x480/
|
||||||
|
DEPENDPATH += src/gui/qt/gui_800x480/
|
||||||
|
FORMS += src/gui/qt/gui_800x480/startwindow_800x480.ui
|
||||||
|
# src/gui/qt/gui_800x480/gametable_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/aboutpokerth_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/connecttoserverdialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/newgamedialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/settingsdialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/selectavatardialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/mymessagedialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/serverlistdialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui \
|
||||||
|
# src/gui/qt/gui_800x480/changecontentdialog_800x480.ui
|
||||||
|
|
||||||
|
FORMS += src/gui/qt/gametable.ui \
|
||||||
|
src/gui/qt/aboutpokerth.ui \
|
||||||
|
src/gui/qt/connecttoserverdialog.ui \
|
||||||
|
src/gui/qt/createnetworkgamedialog.ui \
|
||||||
|
src/gui/qt/createinternetgamedialog.ui \
|
||||||
|
src/gui/qt/joinnetworkgamedialog.ui \
|
||||||
|
src/gui/qt/newgamedialog.ui \
|
||||||
|
src/gui/qt/settingsdialog.ui \
|
||||||
|
src/gui/qt/selectavatardialog.ui \
|
||||||
|
src/gui/qt/startnetworkgamedialog.ui \
|
||||||
|
src/gui/qt/changecompleteblindsdialog.ui \
|
||||||
|
src/gui/qt/gamelobbydialog.ui \
|
||||||
|
src/gui/qt/mymessagedialog.ui \
|
||||||
|
src/gui/qt/manualblindsorderdialog.ui \
|
||||||
|
src/gui/qt/serverlistdialog.ui \
|
||||||
|
src/gui/qt/internetgamelogindialog.ui \
|
||||||
|
src/gui/qt/changecontentdialog.ui
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@@ -20,7 +20,13 @@
|
|||||||
|
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
#ifdef GUI_800x480
|
||||||
|
#include "ui_startwindow_800x480.h"
|
||||||
|
#else
|
||||||
#include "ui_startwindow.h"
|
#include "ui_startwindow.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "game_defs.h"
|
#include "game_defs.h"
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
@@ -47,126 +53,126 @@ class internetGameLoginDialogImpl;
|
|||||||
|
|
||||||
class startWindowImpl: public QMainWindow, public Ui::startWindow
|
class startWindowImpl: public QMainWindow, public Ui::startWindow
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
startWindowImpl(ConfigFile *c =0);
|
startWindowImpl(ConfigFile *c =0);
|
||||||
~startWindowImpl();
|
~startWindowImpl();
|
||||||
|
|
||||||
void setSession(boost::shared_ptr<Session> session) {
|
void setSession(boost::shared_ptr<Session> session) {
|
||||||
mySession = session;
|
mySession = session;
|
||||||
}
|
}
|
||||||
boost::shared_ptr<Session> getSession() {
|
boost::shared_ptr<Session> getSession() {
|
||||||
assert(mySession.get());
|
assert(mySession.get());
|
||||||
return mySession;
|
return mySession;
|
||||||
}
|
}
|
||||||
boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const {
|
boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const {
|
||||||
return myServerGuiInterface;
|
return myServerGuiInterface;
|
||||||
}
|
}
|
||||||
connectToServerDialogImpl* getMyConnectToServerDialog() const {
|
connectToServerDialogImpl* getMyConnectToServerDialog() const {
|
||||||
return myConnectToServerDialog;
|
return myConnectToServerDialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
// void keyPressEvent( QKeyEvent *);
|
// void keyPressEvent( QKeyEvent *);
|
||||||
bool eventFilter(QObject *obj, QEvent *event);
|
bool eventFilter(QObject *obj, QEvent *event);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void signalShowClientDialog();
|
void signalShowClientDialog();
|
||||||
|
|
||||||
void signalNetClientConnect(int actionID);
|
void signalNetClientConnect(int actionID);
|
||||||
void signalNetClientServerListShow();
|
void signalNetClientServerListShow();
|
||||||
void signalNetClientServerListClear();
|
void signalNetClientServerListClear();
|
||||||
void signalNetClientServerListAdd(unsigned serverId);
|
void signalNetClientServerListAdd(unsigned serverId);
|
||||||
void signalNetClientLoginShow();
|
void signalNetClientLoginShow();
|
||||||
void signalNetClientRejoinPossible(unsigned gameId);
|
void signalNetClientRejoinPossible(unsigned gameId);
|
||||||
void signalNetClientGameInfo(int actionID);
|
void signalNetClientGameInfo(int actionID);
|
||||||
void signalNetClientError(int errorID, int osErrorID);
|
void signalNetClientError(int errorID, int osErrorID);
|
||||||
void signalNetClientNotification(int notificationId);
|
void signalNetClientNotification(int notificationId);
|
||||||
void signalNetClientStatsUpdate(ServerStats stats);
|
void signalNetClientStatsUpdate(ServerStats stats);
|
||||||
void signalNetClientShowTimeoutDialog(int, unsigned);
|
void signalNetClientShowTimeoutDialog(int, unsigned);
|
||||||
void signalNetClientRemovedFromGame(int notificationId);
|
void signalNetClientRemovedFromGame(int notificationId);
|
||||||
void signalNetServerError(int errorID, int osErrorID);
|
void signalNetServerError(int errorID, int osErrorID);
|
||||||
void signalNetClientSelfJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
void signalNetClientSelfJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
||||||
void signalNetClientPlayerJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
void signalNetClientPlayerJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
||||||
void signalNetClientPlayerChanged(unsigned playerId, QString newPlayerName);
|
void signalNetClientPlayerChanged(unsigned playerId, QString newPlayerName);
|
||||||
void signalNetClientPlayerLeft(unsigned playerId, QString playerName);
|
void signalNetClientPlayerLeft(unsigned playerId, QString playerName);
|
||||||
void signalNetClientNewGameAdmin(unsigned playerId, QString playerName);
|
void signalNetClientNewGameAdmin(unsigned playerId, QString playerName);
|
||||||
void signalNetClientGameListNew(unsigned gameId);
|
void signalNetClientGameListNew(unsigned gameId);
|
||||||
void signalNetClientGameListRemove(unsigned gameId);
|
void signalNetClientGameListRemove(unsigned gameId);
|
||||||
void signalNetClientGameListUpdateMode(unsigned gameId, int mode);
|
void signalNetClientGameListUpdateMode(unsigned gameId, int mode);
|
||||||
void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId);
|
void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId);
|
||||||
void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId);
|
void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId);
|
||||||
void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
|
void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
|
||||||
void signalNetClientGameStart(boost::shared_ptr<Game> game);
|
void signalNetClientGameStart(boost::shared_ptr<Game> game);
|
||||||
void signalNetClientGameChatMsg(QString nickName, QString msg);
|
void signalNetClientGameChatMsg(QString nickName, QString msg);
|
||||||
void signalNetClientLobbyChatMsg(QString nickName, QString msg);
|
void signalNetClientLobbyChatMsg(QString nickName, QString msg);
|
||||||
void signalNetClientPrivateChatMsg(QString nickName, QString msg);
|
void signalNetClientPrivateChatMsg(QString nickName, QString msg);
|
||||||
void signalNetClientMsgBox(QString msg);
|
void signalNetClientMsgBox(QString msg);
|
||||||
void signalNetClientMsgBox(unsigned msgId);
|
void signalNetClientMsgBox(unsigned msgId);
|
||||||
|
|
||||||
void signalLobbyPlayerJoined(unsigned playerId, QString nickName);
|
void signalLobbyPlayerJoined(unsigned playerId, QString nickName);
|
||||||
void signalLobbyPlayerKicked(QString nickName, QString byWhom, QString reason);
|
void signalLobbyPlayerKicked(QString nickName, QString byWhom, QString reason);
|
||||||
void signalLobbyPlayerLeft(unsigned playerId);
|
void signalLobbyPlayerLeft(unsigned playerId);
|
||||||
|
|
||||||
void signalSelfGameInvitation(unsigned gameId, unsigned playerIdFrom);
|
void signalSelfGameInvitation(unsigned gameId, unsigned playerIdFrom);
|
||||||
void signalPlayerGameInvitation(unsigned gameId, unsigned playerIdWho, unsigned playerIdFrom);
|
void signalPlayerGameInvitation(unsigned gameId, unsigned playerIdWho, unsigned playerIdFrom);
|
||||||
void signalRejectedGameInvitation(unsigned gameId, unsigned playerIdWho, DenyGameInvitationReason reason);
|
void signalRejectedGameInvitation(unsigned gameId, unsigned playerIdWho, DenyGameInvitationReason reason);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
void callAboutPokerthDialog();
|
void callAboutPokerthDialog();
|
||||||
void callSettingsDialog();
|
void callSettingsDialog();
|
||||||
void callNewGameDialog();
|
void callNewGameDialog();
|
||||||
void callGameLobbyDialog();
|
void callGameLobbyDialog();
|
||||||
void callCreateNetworkGameDialog();
|
void callCreateNetworkGameDialog();
|
||||||
void callJoinNetworkGameDialog();
|
void callJoinNetworkGameDialog();
|
||||||
void showLobbyDialog();
|
void showLobbyDialog();
|
||||||
void callInternetGameLoginDialog();
|
void callInternetGameLoginDialog();
|
||||||
void callRejoinPossibleDialog(unsigned);
|
void callRejoinPossibleDialog(unsigned);
|
||||||
void joinGameLobby();
|
void joinGameLobby();
|
||||||
void showClientDialog();
|
void showClientDialog();
|
||||||
void showNetworkStartDialog();
|
void showNetworkStartDialog();
|
||||||
|
|
||||||
void startNewLocalGame(newGameDialogImpl* =0);
|
void startNewLocalGame(newGameDialogImpl* =0);
|
||||||
|
|
||||||
void showTimeoutDialog(int msgID, unsigned duration);
|
void showTimeoutDialog(int msgID, unsigned duration);
|
||||||
void hideTimeoutDialog();
|
void hideTimeoutDialog();
|
||||||
|
|
||||||
void networkError(int, int);
|
void networkError(int, int);
|
||||||
void networkNotification(int);
|
void networkNotification(int);
|
||||||
void networkMessage(QString);
|
void networkMessage(QString);
|
||||||
void networkMessage(unsigned);
|
void networkMessage(unsigned);
|
||||||
|
|
||||||
void networkStart(boost::shared_ptr<Game> game);
|
void networkStart(boost::shared_ptr<Game> game);
|
||||||
QStringList getPlayerNicksList();
|
QStringList getPlayerNicksList();
|
||||||
|
|
||||||
QString checkForFirstStartAfterUpdated();
|
QString checkForFirstStartAfterUpdated();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ConfigFile *myConfig;
|
ConfigFile *myConfig;
|
||||||
|
|
||||||
boost::shared_ptr<GuiInterface> myGuiInterface;
|
boost::shared_ptr<GuiInterface> myGuiInterface;
|
||||||
boost::shared_ptr<Session> mySession;
|
boost::shared_ptr<Session> mySession;
|
||||||
boost::shared_ptr<GuiInterface> myServerGuiInterface;
|
boost::shared_ptr<GuiInterface> myServerGuiInterface;
|
||||||
|
|
||||||
// Dialogs
|
// Dialogs
|
||||||
aboutPokerthImpl *myAboutPokerthDialog;
|
aboutPokerthImpl *myAboutPokerthDialog;
|
||||||
newGameDialogImpl *myNewGameDialog;
|
newGameDialogImpl *myNewGameDialog;
|
||||||
settingsDialogImpl *mySettingsDialog;
|
settingsDialogImpl *mySettingsDialog;
|
||||||
selectAvatarDialogImpl *mySelectAvatarDialog;
|
selectAvatarDialogImpl *mySelectAvatarDialog;
|
||||||
joinNetworkGameDialogImpl *myJoinNetworkGameDialog;
|
joinNetworkGameDialogImpl *myJoinNetworkGameDialog;
|
||||||
connectToServerDialogImpl *myConnectToServerDialog;
|
connectToServerDialogImpl *myConnectToServerDialog;
|
||||||
startNetworkGameDialogImpl *myStartNetworkGameDialog;
|
startNetworkGameDialogImpl *myStartNetworkGameDialog;
|
||||||
createNetworkGameDialogImpl *myCreateNetworkGameDialog;
|
createNetworkGameDialogImpl *myCreateNetworkGameDialog;
|
||||||
gameLobbyDialogImpl *myGameLobbyDialog;
|
gameLobbyDialogImpl *myGameLobbyDialog;
|
||||||
timeoutMsgBoxImpl *myTimeoutDialog;
|
timeoutMsgBoxImpl *myTimeoutDialog;
|
||||||
startWindowImpl *myStartWindow;
|
startWindowImpl *myStartWindow;
|
||||||
serverListDialogImpl *myServerListDialog;
|
serverListDialogImpl *myServerListDialog;
|
||||||
internetGameLoginDialogImpl *myInternetGameLoginDialog;
|
internetGameLoginDialogImpl *myInternetGameLoginDialog;
|
||||||
|
|
||||||
QMessageBox msgBoxOutdatedVersion;
|
QMessageBox msgBoxOutdatedVersion;
|
||||||
bool msgBoxOutdatedVersionActive;
|
bool msgBoxOutdatedVersionActive;
|
||||||
|
|
||||||
friend class GuiWrapper;
|
friend class GuiWrapper;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user