diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp index 4d7c6e52..aa83f231 100755 --- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp +++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp @@ -33,8 +33,13 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); QPalette myPalette = textBrowser_licence->palette(); +#ifdef GUI_800x480 + myPalette.setColor(QPalette::Base, QColor(0,0,0,0)); + myPalette.setColor(QPalette::Text, QColor(255,255,255,255)); +#else QColor myColor = myPalette.color(QPalette::Window); myPalette.setColor(QPalette::Base, myColor); +#endif textBrowser_licence->setPalette(myPalette); textBrowser_2->setPalette(myPalette); textBrowser_3->setPalette(myPalette); @@ -53,7 +58,11 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) label_logo->setPixmap(QPixmap(":/gfx/logoChip3D.png")); +#ifdef GUI_800x480 + label_pokerthVersion->setStyleSheet("QLabel { font-size: 20px; font-weight: bold;}"); +#else label_pokerthVersion->setStyleSheet("QLabel { font-size: 16px; font-weight: bold;}"); +#endif label_pokerthVersion->setText(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING))); this->setWindowTitle(QString(tr("About PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING))); diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp index a7e0e01f..7e17a43b 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp @@ -46,7 +46,9 @@ createInternetGameDialogImpl::createInternetGameDialogImpl(QWidget *parent, Conf gridLayout1->addWidget(raiseMode, 1, 0, 1, 1); connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) ); +#ifndef GUI_800x480 connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) ); +#endif connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); connect( checkBox_Password, SIGNAL( toggled(bool) ), this, SLOT( clearGamePassword(bool)) ); connect( comboBox_gameType, SIGNAL(currentIndexChanged(int)), this, SLOT( gameTypeChanged() ) ); diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp index b3d58cc5..a507638b 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp @@ -34,7 +34,9 @@ createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent, Config fillFormular(); connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) ); +#ifndef GUI_800x480 connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) ); +#endif connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); //temporarely unused until ai is enabled in network diff --git a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui index 64b1cb27..1c08b5df 100755 --- a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui +++ b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui @@ -7,10 +7,22 @@ 0 0 - 560 - 415 + 800 + 424 + + + 800 + 424 + + + + + 800 + 424 + + 9 @@ -20,11 +32,26 @@ + + + 0 + 0 + + + + + 16777215 + 16777215 + + true + + QObject {font-size: 20px} + - 0 + 4 @@ -39,12 +66,18 @@ + + true + 0 0 + + QLabel {font-size: 18px} + <!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"> @@ -69,19 +102,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 20 - 100 - - - - @@ -97,6 +117,9 @@ p, li { white-space: pre-wrap; } + + QLabel {font-size: 20px} + <a href="http://www.pokerth.net" target="_blank">http://www.pokerth.net<a> @@ -108,6 +131,19 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 100 + + + + @@ -130,7 +166,7 @@ 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-size:9pt; font-weight:400; font-style:normal;"> +</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;"> @@ -174,7 +210,7 @@ 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-size:9pt; font-weight:400; font-style:normal;"> +</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;"> @@ -204,7 +240,7 @@ 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-size:9pt; font-weight:400; font-style:normal;"> +</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;"> @@ -261,55 +297,8 @@ p, li { white-space: pre-wrap; } - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - Close - - - - - - - - okButton - clicked() - aboutPokerth - accept() - - - 278 - 253 - - - 96 - 254 - - - - + diff --git a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui index 4215d02a..51695244 100644 --- a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui @@ -6,18 +6,32 @@ 0 0 - 454 - 397 + 800 + 424 + + + 800 + 424 + + Change Blinds Settings - + + + + -1 + + + + QObject {font-size: 18px} + First small blind: @@ -25,6 +39,9 @@ + + QObject {font-size: 18px} + 5 @@ -37,6 +54,9 @@ + + QObject {font-size: 18px} + Raise blinds: @@ -52,6 +72,9 @@ + + QObject {font-size: 16px} + Every: @@ -62,6 +85,9 @@ + + QObject {font-size: 16px} + 1 @@ -75,6 +101,9 @@ 0 + + QObject {font-size: 16px} + hands @@ -82,6 +111,9 @@ + + QObject {font-size: 16px} + Every: @@ -89,6 +121,9 @@ + + QObject {font-size: 16px} + 1 @@ -102,6 +137,9 @@ 0 + + QObject {font-size: 16px} + minutes @@ -118,6 +156,9 @@ 0 + + QObject {font-size: 18px} + Raise mode: @@ -127,6 +168,9 @@ + + QObject {font-size: 16px} + Always double blinds @@ -137,6 +181,9 @@ + + QObject {font-size: 16px} + Manual blinds order: @@ -150,6 +197,9 @@ false + + QObject {font-size: 18px} + Manual blinds order: @@ -160,10 +210,17 @@ 4 - + + + QObject {font-size: 16px} + + + + QObject {font-size: 16px} + Delete @@ -184,6 +241,9 @@ + + QObject {font-size: 16px} + 20000 @@ -191,6 +251,9 @@ + + QObject {font-size: 16px} + Add @@ -222,6 +285,9 @@ + + QObject {font-size: 16px} + Always double blinds @@ -234,6 +300,9 @@ + + QObject {font-size: 16px} + Always raise by: @@ -241,6 +310,9 @@ + + QObject {font-size: 16px} + 20000 @@ -257,6 +329,9 @@ + + QObject {font-size: 16px} + Keep last blind @@ -270,11 +345,14 @@ + + QObject {font: bold 20px} + Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Ok diff --git a/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui b/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui index d8b8bf09..a39fde21 100644 --- a/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui @@ -6,27 +6,36 @@ 0 0 - 209 - 126 + 800 + 150 + + + 800 + 150 + + - 700 - 300 + 800 + 150 Network Error - + - + + + QObject {font-size: 20px} + Name: @@ -36,12 +45,25 @@ - + + + + 600 + 0 + + + + QObject {font-size: 20px} + + - + + + QObject {font-size: 18px} + Save in configuration @@ -50,16 +72,45 @@ - + + + QObject {font: bold 20px} + Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Ok + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/gui/qt/gui_800x480/connecttoserverdialog_800x480.ui b/src/gui/qt/gui_800x480/connecttoserverdialog_800x480.ui index 5923ccaf..c57e18fa 100644 --- a/src/gui/qt/gui_800x480/connecttoserverdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/connecttoserverdialog_800x480.ui @@ -1,106 +1,104 @@ - + + connectToServerDialog - - + + 0 0 - 260 - 118 + 800 + 150 - + + + 800 + 150 + + + + + 800 + 150 + + + Connect to Server - - + + 9 - + 6 - - - + + + + QObject {font-size: 20px} + + Connecting to Server ... - + Qt::AlignCenter - - - + + + + QObject {font-size: 18px} + + 0 - + Qt::Horizontal - - - - 5 + + + + Qt::Vertical - - 6 + + + 20 + 40 + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + - - - pushButton_cancel - clicked() - connectToServerDialog - reject() - - - 122 - 96 - - - 44 - 90 - - - - + diff --git a/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui b/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui index f676c8f3..00a6b034 100644 --- a/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui @@ -6,285 +6,27 @@ 0 0 - 303 - 390 + 800 + 424 + + + 800 + 424 + + + + + 800 + 424 + + Create Internet Game - - - - Internet Game Settings - - - - - - - - Default game name: - - - - - - - 48 - - - - - - - - - - - Game type: - - - - - - - - 0 - 0 - - - - - Standard - - - - :/gfx/player_play.png:/gfx/player_play.png - - - - - Registered players only - - - - :/gfx/registered.png:/gfx/registered.png - - - - - Invited players only - - - - :/gfx/list_add_user.png:/gfx/list_add_user.png - - - - - Ranking game - - - - :/gfx/cup.png:/gfx/cup.png - - - - - - - - - - 6 - - - 0 - - - - - Password: - - - - :/gfx/lock.png:/gfx/lock.png - - - - - - - false - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - - - - - Maximum number of players: - - - spinBox_quantityPlayers - - - - - - - 2 - - - 10 - - - 10 - - - - - - - Start Cash: - - - spinBox_startCash - - - - - - - - - - $ - - - 1000 - - - 1000000 - - - 50 - - - 2000 - - - - - - - Blinds - - - - 0 - - - - - Use saved blinds settings - - - true - - - - - - - Change blinds settings ... - - - - - - - - - - - 0 - 0 - - - - Timeout for player action: - - - spinBox_netTimeOutPlayerAction - - - - - - - s - - - 5 - - - 60 - - - 20 - - - - - - - Delay between hands: - - - spinBox_netDelayBetweenHands - - - - - - - - 0 - 0 - - - - s - - - 5 - - - 20 - - - 7 - - - - - - - + 6 @@ -307,20 +49,609 @@ + + QObject {font: bold 20px} + Create Game - - - - Cancel - - - + + + + + + + + + + + + + + + QObject {font-size:20px} + + + Default game name: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 400 + 0 + + + + + 16777215 + 16777215 + + + + QObject {font-size:20px} + + + 48 + + + + + + + + + + + QObject {font-size:20px} + + + Game type: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 400 + 0 + + + + QObject {font-size:20px} + + + + Standard + + + + :/gfx/player_play.png:/gfx/player_play.png + + + + + Registered players only + + + + :/gfx/registered.png:/gfx/registered.png + + + + + Invited players only + + + + :/gfx/list_add_user.png:/gfx/list_add_user.png + + + + + Ranking game + + + + :/gfx/cup.png:/gfx/cup.png + + + + + + + + + + 6 + + + 0 + + + + + QObject {font-size:20px} + + + Password: + + + + :/gfx/lock.png:/gfx/lock.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + 400 + 0 + + + + QObject {font-size:20px} + + + QLineEdit::Password + + + + + + + + + QObject {font-size:18px} + + + Blinds + + + + 0 + + + + + Use saved blinds settings + + + true + + + + + + + Change blinds settings ... + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + QObject {font-size:20px} + + + Maximum number of players: + + + spinBox_quantityPlayers + + + + + + + + 150 + 0 + + + + QObject {font-size:20px} + + + 2 + + + 10 + + + 10 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + QObject {font-size:20px} + + + Start Cash: + + + spinBox_startCash + + + + + + + + 150 + 0 + + + + QObject {font-size:20px} + + + + + + $ + + + 1000 + + + 1000000 + + + 50 + + + 2000 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 0 + 0 + + + + QObject {font-size:18px} + + + Timeout for player action: + + + spinBox_netTimeOutPlayerAction + + + + + + + QObject {font-size:18px} + + + s + + + 5 + + + 60 + + + 20 + + + + + + + QObject {font-size:18px} + + + Delay between hands: + + + spinBox_netDelayBetweenHands + + + + + + + + 0 + 0 + + + + QObject {font-size:18px} + + + s + + + 5 + + + 20 + + + 7 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -328,17 +659,12 @@ comboBox_gameType checkBox_Password lineEdit_Password - spinBox_quantityPlayers - spinBox_startCash radioButton_useSavedBlindsSettings radioButton_changeBlindsSettings - spinBox_netTimeOutPlayerAction - spinBox_netDelayBetweenHands pushButton_createGame - pushButton_cancel - + @@ -357,22 +683,6 @@ - - pushButton_cancel - clicked() - createInternetGameDialog - reject() - - - 286 - 294 - - - 288 - 190 - - - checkBox_Password toggled(bool) diff --git a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui index 816bc900..8b2701a6 100644 --- a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui @@ -6,58 +6,100 @@ 0 0 - 336 - 302 + 800 + 350 + + + 800 + 350 + + + + + 800 + 350 + + Create Network Game - + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + QObject {font-size:20px} + - Network Game Settings + 9 - - + + + + QObject {font-size:20px} + - Maximum number of players: + Timeout for player action: - spinBox_quantityPlayers + spinBox_netTimeOutPlayerAction - - + + + + + 150 + 0 + + + + QObject {font-size:20px} + + + s + - 2 + 0 - 10 + 60 - 10 - - - - - - - Start Cash: - - - spinBox_startCash + 20 + + + 150 + 0 + + + + QObject {font-size:20px} + @@ -75,8 +117,59 @@ - + + + + + + + Start Cash: + + + spinBox_startCash + + + + + + + + 150 + 0 + + + + + + + 2 + + + 10 + + + 10 + + + + + + + + + + Maximum number of players: + + + spinBox_quantityPlayers + + + + + + QObject {font-size:20px} + Blinds @@ -84,6 +177,13 @@ 0 + + + + Change blinds settings ... + + + @@ -94,28 +194,14 @@ - - - - Change blinds settings ... - - - - - - - Timeout for player action: - - - spinBox_netTimeOutPlayerAction - - - - + + + QObject {font-size:20px} + Delay between hands: @@ -124,24 +210,17 @@ - - - - s - - - 0 - - - 60 - - - 20 - - - - + + + + 150 + 0 + + + + QObject {font-size:20px} + s @@ -156,10 +235,49 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + 6 @@ -182,20 +300,29 @@ + + QObject {font: bold 20px} + Create Game - - - - Cancel - - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -203,10 +330,7 @@ spinBox_startCash radioButton_useSavedBlindsSettings radioButton_changeBlindsSettings - spinBox_netTimeOutPlayerAction - spinBox_netDelayBetweenHands pushButton_createGame - pushButton_cancel @@ -226,21 +350,5 @@ - - pushButton_cancel - clicked() - createNetworkGameDialog - reject() - - - 304 - 292 - - - 288 - 190 - - -