diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 015ffd71..e1b79f7f 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -212,7 +212,9 @@ void gameLobbyDialogImpl::exec() registeredUserMode(); } - +#ifdef ANDROID + this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); +#endif QDialog::exec(); waitStartGameMsgBoxTimer->stop(); diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 871c3a66..1baecec7 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -3164,8 +3164,6 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event ) #endif - //TESTING UNIT - // if (event->key() == Qt::Key_M) { showShowMyCardsButton(); } } void gameTableImpl::changePlayingMode() @@ -3220,7 +3218,11 @@ bool gameTableImpl::eventFilter(QObject *obj, QEvent *event) if (/*obj == lineEdit_ChatInput && lineEdit_ChatInput->text() != "" && */event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Tab) { myChat->nickAutoCompletition(); return true; - } else if (event->type() == QEvent::Close) { +// CURRENTLY not possible in Android :( --> } else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) { +// event->ignore(); +// closeGameTable(); +// return true; + } else if (event->type() == QEvent::Close) { event->ignore(); closeGameTable(); return true; diff --git a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui index 43c93dff..c53a41ba 100644 --- a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui +++ b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui @@ -16,12 +16,6 @@ 380 - - - 800 - 382 - - Internet Game Lobby @@ -439,7 +433,7 @@ p, li { white-space: pre-wrap; } Qt::CustomContextMenu - + QObject { font: 20px; } Qt::ScrollBarAlwaysOff diff --git a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui index 8ef25ff7..b0097a48 100755 --- a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui @@ -7,19 +7,19 @@ 0 0 800 - 350 + 424 + + + 0 + 0 + + 800 - 350 - - - - - 800 - 350 + 424 @@ -28,160 +28,158 @@ QObject {font: 20px} - - - + + + 30 + + + + + + + + 0 + 0 + + + + Number of players: + + + spinBox_quantityPlayers + + + + + + + 2 + + + 10 + + + 10 + + + + + + + + + + + Start Cash: + + + spinBox_startCash + + + + + + + QAbstractSpinBox::UpDownArrows + + + $ + + + 1000 + + + 1000000 + + + 50 + + + 2000 + + + + + + + - + Blinds - - - - Number of players: - - - spinBox_quantityPlayers - - - - - - - 2 - - - 10 - - - 10 - - - + + 1 + + + 9 + + + 1 + + + 0 + - + - Start Cash: - - - spinBox_startCash + Change blinds settings ... - - - - $ - - - 1000 - - - 1000000 - - - 50 - - - 2000 - - - - - - - Blinds - - - - 0 - - - - - Use saved blinds settings - - - true - - - - - - - Change blinds settings ... - - - - - - - - + + - Game Speed: + Use saved blinds settings - - spinBox_gameSpeed + + true - - - - 1 - - - 11 - - - 4 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + + + Game Speed: + + + spinBox_gameSpeed + + + + + + + 1 + + + 11 + + + 4 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + QObject {font: bold 20px} @@ -194,54 +192,12 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - spinBox_quantityPlayers spinBox_startCash - radioButton_useSavedBlindsSettings radioButton_changeBlindsSettings - spinBox_gameSpeed - buttonBox diff --git a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui index f51de26a..55fb6e34 100644 --- a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui @@ -16,15 +16,12 @@ 424 - - - 800 - 424 - - Settings + + QObject {font: 18px} + 0 @@ -48,9 +45,6 @@ 16777215 - - QObject { font: 16px } - 32 @@ -152,36 +146,14 @@ 0 - - QObject {font: 16px} - - - 2 - - - 0 - - - 0 - - - 0 + + 4 0 - - - QObject { font: bold 20px } - - - Interface - - - - @@ -218,7 +190,7 @@ - + @@ -284,7 +256,7 @@ - + Network / Internet Game @@ -310,9 +282,6 @@ - - QObject {font: 14px} - Switch keyboard focus to bet-input-field if it's your turn @@ -320,9 +289,6 @@ - - QObject {font: 14px} - Show country flag in the corner of avatar @@ -330,9 +296,6 @@ - - QObject {font: 14px} - Activate the "accidentally call after big raise" blocker @@ -341,49 +304,23 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - - QObject {font: 14px} - - 0 + 4 0 - - - QObject {font: bold 20px} - - - Style - - - - - 1 + 0 @@ -739,9 +676,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 16px} - Card Back @@ -817,14 +751,10 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:10pt; font-style:italic;">Note: Best quality with image ratio like </span><span style=" font-family:'Nimbus Sans L'; font-size:10pt; font-weight:600; font-style:italic;">width=48, height=76.</span></p></td></tr></table></body></html> + Note: Best quality with image ratio like width=48, height=76. + + + Qt::PlainText true @@ -866,36 +796,14 @@ p, li { white-space: pre-wrap; } - - QObject {font: 16px} - - - 2 - - - 0 - - - 0 - - - 0 + + 4 0 - - - QObject {font: bold 20px} - - - Sound - - - - Play sound effects @@ -1119,64 +1027,22 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 20 - 40 - - - - - - QObject {font: 16px} - - - 0 - - 2 + 4 - 0 + 4 - 0 + 4 0 - - - - QObject {font: bold 20px} - - - Local Game Settings - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1280,9 +1146,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Every: @@ -1293,9 +1156,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - 1 @@ -1309,9 +1169,6 @@ p, li { white-space: pre-wrap; } 0 - - QObject {font: 14px} - hands @@ -1319,9 +1176,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Every: @@ -1329,9 +1183,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - 1 @@ -1345,9 +1196,6 @@ p, li { white-space: pre-wrap; } 0 - - QObject {font: 14px} - minutes @@ -1386,9 +1234,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Always double blinds @@ -1399,9 +1244,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Manual blinds order: @@ -1412,9 +1254,6 @@ p, li { white-space: pre-wrap; } false - - QObject {font: 14px} - Edit ... @@ -1482,48 +1321,10 @@ p, li { white-space: pre-wrap; } - - QObject {font: 15px} - - - 0 + + 4 - - 2 - - - 0 - - - 0 - - - 0 - - - - - QObject {font: bold 20px} - - - Network Game Settings - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1642,9 +1443,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Every: @@ -1655,9 +1453,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - 1 @@ -1671,9 +1466,6 @@ p, li { white-space: pre-wrap; } 0 - - QObject {font: 14px} - hands @@ -1681,9 +1473,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Every: @@ -1691,9 +1480,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - 1 @@ -1707,9 +1493,6 @@ p, li { white-space: pre-wrap; } 0 - - QObject {font: 14px} - minutes @@ -1756,9 +1539,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Always double blinds @@ -1769,9 +1549,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Manual blinds order: @@ -1782,9 +1559,6 @@ p, li { white-space: pre-wrap; } false - - QObject {font: 14px} - Edit ... @@ -1860,20 +1634,20 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Network Server Settings + + 0 + + + 3 + - - QObject {font: 14px} - Server Port: @@ -1890,9 +1664,6 @@ p, li { white-space: pre-wrap; } 0 - - QObject {font: 14px} - 80 @@ -1908,9 +1679,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Use IPv6 @@ -1918,9 +1686,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> @@ -1931,9 +1696,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - Use SCTP @@ -1941,9 +1703,6 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> @@ -1958,36 +1717,14 @@ p, li { white-space: pre-wrap; } - - QObject {font: 16px} - - - 2 - - - 0 - - - 0 - - - 0 + + 4 0 - - - - QObject {font: bold 20px} - - - Internet Game Settings - - - - + 0 @@ -2176,15 +1913,11 @@ p, li { white-space: pre-wrap; } - - QObject {font: 14px} - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-style:italic;">Note: Default </span><span style=" font-size:12pt; font-weight:600; font-style:italic;">Game Settings</span><span style=" font-size:12pt; font-style:italic;"> like &quot;Maximum number of players&quot;, &quot;Start Cash&quot; and &quot;Small Blind&quot; will be used </span><span style=" font-size:12pt; font-weight:600; font-style:italic;">from Network Game Settings.</span></p></body></html> + Note: Default Game Settings like "Maximum number of players", "Start Cash" and "Small Blind" will be used from Network Game Settings. + + + Qt::PlainText true @@ -2347,139 +2080,86 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 20 - 40 - - - - true - - QObject {font: 16px} - - - - 2 - - - 0 - - - 0 - - - 0 - - - 0 + + + 4 - - - QObject {font: bold 20px} - - - Player Nicks/Avatars - - - - - + 0 - - + + + + + + Human Player: + + + Qt::PlainText + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + 12 + + + + + + + + 60 + 60 + + + + + 60 + 60 + + + + + + + + 50 + 50 + + + + + + + + - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Human Player:<br /><span style=" font-size:11pt; font-style:italic;">(This nick will also be used for the online game login)</span></p></body></html> - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 150 - 25 - - - - - 150 - 25 - - - - 12 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 60 - 60 - - - - - 60 - 60 - - - - - - - - 50 - 50 - + (This nick will also be used for the online game login) - + Computer Engine @@ -3699,68 +3379,30 @@ p, li { white-space: pre-wrap; } - + - - QObject {font: 14px} - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style="font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: Best avatar quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=50, height=50.</span></p></body></html> + Note: Best avatar quality with image ratio like width=50, height=50. + + + Qt::PlainText true - - - - Qt::Vertical - - - - 20 - 40 - - - - - - QObject {font: 14px} - - - 2 - - - 0 - - - 0 - - + 4 0 - - - QObject {font: bold 20px} - - - Log Messages - - - - Enable/Disable Logging @@ -3784,9 +3426,6 @@ p, li { white-space: pre-wrap; } 0 - - 0 - @@ -3918,7 +3557,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -3982,7 +3621,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -4041,13 +3680,13 @@ p, li { white-space: pre-wrap; } - 2 + 4 - 0 + 4 - 0 + 4 0 @@ -4055,25 +3694,7 @@ p, li { white-space: pre-wrap; } 0 - - - - - -1 - 75 - false - true - - - - QObject {font: bold 20px} - - - Factory Settings - - - - + Qt::Vertical @@ -4089,7 +3710,7 @@ p, li { white-space: pre-wrap; } - + @@ -4140,7 +3761,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -4153,7 +3774,7 @@ p, li { white-space: pre-wrap; } - + @@ -4163,9 +3784,6 @@ p, li { white-space: pre-wrap; } false - - QObject {font: 14px} - Note: You can not reset all settings to default during a running game! diff --git a/src/gui/qt/gui_800x480/startwindow_800x480.ui b/src/gui/qt/gui_800x480/startwindow_800x480.ui index 769c8d7d..b65626b0 100755 --- a/src/gui/qt/gui_800x480/startwindow_800x480.ui +++ b/src/gui/qt/gui_800x480/startwindow_800x480.ui @@ -65,32 +65,6 @@ - - - - Qt::Horizontal - - - - 63 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 95 - - - - @@ -134,7 +108,7 @@ &1 Start Local Game - + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png @@ -145,47 +119,6 @@ - - - - - 0 - 0 - - - - - 350 - 80 - - - - - 350 - 80 - - - - Qt::NoFocus - - - - - - &2 Internet Game - - - - :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png - - - - 37 - 32 - - - - @@ -216,7 +149,7 @@ &3 Create Network Game - + :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png @@ -227,6 +160,47 @@ + + + + + 0 + 0 + + + + + 350 + 80 + + + + + 350 + 80 + + + + Qt::NoFocus + + + + + + &2 Internet Game + + + + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png + + + + 37 + 32 + + + + @@ -238,14 +212,11 @@ Qt::NoFocus - - - &4 Join Network Game - + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png @@ -256,8 +227,92 @@ + + + + + 0 + 0 + + + + + 0 + 80 + + + + Qt::NoFocus + + + Configure PokerTH + + + + :/gfx/preferences-desktop.png:/gfx/preferences-desktop.png + + + + 37 + 32 + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + About PokerTH + + + + :/gfx/ktip.png:/gfx/ktip.png + + + + 37 + 32 + + + + + + + + Qt::Horizontal + + + + 63 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 95 + + + + @@ -298,7 +353,7 @@ - + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png @@ -310,7 +365,7 @@ - + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png @@ -324,31 +379,19 @@ About PokerTH - - - 15 - - - + :/gfx/systemsettings.png:/gfx/systemsettings.png Configure PokerTH ... - - - 15 - 50 - false - - - + :/gfx/application_exit.png:/gfx/application_exit.png @@ -363,7 +406,7 @@ true - + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png @@ -372,7 +415,7 @@ - + :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png @@ -381,7 +424,7 @@ - + diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp index 303d76ce..479cd5f4 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp @@ -29,7 +29,6 @@ newGameDialogImpl::newGameDialogImpl(QMainWindow *parent, ConfigFile *c) setupUi(this); myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl; - connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) ); } @@ -66,7 +65,7 @@ void newGameDialogImpl::exec() myChangeCompleteBlindsDialog->spinBox_afterThisAlwaysRaiseValue->setValue(myConfig->readConfigInt("AfterMBAlwaysRaiseValue")); myChangeCompleteBlindsDialog->radioButton_afterThisStayAtLastBlind->setChecked(myConfig->readConfigInt("AfterMBStayAtLastBlind")); - QDialog::exec(); + QDialog::exec(); } diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index b4260e65..4018b800 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -530,9 +530,6 @@ void settingsDialogImpl::exec(bool in_game) calledIngame = in_game; prepareDialog(); QDialog::exec(); -#ifdef ANDROID - this->showFullScreen(); -#endif } void settingsDialogImpl::isAccepted() diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 0eb29ae7..5416466c 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -75,17 +75,23 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) #ifdef GUI_800x480 #ifdef ANDROID - this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { font-size:20px; color: #F0F0F0; }"); + this->menubar->hide(); centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg_800x480.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); this->showFullScreen(); #else - this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); +// this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); + this->menubar->hide(); centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_800x480.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); #endif - pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); - pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); - pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); - pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); + pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}"); + pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}"); + pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}"); + pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}"); + pushButton_about->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}"); + pushButton_configure->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}"); + + connect( pushButton_about, SIGNAL( clicked() ), this, SLOT( callAboutPokerthDialog() ) ); + connect( pushButton_configure, SIGNAL( clicked() ), this, SLOT( callSettingsDialogFromStartwindow() ) ); #else this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:12px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); @@ -95,6 +101,10 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); + + connect( actionAbout_PokerTH, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) ); + connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialogFromStartwindow() ) ); + #endif @@ -124,11 +134,7 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) connect( actionCreate_Network_Game, SIGNAL( triggered() ), this, SLOT( callCreateNetworkGameDialog() ) ); connect( pushButton_Create_Network_Game, SIGNAL( clicked() ), this, SLOT( callCreateNetworkGameDialog() ) ); connect( actionJoin_Network_Game, SIGNAL( triggered() ), this, SLOT( callJoinNetworkGameDialog() ) ); - connect( pushButton_Join_Network_Game, SIGNAL( clicked() ), this, SLOT( callJoinNetworkGameDialog() ) ); - - connect( actionAbout_PokerTH, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) ); - connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialogFromStartwindow() ) ); - + connect( pushButton_Join_Network_Game, SIGNAL( clicked() ), this, SLOT( callJoinNetworkGameDialog() ) ); connect(this, SIGNAL(signalShowClientDialog()), this, SLOT(showClientDialog())); diff --git a/src/pokerth.cpp b/src/pokerth.cpp index bdaad9f6..a5fd008a 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -88,10 +88,10 @@ int main( int argc, char **argv ) //create defaultconfig ConfigFile *myConfig = new ConfigFile(argv[0], false); Log *myLog = new Log(myConfig); -#ifndef ANDROID +//#ifndef ANDROID // set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets a.setStyle(new QPlastiqueStyle); -#endif +//#endif QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); //set QApplication default font