diff --git a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui index 8789bdcc..f5b0984a 100644 --- a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui @@ -304,6 +304,9 @@ + + QObject{font: 36px, } + OK @@ -313,10 +316,13 @@ - 24 - 24 + 32 + 32 + + Ctrl+S + false @@ -332,7 +338,7 @@ - 20 + 30 20 diff --git a/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui b/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui index 752f64d5..7642a96f 100644 --- a/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui @@ -29,13 +29,72 @@ QObject {font-size: 26px} - - 35 + + 30 + + + 30 + + + 30 + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + QObject { font: 36px;} + + + OK + + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + 32 + 32 + + + + false + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + @@ -62,7 +121,7 @@ - + Save in configuration @@ -72,41 +131,15 @@ - - - - QObject {font: bold 30px} - + + - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - - Qt::Horizontal + Qt::Vertical - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 + 20 + 40 @@ -116,39 +149,24 @@ lineEdit checkBox - buttonBox - + + + - buttonBox - accepted() + pushButton + clicked() changeContentDialog accept() - 248 - 254 + 655 + 361 - 157 - 274 - - - - - buttonBox - rejected() - changeContentDialog - reject() - - - 316 - 260 - - - 286 - 274 + 584 + 386 diff --git a/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui b/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui index fcd091ac..985085f1 100644 --- a/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui @@ -26,6 +26,9 @@ Create Internet Game + + 10 + @@ -50,11 +53,24 @@ - QObject {font: bold 30px} + QObject {font: 36px} Create Game + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + 32 + 32 + + + + false + @@ -74,6 +90,110 @@ 7 + + + + Blinds + + + + 0 + + + 0 + + + 0 + + + + + Use saved blinds settings + + + true + + + + + + + Change blinds settings ... + + + + + + + + + + + + + 0 + 0 + + + + Game type: + + + + + + + + 0 + 0 + + + + + 400 + 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 + + + + + + @@ -116,121 +236,7 @@ - - - - - - - 0 - 0 - - - - Game type: - - - - - - - - 0 - 0 - - - - - 400 - 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 - - - - - - 0 - 0 - - - - Password: - - - - 32 - 32 - - - - - - - - false - - - - 400 - 0 - - - - QLineEdit::Password - - - - - - + @@ -272,7 +278,7 @@ - + @@ -323,7 +329,7 @@ - + @@ -385,47 +391,50 @@ - - - - Blinds + + + + 6 - - - 0 - - - 0 - - - 0 - - - - - Use saved blinds settings - - - true - - - - - - - Change blinds settings ... - - - - - - - - - - Qt::Horizontal + + 0 - + + + + + 0 + 0 + + + + Password: + + + + 32 + 32 + + + + + + + + false + + + + 400 + 0 + + + + QLineEdit::Password + + + + @@ -441,7 +450,7 @@ pushButton_createGame - + diff --git a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui index cfb7c78d..5e525ba2 100644 --- a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui @@ -20,6 +20,18 @@ Create Network Game + + 30 + + + 0 + + + 30 + + + 30 + @@ -70,11 +82,24 @@ - QObject {font: bold 30px} + QObject {font: 36px} Create Game + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + 32 + 32 + + + + false + @@ -282,7 +307,9 @@ spinBox_netDelayBetweenHands pushButton_createGame - + + + pushButton_createGame diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 0747eacc..ca512667 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -4561,7 +4561,7 @@ p, li { white-space: pre-wrap; } - 235 + 300 60 diff --git a/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui b/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui index e32d750a..79864c35 100644 --- a/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui +++ b/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui @@ -131,6 +131,9 @@ + + QObject{font: 36px, } + Login @@ -140,8 +143,8 @@ - 24 - 24 + 32 + 32 diff --git a/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui index 4e3ba759..0d705358 100644 --- a/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui @@ -62,11 +62,24 @@ - QObject {font: bold 26px} + QObject {font: 36px} Connect + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + 32 + 32 + + + + false + @@ -358,7 +371,9 @@ p, li { white-space: pre-wrap; } pushButton_delete pushButton_connect - + + + pushButton_connect diff --git a/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui b/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui index bfa6768f..cdd823d7 100644 --- a/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui @@ -28,10 +28,72 @@ QObject {font: 26px} - - - 25 + + + 30 + + 10 + + + 30 + + + 30 + + + + + 4 + + + + + + + + Delete + + + + + + + Qt::Vertical + + + + 20 + 121 + + + + + + + + $ + + + 1 + + + 20000 + + + 5 + + + + + + + Add + + + + + @@ -105,66 +167,37 @@ - - - QObject {font: bold 30px} - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - - 4 - - - - - - - - Delete - - - - - + + + - Qt::Vertical + Qt::Horizontal - 20 - 121 + 40 + 20 - - - - $ - - - 1 - - - 20000 - - - 5 - - - - - + + - Add + OK + + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + 32 + 32 + + + + false @@ -178,42 +211,11 @@ radioButton_alwaysRaiseAbout spinBox_alwaysRaiseValue radioButton_stayAtLastBlind - buttonBox - + + + - - buttonBox - accepted() - manualBlindsOrderDialog - accept() - - - 228 - 394 - - - 157 - 274 - - - - - buttonBox - rejected() - manualBlindsOrderDialog - reject() - - - 270 - 400 - - - 286 - 274 - - - radioButton_alwaysRaiseAbout toggled(bool) @@ -221,12 +223,28 @@ setEnabled(bool) - 109 - 307 + 147 + 302 - 173 - 303 + 575 + 306 + + + + + pushButton + clicked() + manualBlindsOrderDialog + accept() + + + 666 + 367 + + + 622 + 394 diff --git a/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui b/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui index c70db2dc..fe1f0e60 100644 --- a/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui @@ -92,7 +92,7 @@ - QObject {font: 30px} + QObject {font: 36px} Qt::Horizontal diff --git a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui index 83655758..8ef6b900 100755 --- a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui @@ -32,6 +32,18 @@ 16 + + 30 + + + 10 + + + 30 + + + 10 + @@ -262,33 +274,27 @@ - + - QObject {font: bold 30px} + QObject { font: 36px;} - - Qt::Horizontal + + OK - - QDialogButtonBox::Ok + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - + - 100 - 20 + 32 + 32 - + + false + + @@ -312,37 +318,23 @@ spinBox_startCash radioButton_changeBlindsSettings - + + + - buttonBox - accepted() + pushButton + clicked() newGameDialog accept() - 248 - 254 + 689 + 356 - 157 - 274 - - - - - buttonBox - rejected() - newGameDialog - reject() - - - 316 - 260 - - - 286 - 274 + 588 + 377 diff --git a/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui b/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui index 2c6edf76..5b571523 100644 --- a/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui +++ b/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui @@ -98,7 +98,7 @@ - + :/gfx/document-open-folder.png:/gfx/document-open-folder.png @@ -115,7 +115,7 @@ - QObject {font: bold 26px} + QObject {font:36px} Qt::Horizontal @@ -136,7 +136,7 @@ buttonBox - + diff --git a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui index 4a9cb690..aeffd716 100644 --- a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui @@ -3495,44 +3495,6 @@ p, li { white-space: pre-wrap; } 0 - - - - - 0 - 0 - - - - Store log files for: - - - spinBox_logStoreDuration - - - - - - - - 0 - 0 - - - - Day(s) - - - 1 - - - 3650 - - - 2 - - - @@ -3627,131 +3589,60 @@ p, li { white-space: pre-wrap; } + + + + + 0 + 0 + + + + Store log files for: + + + spinBox_logStoreDuration + + + + + + + + 0 + 0 + + + + Day(s) + + + 1 + + + 3650 + + + 2 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - - 0 - - - - - - 0 - 0 - - - - true - - - QAbstractItemView::ExtendedSelection - - - 5 - - - false - - - true - - - - Log File - - - - - - - - 0 - - - - - Preview: - - - - - - - - 0 - 0 - - - - - - - <!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:'Liberation Sans'; font-size:18px; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><br /></p></body></html> - - - - - - - - - - - 0 - - - - - Export as HTML - - - - :/gfx/text-html.png:/gfx/text-html.png - - - - - - - Export as txt - - - - :/gfx/text-plain.png:/gfx/text-plain.png - - - - - - - Save as ... - - - - :/gfx/filesave.png:/gfx/filesave.png - - - - - - - Delete - - - - :/gfx/editdelete.png:/gfx/editdelete.png - - - - - @@ -3894,15 +3785,25 @@ p, li { white-space: pre-wrap; } - + - QObject {font: bold 20px} + QObject{font: 32px;} - - Qt::Horizontal + + OK - - QDialogButtonBox::Ok + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + 32 + 32 + + + + false @@ -4033,11 +3934,6 @@ p, li { white-space: pre-wrap; } comboBox_logInterval lineEdit_logDir pushButton_openLogDir - pushButton_exportLogHtml - pushButton_exportLogTxt - pushButton_saveLogAs - pushButton_deleteLog - buttonBox @@ -4059,22 +3955,6 @@ p, li { white-space: pre-wrap; } - - buttonBox - rejected() - settingsDialog - reject() - - - 595 - 520 - - - 599 - 497 - - - horizontalSlider_soundVolume valueChanged(int) @@ -4082,12 +3962,12 @@ p, li { white-space: pre-wrap; } setNum(int) - 765 - 92 + 786 + 63 - 322 - 92 + 362 + 63 @@ -4098,12 +3978,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 765 - 212 + 786 + 184 - 765 - 242 + 786 + 217 @@ -4114,12 +3994,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 763 - 212 + 784 + 168 - 763 - 236 + 784 + 188 @@ -4130,12 +4010,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 296 - 109 + 249 + 53 - 381 - 110 + 277 + 53 @@ -4146,12 +4026,12 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 309 - 108 + 249 + 53 - 747 - 103 + 306 + 79 @@ -4162,12 +4042,28 @@ p, li { white-space: pre-wrap; } setEnabled(bool) - 283 - 283 + 362 + 235 - 566 - 283 + 779 + 239 + + + + + pushButton + clicked() + settingsDialog + accept() + + + 685 + 390 + + + 578 + 396 diff --git a/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui index 5332cf10..b0770b0f 100644 --- a/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui @@ -134,11 +134,24 @@ - QObject {font: 26px} + QObject {font: 36px} Kick Player + + + :/gfx/editdelete.png:/gfx/editdelete.png + + + + 32 + 32 + + + + false + @@ -157,11 +170,24 @@ - QObject {font: bold 30px} + QObject {font: 36px} Start Game + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + 32 + 32 + + + + false + @@ -176,7 +202,9 @@ lineEdit_ChatInput pushButton_startGame - + + + pushButton_startGame diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui index bf222871..7e815051 100644 --- a/src/gui/qt/gui_800x480/tabs_800x480.ui +++ b/src/gui/qt/gui_800x480/tabs_800x480.ui @@ -39,7 +39,7 @@ 0 - 0 + 20 0 diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp index 1dcc4477..af8f30aa 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp @@ -27,6 +27,7 @@ newGameDialogImpl::newGameDialogImpl(QMainWindow *parent, ConfigFile *c) setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); #endif setupUi(this); + this->installEventFilter(this); myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl; connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) ); @@ -65,7 +66,7 @@ void newGameDialogImpl::exec() myChangeCompleteBlindsDialog->spinBox_afterThisAlwaysRaiseValue->setValue(myConfig->readConfigInt("AfterMBAlwaysRaiseValue")); myChangeCompleteBlindsDialog->radioButton_afterThisStayAtLastBlind->setChecked(myConfig->readConfigInt("AfterMBStayAtLastBlind")); - QDialog::exec(); + QDialog::exec(); } void newGameDialogImpl::callChangeBlindsDialog(bool show) @@ -80,3 +81,35 @@ void newGameDialogImpl::callChangeBlindsDialog(bool show) } } + +bool newGameDialogImpl::eventFilter(QObject *obj, QEvent *event) +{ + QKeyEvent *keyEvent = static_cast(event); + +#ifdef ANDROID + //androi hack for crash bug (hopefully useless from necessitas beta2) + if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) { + if(spinBox_gameSpeed->hasFocus()) { + spinBox_gameSpeed->clearFocus(); + } + if(spinBox_quantityPlayers->hasFocus()) { + spinBox_quantityPlayers->clearFocus(); + } + if(spinBox_startCash->hasFocus()) { + spinBox_startCash->clearFocus(); + } + event->ignore(); + return false; + } + else if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Back) { + this->reject(); + return true; + } + else { + // pass the event on to the parent class + return QDialog::eventFilter(obj, event); + } +#else + return QDialog::eventFilter(obj, event); +#endif +} diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h index 7fe4b0fb..a71aaed2 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.h @@ -42,6 +42,8 @@ public: return myChangeCompleteBlindsDialog; } + bool eventFilter(QObject *obj, QEvent *event); + public slots: void callChangeBlindsDialog(bool); diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index b4804d51..4a0aeff8 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -82,7 +82,6 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva comboBox_switchLanguage->addItem(QString(tr("Tamil")+" "+QString::fromUtf8("(தமிழ்)")),"ta"); comboBox_switchLanguage->addItem(QString(tr("Turkish")+" "+QString::fromUtf8("(Tϋrkçe)")),"tr"); - connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) ); connect( lineEdit_HumanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_Opponent1Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_Opponent2Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); diff --git a/src/pokerth.cpp b/src/pokerth.cpp index cf75a50c..8ff5cff7 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -114,7 +114,9 @@ int main( int argc, char **argv ) p.setColor(QPalette::ButtonText, QColor::fromRgb(255,255,255)); p.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgb(100,100,100)); p.setColor(QPalette::WindowText, QColor::fromRgb(255,255,255)); + p.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgb(100,100,100)); p.setColor(QPalette::Text, QColor::fromRgb(255,255,255)); + p.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgb(100,100,100)); p.setColor(QPalette::Link, QColor::fromRgb(192,192,255)); p.setColor(QPalette::LinkVisited, QColor::fromRgb(192,192,255)); a.setPalette(p);