diff --git a/data/gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml b/data/gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml index 9babdf86..6deef572 100755 --- a/data/gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml +++ b/data/gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml @@ -46,10 +46,10 @@ - - - - + + + + diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index a3dd2ca0..af3477b0 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -95,8 +95,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) #ifdef GUI_800x480 tabsDiag = new QDialog(this); tabs.setupUi(tabsDiag); + textLabel_handLabel->hide(); #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); diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 2659ae22..f7daaaa9 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -56,6 +56,19 @@ 0 + + + + Qt::Vertical + + + + 20 + 13 + + + + @@ -71,7 +84,7 @@ 5 - + 60 @@ -79,7 +92,7 @@ - QObject {font: bold 20px} + QLabel {font: bold 20px} Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -87,7 +100,7 @@ - + 60 @@ -95,7 +108,7 @@ - QObject {font: bold 20px} + QLabel {font: bold 20px} @@ -115,7 +128,7 @@ 20 - 17 + 13 @@ -803,6 +816,42 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 13 + + + + + + + + + + + 0 + 19 + + + + + 16777215 + 19 + + + + + + + + + @@ -811,7 +860,7 @@ p, li { white-space: pre-wrap; } 20 - 18 + 13 @@ -1838,6 +1887,19 @@ p, li { white-space: pre-wrap; } 0 + + + + Qt::Vertical + + + + 20 + 13 + + + + @@ -1853,7 +1915,7 @@ p, li { white-space: pre-wrap; } 5 - + 60 @@ -1861,7 +1923,7 @@ p, li { white-space: pre-wrap; } - QLabel {font: bold 20px} + QObject {font: bold 20px} Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1869,7 +1931,7 @@ p, li { white-space: pre-wrap; } - + 60 @@ -1877,7 +1939,7 @@ p, li { white-space: pre-wrap; } - QLabel {font: bold 20px} + QObject {font: bold 20px} @@ -2245,7 +2307,7 @@ p, li { white-space: pre-wrap; } 20 - 28 + 13 @@ -2585,6 +2647,42 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 13 + + + + + + + + + + + 0 + 19 + + + + + 16777215 + 19 + + + + + + + + + @@ -2593,7 +2691,7 @@ p, li { white-space: pre-wrap; } 20 - 18 + 13 @@ -4517,7 +4615,7 @@ p, li { white-space: pre-wrap; } 0 0 800 - 26 + 21 diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc index 52e97eb8..10b8894a 100644 --- a/src/gui/qt/resources/pokerth.qrc +++ b/src/gui/qt/resources/pokerth.qrc @@ -56,6 +56,8 @@ document-revert.png view-fullscreen_50x50.png preferences-desktop_50x50.png + tab-close.png + tab-new-background.png cflags/ad.png diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index ddd94636..aeab7590 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -56,8 +56,8 @@ GameTableStyleReader::GameTableStyleReader(ConfigFile *c, QWidget *w) tabBarPaddingTop = "0"; tabBarPaddingSide = "9"; textBrowserFontsize= "10"; - cashFontSize = "10"; - setLabelFontSize = "10"; + cashFontSize = "12"; + setLabelFontSize = "13"; playerNameLabelFontSize = "11"; smallBoardFontSize = "13"; bigBoardFontSize = "17";