diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp index 71f38cdd..6e49cfb8 100755 --- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp +++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp @@ -71,6 +71,7 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) #ifdef ANDROID int api = -2; + this->setWindowState(Qt::WindowFullScreen); #ifndef ANDROID_TEST JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForIntegration("JavaVM"); JNIEnv* env; diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp index c75dc6bf..c0c85304 100644 --- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp +++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp @@ -43,11 +43,13 @@ changeCompleteBlindsDialogImpl::changeCompleteBlindsDialogImpl(QWidget *parent, #endif setupUi(this); this->installEventFilter(this); +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif connect( pushButton_add, SIGNAL( clicked() ), this, SLOT( addBlindValueToList() ) ); connect( pushButton_delete, SIGNAL( clicked() ), this, SLOT( removeBlindFromList() ) ); connect( spinBox_firstSmallBlind, SIGNAL( valueChanged(int) ), this, SLOT( updateSpinBoxInputMinimum(int) ) ); - } int changeCompleteBlindsDialogImpl::exec() diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp index 8280734b..fd9075d5 100644 --- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp +++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp @@ -43,6 +43,9 @@ changeContentDialogImpl::changeContentDialogImpl(QWidget *parent, ConfigFile *co #endif setupUi(this); this->installEventFilter(this); +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif switch (myType) { case CHANGE_HUMAN_PLAYER_NAME: { @@ -86,7 +89,6 @@ changeContentDialogImpl::changeContentDialogImpl(QWidget *parent, ConfigFile *co } connect(this, SIGNAL(accepted ()), this, SLOT(saveContent())); - } void changeContentDialogImpl::saveContent() diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp index c4714d21..c9df8431 100644 --- a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp +++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp @@ -39,6 +39,9 @@ connectToServerDialogImpl::connectToServerDialogImpl(QWidget *parent) setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); #endif setupUi(this); +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif } int connectToServerDialogImpl::exec() diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp index 7254ab23..43b090fb 100644 --- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp +++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp @@ -44,16 +44,16 @@ createInternetGameDialogImpl::createInternetGameDialogImpl(QWidget *parent, Conf #endif setupUi(this); this->installEventFilter(this); +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif spinBox_netDelayBetweenHands->installEventFilter(this); spinBox_netTimeOutPlayerAction->installEventFilter(this); - comboBox_gameType->setItemData(0, GAME_TYPE_NORMAL, Qt::UserRole); comboBox_gameType->setItemData(1, GAME_TYPE_REGISTERED_ONLY, Qt::UserRole); comboBox_gameType->setItemData(2, GAME_TYPE_INVITE_ONLY, Qt::UserRole); comboBox_gameType->setItemData(3, GAME_TYPE_RANKING, Qt::UserRole); - myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl; - startBlind = new QLabel(tr("First small blind: $%1").arg(RANKING_GAME_START_SBLIND)); raiseMode = new QLabel(tr("Double blinds every %1'th hand").arg(RANKING_GAME_RAISE_EVERY_HAND)); startBlind->hide(); @@ -68,7 +68,6 @@ createInternetGameDialogImpl::createInternetGameDialogImpl(QWidget *parent, Conf 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 634d2609..6857f10b 100644 --- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp +++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp @@ -42,9 +42,10 @@ createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent, Config #endif setupUi(this); this->installEventFilter(this); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif myChangeCompleteBlindsDialog = new changeCompleteBlindsDialogImpl; - fillFormular(); connect( radioButton_changeBlindsSettings, SIGNAL( clicked(bool) ), this, SLOT( callChangeBlindsDialog(bool) ) ); @@ -52,7 +53,6 @@ createNetworkGameDialogImpl::createNetworkGameDialogImpl(QWidget *parent, Config connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) ); #endif connect( pushButton_createGame, SIGNAL( clicked() ), this, SLOT( createGame() ) ); - } diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 1c66ef45..f5e2ac65 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -55,10 +55,11 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) #elif _WIN32 // setWindowFlags(Qt::Dialog | Qt::WindowMinimizeButtonHint); #endif - setupUi(this); myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif //wait start game message waitStartGameMsgBox = new MyMessageBox(this); waitStartGameMsgBox->setText(tr("Starting game. Please wait ...")); @@ -130,7 +131,6 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) myGameListSortFilterProxyModel->setSourceModel(myGameListModel); myGameListSortFilterProxyModel->setDynamicSortFilter(true); treeView_GameList->setModel(myGameListSortFilterProxyModel); - myGameListSelectionModel = treeView_GameList->selectionModel(); QStringList headerList; @@ -252,9 +252,7 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) lineEdit_searchForPlayers->installEventFilter(this); lineEdit_ChatInput->installEventFilter(this); this->installEventFilter(this); - clearDialog(); - } int gameLobbyDialogImpl::exec() diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index dd1bb98e..27ce8904 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -108,6 +108,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) textLabel_handLabel->hide(); #ifdef ANDROID tabsDiag->setStyleSheet("QObject { font: 26px; } QDialog { background-image: url(:/android/android-data/gfx/gui/table/default_800x480/table_dark.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); + this->setWindowState(Qt::WindowFullScreen); #endif tabs.label_chance->setMyStyle(myGameTableStyle); #else @@ -4293,9 +4294,6 @@ void gameTableImpl::saveGameTableGeometry() void gameTableImpl::restoreGameTableGeometry() { -#ifdef ANDROID - this->showFullScreen(); -#else if(myConfig->readConfigInt("GameTableFullScreenSave")) { #ifndef GUI_800x480 if(actionFullScreen->isEnabled()) this->showFullScreen(); @@ -4307,7 +4305,6 @@ void gameTableImpl::restoreGameTableGeometry() this->resize(myConfig->readConfigInt("GameTableWidthSave"), myConfig->readConfigInt("GameTableHeightSave")); } } -#endif } void gameTableImpl::netClientPlayerLeft(unsigned /*playerId*/) diff --git a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp index 8b8552df..e24fab24 100644 --- a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp +++ b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp @@ -39,7 +39,9 @@ internetGameLoginDialogImpl::internetGameLoginDialogImpl(QWidget *parent, Config { setupUi(this); this->installEventFilter(this); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif //html stuff QString createAccount(QString("%1").arg(tr("Create new user account"))); label_createAnAccount->setText(createAccount); diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp index d735bfbb..9560b30d 100644 --- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp +++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp @@ -45,7 +45,9 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent, ConfigFile setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); #endif setupUi(this); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif // QShortcut *connectKey = new QShortcut(QKeySequence(Qt::Key_Enter), this); // connect( connectKey, SIGNAL(activated() ), pushButton_connect, SLOT( click() ) ); @@ -305,12 +307,14 @@ void joinNetworkGameDialogImpl::deleteServerProfile() void joinNetworkGameDialogImpl::keyPressEvent ( QKeyEvent * event ) { - #ifndef ANDROID if (event->key() == 16777220) { pushButton_connect->click(); //ENTER } +#else + QDialog::keyPressEvent(event); #endif + } void joinNetworkGameDialogImpl::checkIp() diff --git a/src/gui/qt/logfiledialog/logfiledialog.cpp b/src/gui/qt/logfiledialog/logfiledialog.cpp index 1da92ecc..1a749e57 100644 --- a/src/gui/qt/logfiledialog/logfiledialog.cpp +++ b/src/gui/qt/logfiledialog/logfiledialog.cpp @@ -48,10 +48,11 @@ LogFileDialog::LogFileDialog(QWidget *parent, ConfigFile *c) : ui(new Ui::LogFileDialog) { ui->setupUi(this); - ui->label_animation->setMaximumWidth(0); ui->horizontalLayout_animation->setSpacing(0); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif connect( ui->pushButton_deleteLog, SIGNAL(clicked()), this, SLOT (deleteLogFile())); connect( ui->pushButton_exportLogHtml, SIGNAL(clicked()), this, SLOT (exportLogToHtml())); connect( ui->pushButton_exportLogTxt, SIGNAL(clicked()), this, SLOT (exportLogToTxt())); diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp index 1d2d4f94..081f6023 100755 --- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp +++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp @@ -79,6 +79,9 @@ int newGameDialogImpl::exec() myChangeCompleteBlindsDialog->spinBox_afterThisAlwaysRaiseValue->setValue(myConfig->readConfigInt("AfterMBAlwaysRaiseValue")); myChangeCompleteBlindsDialog->radioButton_afterThisStayAtLastBlind->setChecked(myConfig->readConfigInt("AfterMBStayAtLastBlind")); +#ifdef ANDROID + this->showFullScreen(); +#endif return QDialog::exec(); } diff --git a/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp b/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp index d99814aa..cd98ee1e 100644 --- a/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp +++ b/src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp @@ -43,7 +43,9 @@ serverListDialogImpl::serverListDialogImpl(startWindowImpl *sw, QMainWindow *par setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); #endif setupUi(this); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif connect( treeWidget_serverList, SIGNAL( itemDoubleClicked ( QTreeWidgetItem*, int) ), this, SLOT( connectToServer() )); connect( buttonBox, SIGNAL( accepted() ), this, SLOT( connectToServer() )); connect( buttonBox, SIGNAL( rejected() ), this, SLOT( closeNetworkClient() )); diff --git a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp index b3e676e3..61d033ca 100644 --- a/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp @@ -42,7 +42,9 @@ manualBlindsOrderDialogImpl::manualBlindsOrderDialogImpl(QWidget *parent, Config setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); #endif setupUi(this); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif connect( pushButton_add, SIGNAL( clicked() ), this, SLOT( addBlindValueToList() ) ); connect( pushButton_delete, SIGNAL( clicked() ), this, SLOT( removeBlindFromList() ) ); diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp index 75a132fc..89c915c7 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp @@ -43,7 +43,9 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c) setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); #endif setupUi(this); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); pushButton_OpenAvatarFile->setIcon(QIcon(QPixmap(myAppDataPath+"gfx/gui/misc/fileopen16.png"))); diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 87d37efe..294f93af 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -55,6 +55,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva label_soundvol->hide(); label_soundVolume->hide(); horizontalSlider_soundVolume->hide(); + this->setWindowState(Qt::WindowFullScreen); #endif myManualBlindsOrderDialog = new manualBlindsOrderDialogImpl; diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index ba5005d2..6bc1d77d 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -44,7 +44,9 @@ startNetworkGameDialogImpl::startNetworkGameDialogImpl(startWindowImpl *parent, setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog); #endif setupUi(this); - +#ifdef ANDROID + this->setWindowState(Qt::WindowFullScreen); +#endif myChat = new ChatTools(lineEdit_ChatInput, myConfig, LAN_LOBBY_CHAT, textBrowser_ChatDisplay); lineEdit_ChatInput->installEventFilter(this);