diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui index c35a84d7..77f804aa 100644 --- a/src/gui/qt/gui_800x480/tabs_800x480.ui +++ b/src/gui/qt/gui_800x480/tabs_800x480.ui @@ -29,7 +29,16 @@ true - + + 0 + + + 0 + + + 0 + + 0 @@ -47,7 +56,16 @@ QFrame::Plain - + + 0 + + + 0 + + + 0 + + 0 @@ -81,7 +99,16 @@ true - + + 4 + + + 4 + + + 4 + + 4 @@ -103,7 +130,16 @@ Hands - + + 0 + + + 0 + + + 0 + + 0 @@ -123,7 +159,16 @@ Chat - + + 0 + + + 0 + + + 0 + + 0 @@ -159,15 +204,24 @@ Kick + + 5 + + + 5 + + + 5 + + + 5 + 0 6 - - 5 - @@ -312,12 +366,21 @@ Player info + + 6 + + + 6 + + + 6 + + + 6 + 3 - - 6 - @@ -357,15 +420,24 @@ true + + 4 + + + 4 + + + 4 + + + 4 + 1 2 - - 4 - @@ -385,7 +457,16 @@ Log - + + 0 + + + 0 + + + 0 + + 0 @@ -555,7 +636,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -580,6 +670,41 @@ + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + 60 + 60 + + + + + 60 + 60 + + + + QPushButton { border:none; background-image: url(":/gfx/systemsettings.png"); background-repeat: no-repeat; background-position: center center;} + + + diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc index 861af7ea..24947bdd 100644 --- a/src/gui/qt/resources/pokerth_android.qrc +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -366,7 +366,6 @@ android-data/gfx/gui/misc/welcomepokerth10_mobile.png android-data/gfx/gui/misc/windowicon.png android-data/fonts/DejaVuSans-Bold.ttf - android-data/fonts/n019003l.pfb android-data/gfx/avatars/default/misc/00a0b3d26a67841239b8883183b7a8f0.png android-data/gfx/avatars/default/misc/0f2ca195ebaec613ffc8626185415b18.png android-data/gfx/avatars/default/misc/2b0fca47b50e2cc4f910eba9ffa858a9.png @@ -556,7 +555,9 @@ android-data/translations/pokerth_sv.qm android-data/translations/pokerth_ta.qm android-data/translations/pokerth_tr.qm + android-data/translations/pokerth_vi.qm android-data/translations/pokerth_zhcn.qm + android-data/misc/third_party_libs.txt emotes/face-angel.png diff --git a/src/gui/qt/resources/systemsettings.png b/src/gui/qt/resources/systemsettings.png old mode 100644 new mode 100755 index 860e424f..06740ba1 Binary files a/src/gui/qt/resources/systemsettings.png and b/src/gui/qt/resources/systemsettings.png differ diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 8c4149dc..4d7b3c78 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -97,7 +97,9 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) #ifdef GUI_800x480 #ifdef ANDROID - this->menubar->hide(); + this->setMenuBar(0); +// this->menubar->clear(); +// this->menubar->hide(); //check if custom background picture for the resolution is there. Otherwise create it! QString UserDataDir = QString::fromUtf8(myConfig->readConfigString("UserDataDir").c_str()); @@ -655,7 +657,6 @@ void startWindowImpl::showNetworkStartDialog() myStartNetworkGameDialog->exec(); if (myStartNetworkGameDialog->result() == QDialog::Accepted ) { - this->hide(); //some gui modifications myGuiInterface->getMyW()->networkGameModification();