From ec721b9ea5b931774a5652de60933945945b19d9 Mon Sep 17 00:00:00 2001 From: doitux Date: Mon, 17 Oct 2011 13:33:16 +0000 Subject: [PATCH] maemo support in pokerth_game.pro with a simple CONFIG switch --- pokerth_game.pro | 66 +++++--- src/gui/qt/startwindow/startwindowimpl.h | 202 ++++++++++++----------- 2 files changed, 149 insertions(+), 119 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index 8ee6ea75..faee134c 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -218,27 +218,6 @@ HEADERS += src/engine/game.h \ 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 \ src/gui/qt/chattools/chattools.cpp \ src/gui/qt/sound/sdlplayer.cpp \ @@ -569,3 +548,48 @@ official_server { -lmysqlpp 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 + + +} diff --git a/src/gui/qt/startwindow/startwindowimpl.h b/src/gui/qt/startwindow/startwindowimpl.h index 7d1a345a..ce2d4567 100644 --- a/src/gui/qt/startwindow/startwindowimpl.h +++ b/src/gui/qt/startwindow/startwindowimpl.h @@ -20,7 +20,13 @@ #include #include + +#ifdef GUI_800x480 +#include "ui_startwindow_800x480.h" +#else #include "ui_startwindow.h" +#endif + #include "game_defs.h" #include @@ -47,126 +53,126 @@ class internetGameLoginDialogImpl; class startWindowImpl: public QMainWindow, public Ui::startWindow { - Q_OBJECT + Q_OBJECT public: - startWindowImpl(ConfigFile *c =0); - ~startWindowImpl(); + startWindowImpl(ConfigFile *c =0); + ~startWindowImpl(); - void setSession(boost::shared_ptr session) { - mySession = session; - } - boost::shared_ptr getSession() { - assert(mySession.get()); - return mySession; - } - boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const { - return myServerGuiInterface; - } - connectToServerDialogImpl* getMyConnectToServerDialog() const { - return myConnectToServerDialog; - } + void setSession(boost::shared_ptr session) { + mySession = session; + } + boost::shared_ptr getSession() { + assert(mySession.get()); + return mySession; + } + boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const { + return myServerGuiInterface; + } + connectToServerDialogImpl* getMyConnectToServerDialog() const { + return myConnectToServerDialog; + } - // void keyPressEvent( QKeyEvent *); - bool eventFilter(QObject *obj, QEvent *event); + // void keyPressEvent( QKeyEvent *); + bool eventFilter(QObject *obj, QEvent *event); signals: - void signalShowClientDialog(); + void signalShowClientDialog(); - void signalNetClientConnect(int actionID); - void signalNetClientServerListShow(); - void signalNetClientServerListClear(); - void signalNetClientServerListAdd(unsigned serverId); - void signalNetClientLoginShow(); - void signalNetClientRejoinPossible(unsigned gameId); - void signalNetClientGameInfo(int actionID); - void signalNetClientError(int errorID, int osErrorID); - void signalNetClientNotification(int notificationId); - void signalNetClientStatsUpdate(ServerStats stats); - void signalNetClientShowTimeoutDialog(int, unsigned); - void signalNetClientRemovedFromGame(int notificationId); - void signalNetServerError(int errorID, int osErrorID); - void signalNetClientSelfJoined(unsigned playerId, QString playerName, bool isGameAdmin); - void signalNetClientPlayerJoined(unsigned playerId, QString playerName, bool isGameAdmin); - void signalNetClientPlayerChanged(unsigned playerId, QString newPlayerName); - void signalNetClientPlayerLeft(unsigned playerId, QString playerName); - void signalNetClientNewGameAdmin(unsigned playerId, QString playerName); - void signalNetClientGameListNew(unsigned gameId); - void signalNetClientGameListRemove(unsigned gameId); - void signalNetClientGameListUpdateMode(unsigned gameId, int mode); - void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId); - void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId); - void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId); - void signalNetClientGameStart(boost::shared_ptr game); - void signalNetClientGameChatMsg(QString nickName, QString msg); - void signalNetClientLobbyChatMsg(QString nickName, QString msg); - void signalNetClientPrivateChatMsg(QString nickName, QString msg); - void signalNetClientMsgBox(QString msg); - void signalNetClientMsgBox(unsigned msgId); + void signalNetClientConnect(int actionID); + void signalNetClientServerListShow(); + void signalNetClientServerListClear(); + void signalNetClientServerListAdd(unsigned serverId); + void signalNetClientLoginShow(); + void signalNetClientRejoinPossible(unsigned gameId); + void signalNetClientGameInfo(int actionID); + void signalNetClientError(int errorID, int osErrorID); + void signalNetClientNotification(int notificationId); + void signalNetClientStatsUpdate(ServerStats stats); + void signalNetClientShowTimeoutDialog(int, unsigned); + void signalNetClientRemovedFromGame(int notificationId); + void signalNetServerError(int errorID, int osErrorID); + void signalNetClientSelfJoined(unsigned playerId, QString playerName, bool isGameAdmin); + void signalNetClientPlayerJoined(unsigned playerId, QString playerName, bool isGameAdmin); + void signalNetClientPlayerChanged(unsigned playerId, QString newPlayerName); + void signalNetClientPlayerLeft(unsigned playerId, QString playerName); + void signalNetClientNewGameAdmin(unsigned playerId, QString playerName); + void signalNetClientGameListNew(unsigned gameId); + void signalNetClientGameListRemove(unsigned gameId); + void signalNetClientGameListUpdateMode(unsigned gameId, int mode); + void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId); + void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId); + void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId); + void signalNetClientGameStart(boost::shared_ptr game); + void signalNetClientGameChatMsg(QString nickName, QString msg); + void signalNetClientLobbyChatMsg(QString nickName, QString msg); + void signalNetClientPrivateChatMsg(QString nickName, QString msg); + void signalNetClientMsgBox(QString msg); + void signalNetClientMsgBox(unsigned msgId); - void signalLobbyPlayerJoined(unsigned playerId, QString nickName); - void signalLobbyPlayerKicked(QString nickName, QString byWhom, QString reason); - void signalLobbyPlayerLeft(unsigned playerId); + void signalLobbyPlayerJoined(unsigned playerId, QString nickName); + void signalLobbyPlayerKicked(QString nickName, QString byWhom, QString reason); + void signalLobbyPlayerLeft(unsigned playerId); - void signalSelfGameInvitation(unsigned gameId, unsigned playerIdFrom); - void signalPlayerGameInvitation(unsigned gameId, unsigned playerIdWho, unsigned playerIdFrom); - void signalRejectedGameInvitation(unsigned gameId, unsigned playerIdWho, DenyGameInvitationReason reason); + void signalSelfGameInvitation(unsigned gameId, unsigned playerIdFrom); + void signalPlayerGameInvitation(unsigned gameId, unsigned playerIdWho, unsigned playerIdFrom); + void signalRejectedGameInvitation(unsigned gameId, unsigned playerIdWho, DenyGameInvitationReason reason); public slots: - void callAboutPokerthDialog(); - void callSettingsDialog(); - void callNewGameDialog(); - void callGameLobbyDialog(); - void callCreateNetworkGameDialog(); - void callJoinNetworkGameDialog(); - void showLobbyDialog(); - void callInternetGameLoginDialog(); - void callRejoinPossibleDialog(unsigned); - void joinGameLobby(); - void showClientDialog(); - void showNetworkStartDialog(); + void callAboutPokerthDialog(); + void callSettingsDialog(); + void callNewGameDialog(); + void callGameLobbyDialog(); + void callCreateNetworkGameDialog(); + void callJoinNetworkGameDialog(); + void showLobbyDialog(); + void callInternetGameLoginDialog(); + void callRejoinPossibleDialog(unsigned); + void joinGameLobby(); + void showClientDialog(); + void showNetworkStartDialog(); - void startNewLocalGame(newGameDialogImpl* =0); + void startNewLocalGame(newGameDialogImpl* =0); - void showTimeoutDialog(int msgID, unsigned duration); - void hideTimeoutDialog(); + void showTimeoutDialog(int msgID, unsigned duration); + void hideTimeoutDialog(); - void networkError(int, int); - void networkNotification(int); - void networkMessage(QString); - void networkMessage(unsigned); + void networkError(int, int); + void networkNotification(int); + void networkMessage(QString); + void networkMessage(unsigned); - void networkStart(boost::shared_ptr game); - QStringList getPlayerNicksList(); + void networkStart(boost::shared_ptr game); + QStringList getPlayerNicksList(); - QString checkForFirstStartAfterUpdated(); + QString checkForFirstStartAfterUpdated(); private: - ConfigFile *myConfig; + ConfigFile *myConfig; - boost::shared_ptr myGuiInterface; - boost::shared_ptr mySession; - boost::shared_ptr myServerGuiInterface; + boost::shared_ptr myGuiInterface; + boost::shared_ptr mySession; + boost::shared_ptr myServerGuiInterface; - // Dialogs - aboutPokerthImpl *myAboutPokerthDialog; - newGameDialogImpl *myNewGameDialog; - settingsDialogImpl *mySettingsDialog; - selectAvatarDialogImpl *mySelectAvatarDialog; - joinNetworkGameDialogImpl *myJoinNetworkGameDialog; - connectToServerDialogImpl *myConnectToServerDialog; - startNetworkGameDialogImpl *myStartNetworkGameDialog; - createNetworkGameDialogImpl *myCreateNetworkGameDialog; - gameLobbyDialogImpl *myGameLobbyDialog; - timeoutMsgBoxImpl *myTimeoutDialog; - startWindowImpl *myStartWindow; - serverListDialogImpl *myServerListDialog; - internetGameLoginDialogImpl *myInternetGameLoginDialog; + // Dialogs + aboutPokerthImpl *myAboutPokerthDialog; + newGameDialogImpl *myNewGameDialog; + settingsDialogImpl *mySettingsDialog; + selectAvatarDialogImpl *mySelectAvatarDialog; + joinNetworkGameDialogImpl *myJoinNetworkGameDialog; + connectToServerDialogImpl *myConnectToServerDialog; + startNetworkGameDialogImpl *myStartNetworkGameDialog; + createNetworkGameDialogImpl *myCreateNetworkGameDialog; + gameLobbyDialogImpl *myGameLobbyDialog; + timeoutMsgBoxImpl *myTimeoutDialog; + startWindowImpl *myStartWindow; + serverListDialogImpl *myServerListDialog; + internetGameLoginDialogImpl *myInternetGameLoginDialog; - QMessageBox msgBoxOutdatedVersion; - bool msgBoxOutdatedVersionActive; + QMessageBox msgBoxOutdatedVersion; + bool msgBoxOutdatedVersionActive; - friend class GuiWrapper; + friend class GuiWrapper; }; #endif