From 755c71aa3b3bdc6a02b6ed3c68d4090b901e757b Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 22 Dec 2012 13:37:21 +0100 Subject: [PATCH 1/4] Changelog fixes. --- ChangeLog | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f34659d1..6f83485a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,20 +1,21 @@ 2012-12-22 version 1.0-beta1 -- Support for bigger android screen resolutions enhancement(#160) -- Android sound support enhancement (#156) -- Online log file analyse tool (#146) -- game name in window title enhancement (#155) -- new card deck version for bottom action label possibility enhancement (#154) -- Emoticons for the chat enhancement (#153) -- Show only one game in log preview enhancement (#145) -- Extra column in lobby game list for timeouts enhancement (#140) -- Update flags enhancement (#137) -- Enable Activate the "accidentally call after big raise" blocker by default enhancement (#131) -- Server refactoring for libprotobuf usage which basically enables html5 clients +- Support for higher android screen resolutions (enhancement #160) +- Android sound support (enhancement #156) +- Online log file analysis tool (enhancement #146) +- Game name in window title (enhancement #155) +- New card deck version which supports changes of the action label position (enhancement #154) +- Emoticons for the chat (enhancement #153) +- Show only one game in the log preview (enhancement #145) +- Extra column in lobby game list for timeouts (enhancement #140) +- Updated country flags (enhancement #137) +- Enable activating the "accidentally call after big raise" blocker by default (enhancement #131) +- Server refactoring using google protocol buffers which basically enables use of html5 clients - Chatbot whitelist for poker expressions -- BUGFIX: Rich AI players raise although opponents are all-in bug (#4) -- BUGFIX: In rare case, winner doesn't win, money disappears (#3) -- BUGFIX: Chip Miscalculation bug (#152) -- BUGFIX: IPv6 setting grayed out bug (#148) +- BUGFIX: Rich AI players raise although opponents are all-in (bug #4) +- BUGFIX: In rare case, winner doesn't win, money disappears (bug #3) +- BUGFIX: Chip Miscalculation fixed (bug #152) +- BUGFIX: IPv6 settings are now correctly grayed out (bug #148) +- BUGFIX: Fixing rejoin after synchronization error (bug #147) 2012-06-21 version 0.9.5 - First experimental Android release (#80) From c879e3aed827f2786de40c986b348c32cc021411 Mon Sep 17 00:00:00 2001 From: floty Date: Sat, 22 Dec 2012 13:48:04 +0100 Subject: [PATCH 2/4] codes for handling error file upload (#146) --- src/game_defs.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/game_defs.h b/src/game_defs.h index 8efa04cd..026d30db 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -103,6 +103,19 @@ enum PlayerActionLog { LOG_ACTION_JOIN // has joined the game }; +enum LogUploadErrorCode { + ERROR_NO_FILE = 1, + ERROR_OPEN_DB = 2, + ERROR_MAX_NUM_TOTAL = 3, + ERROR_MAX_NUM_IP = 4, + ERROR_FILE_SIZE = 5, + ERROR_FILE_EXT = 6, + ERROR_FILE_HEAD = 7, + ERROR_ID = 8, + ERROR_FILE_MOVE = 9, + ERROR_INSERT_DB = 10 +}; + enum DenyKickPlayerReason { KICK_DENIED_INVALID_STATE = 0, KICK_DENIED_TOO_FEW_PLAYERS, From 6d904100dc13b113e4ada50d0a1feb4d6197a169 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 22 Dec 2012 17:57:00 +0100 Subject: [PATCH 3/4] Fixing compiler warnings and cppcheck issues. --- .../changecompleteblindsdialogimpl.cpp | 2 +- src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp | 2 +- .../createinternetgamedialog/createinternetgamedialogimpl.cpp | 2 +- .../qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp | 2 +- .../qt/internetgamelogindialog/internetgamelogindialogimpl.cpp | 2 +- src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp index dc48768c..417f5b0d 100644 --- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp +++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp @@ -97,9 +97,9 @@ void changeCompleteBlindsDialogImpl::sortBlindsList() bool changeCompleteBlindsDialogImpl::eventFilter(QObject *obj, QEvent *event) { +#ifdef ANDROID QKeyEvent *keyEvent = static_cast(event); -#ifdef ANDROID //androi changes for return key behavior (hopefully useless from necessitas beta2) if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { if(spinBox_afterThisAlwaysRaiseValue->hasFocus()) { diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp index 868126d0..5544ee38 100644 --- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp +++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp @@ -113,9 +113,9 @@ void changeContentDialogImpl::saveContent() bool changeContentDialogImpl::eventFilter(QObject *obj, QEvent *event) { +#ifdef ANDROID QKeyEvent *keyEvent = static_cast(event); -#ifdef ANDROID //androi changes for return key behavior (hopefully useless from necessitas beta2) if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { if(lineEdit->hasFocus()) { diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp index 251e4540..60d87147 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp @@ -235,9 +235,9 @@ void createInternetGameDialogImpl::gameTypeChanged() bool createInternetGameDialogImpl::eventFilter(QObject *obj, QEvent *event) { +#ifdef ANDROID QKeyEvent *keyEvent = static_cast(event); -#ifdef ANDROID //androi changes for return key behavior (hopefully useless from necessitas beta2) if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { if(spinBox_startCash->hasFocus()) { diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp index b48f589f..80f6e10c 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp @@ -132,9 +132,9 @@ void createNetworkGameDialogImpl::callChangeBlindsDialog(bool show) bool createNetworkGameDialogImpl::eventFilter(QObject *obj, QEvent *event) { +#ifdef ANDROID QKeyEvent *keyEvent = static_cast(event); -#ifdef ANDROID //androi changes for return key behavior (hopefully useless from necessitas beta2) if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { if(spinBox_startCash ->hasFocus()) { diff --git a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp index 1c5b40f8..2caa4899 100644 --- a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp +++ b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp @@ -152,9 +152,9 @@ void internetGameLoginDialogImpl::okButtonCheck() bool internetGameLoginDialogImpl::eventFilter(QObject *obj, QEvent *event) { +#ifdef ANDROID QKeyEvent *keyEvent = static_cast(event); -#ifdef ANDROID //androi changes for return key behavior (hopefully useless from necessitas beta2) if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { if(lineEdit_username->hasFocus()) { diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp index d2b13143..e258fe4b 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp @@ -84,9 +84,9 @@ void newGameDialogImpl::callChangeBlindsDialog(bool show) bool newGameDialogImpl::eventFilter(QObject *obj, QEvent *event) { +#ifdef ANDROID QKeyEvent *keyEvent = static_cast(event); -#ifdef ANDROID //androi changes for return key behavior (hopefully useless from necessitas beta2) if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { if(spinBox_gameSpeed->hasFocus()) { From fbcd47cb37b2691806958aeff3b790d99a159f54 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sat, 22 Dec 2012 18:09:33 +0100 Subject: [PATCH 4/4] Fixing mac build. --- pokerth_game.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/pokerth_game.pro b/pokerth_game.pro index a6bfdc48..6f0af10d 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -578,6 +578,7 @@ mac { -lssl \ -lsqlite3 \ -ltinyxml \ + -lprotobuf \ -lz \ -framework \ Carbon