Merge remote-tracking branch 'origin/master'

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)

pokerth_game.pro

@@ -578,6 +578,7 @@ mac {
 		-lssl \
 		-lsqlite3 \
 		-ltinyxml \
+		-lprotobuf \
 		-lz \
 		-framework \
 		Carbon

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,

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<QKeyEvent*>(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()) {

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<QKeyEvent*>(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()) {

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<QKeyEvent*>(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()) {

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<QKeyEvent*>(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()) {

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<QKeyEvent*>(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()) {

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<QKeyEvent*>(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()) {