diff --git a/src/gui/qt/changecompleteblindsdialog.ui b/src/gui/qt/changecompleteblindsdialog.ui index 74e356fb..a442060a 100644 --- a/src/gui/qt/changecompleteblindsdialog.ui +++ b/src/gui/qt/changecompleteblindsdialog.ui @@ -280,6 +280,13 @@ + spinBox_firstSmallBlind + radioButton_raiseBlindsAtHands + spinBox_raiseSmallBlindEveryHands + radioButton_raiseBlindsAtMinutes + spinBox_raiseSmallBlindEveryMinutes + radioButton_alwaysDoubleBlinds + radioButton_manualBlindsOrder listWidget_blinds spinBox_input pushButton_add diff --git a/src/gui/qt/changehumanplayernamedialog.ui b/src/gui/qt/changehumanplayernamedialog.ui index 23ad41a2..86135163 100644 --- a/src/gui/qt/changehumanplayernamedialog.ui +++ b/src/gui/qt/changehumanplayernamedialog.ui @@ -56,6 +56,10 @@ + + lineEdit + buttonBox + diff --git a/src/gui/qt/createinternetgamedialog.ui b/src/gui/qt/createinternetgamedialog.ui index 2f6056ef..0898a227 100644 --- a/src/gui/qt/createinternetgamedialog.ui +++ b/src/gui/qt/createinternetgamedialog.ui @@ -5,7 +5,7 @@ 0 0 - 277 + 305 341 @@ -236,8 +236,12 @@ spinBox_quantityPlayers spinBox_startCash + radioButton_useSavedBlindsSettings + radioButton_changeBlindsSettings spinBox_gameSpeed spinBox_netTimeOutPlayerAction + checkBox_Password + lineEdit_Password pushButton_createGame pushButton_cancel diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui index 09a7536b..b0dd1a25 100644 --- a/src/gui/qt/createnetworkgamedialog.ui +++ b/src/gui/qt/createnetworkgamedialog.ui @@ -5,7 +5,7 @@ 0 0 - 277 + 305 314 @@ -185,6 +185,8 @@ spinBox_quantityPlayers spinBox_startCash + radioButton_useSavedBlindsSettings + radioButton_changeBlindsSettings spinBox_gameSpeed spinBox_netTimeOutPlayerAction pushButton_createGame diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index ddbd60ed..082ae7d6 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -1842,565 +1842,618 @@ - - - - 30 - 33 - 40 - 40 - + + + 28 - - - 40 - 40 - + + 28 - - - 40 - 40 - + + 25 - - true + + 22 - - Qt::AlignCenter + + 11 - - - - - 94 - 28 - 118 - 20 - + + 0 - - - 16777215 - 20 - - - - Qt::AlignCenter - - - - - - 94 - 53 - 118 - 111 - - - - - 118 - 111 - - - - - - 9 - 35 - 100 - 40 - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - Qt::NoTextInteraction - - - - - - - 30 - 90 - 50 - 34 - - - - - 50 - 34 - - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 30 - 130 - 50 - 50 - - - - - 50 - 50 - - - - - 50 - 50 - - - - - - - true - - - - - - 94 - 160 - 118 - 23 - - - - - 16777215 - 23 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 227 - 30 - 144 - 160 - - - - - - - 0 - - - - - Qt::Horizontal + + + + 0 + + + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 5 + 20 + + + + + + + + + 40 + 40 + + + + + 40 + 40 + + + + true + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 5 + 20 + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 28 + + + + + + + + + 50 + 34 + + + + + 50 + 34 + + + + QFrame::Raised + + + + 0 - - QSizePolicy::Fixed + + 0 - - - 13 - 20 - + + 0 - - - - - - 3 + + 0 - - - - 2 - - - - - - 40 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - 102 - 153 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - 102 - 153 - 0 - - - - - - - - - 118 - 111 - 107 - - - - - - - 255 - 255 - 255 - - - - - - - - Qt::NoFocus - - - 99999 - - - 10 - - - 99999 - - - - - - - - 40 - 21 - - - - - 40 - 21 - - - - Qt::NoFocus - - - - - - - - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - - Qt::NoFocus - - - 99999 - - - 10 - - - Qt::Horizontal + + 0 + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 13 - 20 - - - - - - - - - - 0 + + + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + true + + + + + + + + + + 16777215 + 20 + + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + 1 + + + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 13 + 20 + + + + + + + + 3 + + + + + 2 + + + + + + 40 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 102 + 153 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 102 + 153 + 0 + + + + + + + + + 118 + 111 + 107 + + + + + + + 255 + 255 + 255 + + + + + + + + Qt::NoFocus + + + 99999 + + + 10 + + + 99999 + + + + + + + + 40 + 21 + + + + + 40 + 21 + + + + Qt::NoFocus + + + + + + + + + + + + + + 102 + 153 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 40 + 100 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 40 + 100 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + 40 + 100 + 0 + + + + + + + 40 + 100 + 0 + + + + + + + + Qt::NoFocus + + + 99999 + + + 10 + + + Qt::Horizontal + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 13 + 20 + + + + + + + + + + 0 + + + + + + 0 + 0 + + + + + 140 + 35 + + + + + 140 + 35 + + + + Qt::NoFocus + + + + + + + + 0 + 0 + + + + + 140 + 35 + + + + + 140 + 35 + + + + Qt::NoFocus + + + + + + + + 0 + 0 + + + + + 140 + 35 + + + + + 140 + 35 + + + + Qt::NoFocus + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 140 + 0 + + + + + + + + + + + + + 118 + 111 + + + + + + 9 + 35 + 100 + 40 + - - - - - 0 - 0 - - - - - 140 - 35 - - - - - 140 - 35 - - - - Qt::NoFocus - - - - - - - - 0 - 0 - - - - - 140 - 35 - - - - - 140 - 35 - - - - Qt::NoFocus - - - - - - - - 0 - 0 - - - - - 140 - 35 - - - - - 140 - 35 - - - - Qt::NoFocus - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 140 - 0 - - - - - - - - + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + Qt::NoTextInteraction + + + + + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 647b3332..aee7af25 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -3419,13 +3419,11 @@ bool mainWindowImpl::eventFilter(QObject *obj, QEvent *event) { QKeyEvent *keyEvent = static_cast(event); - if (/*obj == lineEdit_ChatInput && lineEdit_ChatInput->text() != "" && */event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Tab) - { + 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) - { + else if (event->type() == QEvent::Close) { event->ignore(); quitPokerTH(); return true; @@ -3633,7 +3631,7 @@ void mainWindowImpl::myButtonsCheckable(bool state) { void mainWindowImpl::closeEvent(QCloseEvent* /*event*/) { quitPokerTH(); } void mainWindowImpl::showMaximized () { - showFullScreen (); + this->showFullScreen (); } void mainWindowImpl::quitPokerTH() { diff --git a/src/gui/qt/newgamedialog.ui b/src/gui/qt/newgamedialog.ui index e5f89cff..ae898084 100755 --- a/src/gui/qt/newgamedialog.ui +++ b/src/gui/qt/newgamedialog.ui @@ -126,6 +126,8 @@ spinBox_quantityPlayers spinBox_startCash + radioButton_useSavedBlindsSettings + radioButton_changeBlindsSettings spinBox_gameSpeed buttonBox diff --git a/src/gui/qt/selectavatardialog.ui b/src/gui/qt/selectavatardialog.ui index 519fd0cc..dae19753 100644 --- a/src/gui/qt/selectavatardialog.ui +++ b/src/gui/qt/selectavatardialog.ui @@ -128,7 +128,10 @@ + groupBox + comboBox_avatarViewCategorie listWidget + groupBox_2 lineEdit pushButton_OpenAvatarFile buttonBox diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index c734435e..3791733f 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -3002,6 +3002,7 @@ p, li { white-space: pre-wrap; } listWidget + comboBox_switchLanguage checkBox_showIntro checkBox_showLeftToolbox checkBox_showRightToolbox @@ -3009,25 +3010,58 @@ p, li { white-space: pre-wrap; } checkBox_showFadeOutCardsAnimation checkBox_showFlipCardsAnimation checkBox_showBlindButtons + checkBox_antiPeekMode + checkBox_alternateFKeysUserActionMode radioButton_flipsideTux radioButton_flipsideOwn lineEdit_OwnFlipsideFilename pushButton_openFlipsidePicture + groupBox_playSoundEffects + horizontalSlider_soundVolume + checkBox_playGameActions + checkBox_playLobbyChatNotification + checkBox_playNetworkGameNotification spinBox_quantityPlayers spinBox_startCash spinBox_firstSmallBlind + radioButton_raiseBlindsAtHands + spinBox_raiseSmallBlindEveryHands + radioButton_raiseBlindsAtMinutes + spinBox_raiseSmallBlindEveryMinutes + radioButton_alwaysDoubleBlinds + radioButton_manualBlindsOrder + pushButton_editManualBlindsOrder spinBox_gameSpeed checkBox_pauseBetweenHands checkBox_showGameSettingsDialogOnNewGame spinBox_netQuantityPlayers spinBox_netStartCash spinBox_netFirstSmallBlind + radioButton_netRaiseBlindsAtHands + spinBox_netRaiseSmallBlindEveryHands + radioButton_netRaiseBlindsAtMinutes + spinBox_netRaiseSmallBlindEveryMinutes + radioButton_netAlwaysDoubleBlinds + radioButton_netManualBlindsOrder + pushButton_netEditManualBlindsOrder spinBox_netGameSpeed spinBox_netTimeOutPlayerAction spinBox_serverPort lineEdit_serverPassword checkBox_useIpv6 checkBox_useSctp + lineEdit_InternetServerAddress + spinBox_InternetServerPort + lineEdit_InternetServerPassword + checkBox_InternetServerUseIpv6 + checkBox_InternetServerUseSctp + checkBox_UseInternetGamePassword + lineEdit_InternetGamePassword + groupBox_lobbyChat + lineEdit_IRCServerAddress + spinBox_IRCServerPort + lineEdit_IRCChannel + checkBox_IRCServerUseIpv6 pushButton_HumanPlayerAvatar lineEdit_HumanPlayerName pushButton_Opponent1Avatar @@ -3042,6 +3076,7 @@ p, li { white-space: pre-wrap; } lineEdit_Opponent5Name pushButton_Opponent6Avatar lineEdit_Opponent6Name + groupBox_logOnOff lineEdit_logDir pushButton_openLogDir spinBox_logStoreDuration @@ -3073,12 +3108,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 360 - 395 + 361 + 366 571 - 395 + 366 @@ -3089,12 +3124,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 360 - 395 + 361 + 366 600 - 396 + 368 @@ -3137,12 +3172,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 314 - 327 + 304 + 38 - 515 - 328 + 304 + 38 @@ -3153,12 +3188,12 @@ p, li { white-space: pre-wrap; } setNum(int) - 539 - 86 + 304 + 38 - 310 - 89 + 304 + 38 @@ -3169,12 +3204,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 557 - 219 + 304 + 38 - 498 - 248 + 304 + 38 @@ -3185,12 +3220,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 463 - 212 + 304 + 38 - 521 - 244 + 304 + 38 diff --git a/src/gui/qt/startnetworkgamedialog.ui b/src/gui/qt/startnetworkgamedialog.ui index 8ce0cb05..26f1330d 100644 --- a/src/gui/qt/startnetworkgamedialog.ui +++ b/src/gui/qt/startnetworkgamedialog.ui @@ -171,7 +171,11 @@ + treeWidget + checkBox_fillUpWithComputerOpponents pushButton_Kick + textBrowser_ChatDisplay + lineEdit_ChatInput pushButton_startGame pushButton_cancel