diff --git a/data/gfx/gui/table/default_800x480/table_dark.png b/data/gfx/gui/table/default_800x480/table_dark.png new file mode 100644 index 00000000..783a2ba4 Binary files /dev/null and b/data/gfx/gui/table/default_800x480/table_dark.png differ diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index e9bd6d12..fca2a45b 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -96,8 +96,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) tabsDiag = new QDialog(this); tabs.setupUi(tabsDiag); #ifdef ANDROID - tabsDiag->setStyleSheet("QDialog { font: 26px; background-image: url(\""+myGameTableStyle->getTable()+"\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); - tabs.frame->setStyleSheet("QObject { background-color: rgba(0, 0, 0, 100); }"); + 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;}"); #endif tabs.label_chance->setMyStyle(myGameTableStyle); #else diff --git a/src/gui/qt/gametable/mylefttabwidget.h b/src/gui/qt/gametable/mylefttabwidget.h index d543a37c..9ac9d8bb 100755 --- a/src/gui/qt/gametable/mylefttabwidget.h +++ b/src/gui/qt/gametable/mylefttabwidget.h @@ -26,7 +26,7 @@ class MyLeftTabWidget : public QTabWidget { Q_OBJECT public: - MyLeftTabWidget(QGroupBox*); + MyLeftTabWidget(QGroupBox*); ~MyLeftTabWidget(); diff --git a/src/gui/qt/gametable/myrighttabwidget.h b/src/gui/qt/gametable/myrighttabwidget.h index 688344e3..44290b1f 100755 --- a/src/gui/qt/gametable/myrighttabwidget.h +++ b/src/gui/qt/gametable/myrighttabwidget.h @@ -25,7 +25,7 @@ class MyRightTabWidget : public QTabWidget { Q_OBJECT public: - MyRightTabWidget(QGroupBox*); + MyRightTabWidget(QGroupBox*); ~MyRightTabWidget(); diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 20c1561d..8e61744a 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -4251,7 +4251,7 @@ p, li { white-space: pre-wrap; } - 20 + 10 20 @@ -4472,9 +4472,15 @@ p, li { white-space: pre-wrap; } + + + 0 + 0 + + - 160 + 168 60 diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui index b6c47c35..d60ec5dd 100644 --- a/src/gui/qt/gui_800x480/tabs_800x480.ui +++ b/src/gui/qt/gui_800x480/tabs_800x480.ui @@ -7,7 +7,7 @@ 0 0 800 - 424 + 463 @@ -77,17 +77,14 @@ - - - 390 - 350 - + + + 0 + 0 + - - - 390 - 350 - + + QGroupBox { border: 0px; } true @@ -98,6 +95,12 @@ + + + 0 + 0 + + Qt::NoFocus @@ -346,17 +349,14 @@ - - - 390 - 350 - + + + 0 + 0 + - - - 390 - 350 - + + QGroupBox { border: 0px; } true @@ -373,6 +373,12 @@ + + + 0 + 0 + + Qt::NoFocus @@ -538,10 +544,13 @@ Qt::Vertical + + QSizePolicy::Fixed + 20 - 40 + 10 @@ -719,7 +728,7 @@ - + 0 0 diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc index e9681b95..fc79d811 100644 --- a/src/gui/qt/resources/pokerth_android.qrc +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -538,5 +538,6 @@ android-data/translations/pokerth_zhcn.qm android-data/misc/agpl.html android-data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml + android-data/gfx/gui/table/default_800x480/table_dark.png