diff --git a/data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml b/data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml index 2615bf3b..ee53097e 100755 --- a/data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml +++ b/data/gfx/gui/table/default_800x480/android_tablestyle_800x480.xml @@ -113,7 +113,7 @@ - + diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 749b7d23..a3dd2ca0 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -96,6 +96,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) tabsDiag = new QDialog(this); tabs.setupUi(tabsDiag); #ifdef ANDROID + textLabel_handLabel->hide(); 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); @@ -127,8 +128,6 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) tabWidget_Right->removeTab(2); tabWidget_Right->setCurrentIndex(0); } - - textLabel_handLabel->hide(); #endif // userWidgetsArray init @@ -858,15 +857,17 @@ void gameTableImpl::initGui(int speed) #ifndef GUI_800x480 label_Pot->setText(PotString); #endif - label_Sets->setText(BetsString+":"); + label_handNumber->setText(HandString+":"); label_gameNumber->setText(GameString+":"); #ifdef GUI_800x480 - label_Total->setText(":"+TotalString); + label_Sets->setText(BetsString); + label_Total->setText(TotalString); tabs.groupBox_RightToolBox->setDisabled(FALSE); tabs.groupBox_LeftToolBox->setDisabled(FALSE); #else label_Total->setText(TotalString+":"); + label_Sets->setText(BetsString+":"); groupBox_RightToolBox->setDisabled(FALSE); groupBox_LeftToolBox->setDisabled(FALSE); #endif diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 5e3e6a66..2659ae22 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -2922,10 +2922,16 @@ p, li { white-space: pre-wrap; } - -1 + 10 + + + 10 + + + 10 - + Qt::Horizontal @@ -2939,11 +2945,11 @@ p, li { white-space: pre-wrap; } - - - 50 - 14 - + + + 0 + 0 + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2960,22 +2966,13 @@ p, li { white-space: pre-wrap; } - 100 - 21 - - - - - 100 + 120 21 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - 4 - @@ -2983,9 +2980,12 @@ p, li { white-space: pre-wrap; } Qt::Horizontal + + QSizePolicy::Fixed + - 40 + 5 20 @@ -2995,14 +2995,8 @@ p, li { white-space: pre-wrap; } - 120 - 21 - - - - - 120 - 21 + 30 + 0 @@ -3015,9 +3009,12 @@ p, li { white-space: pre-wrap; } Qt::Horizontal + + QSizePolicy::Fixed + - 40 + 5 20 @@ -3033,13 +3030,7 @@ p, li { white-space: pre-wrap; } - 100 - 21 - - - - - 100 + 120 21 @@ -3050,22 +3041,19 @@ p, li { white-space: pre-wrap; } - - - 50 - 14 - + + + 0 + 0 + - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 4 + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + Qt::Horizontal