From 439b05e5f2c617803d3715811ab91decb540102c Mon Sep 17 00:00:00 2001 From: doitux Date: Tue, 5 Jun 2012 01:43:37 +0200 Subject: [PATCH] game table changes for mobile gui --- .../table/default_800x480/cardholder_flop.png | Bin 3601 -> 388 bytes .../default_800x480/cardholder_river.png | Bin 3528 -> 361 bytes .../table/default_800x480/cardholder_turn.png | Bin 3650 -> 390 bytes pokerth_game.pro | 5 +- src/gui/qt/gametable/gametableimpl.cpp | 14 +- src/gui/qt/gui_800x480/gametable_800x480.ui | 445 +++++++++--------- src/gui/qt/styles/gametablestylereader.cpp | 2 +- 7 files changed, 224 insertions(+), 242 deletions(-) mode change 100755 => 100644 data/gfx/gui/table/default_800x480/cardholder_flop.png mode change 100755 => 100644 data/gfx/gui/table/default_800x480/cardholder_river.png mode change 100755 => 100644 data/gfx/gui/table/default_800x480/cardholder_turn.png diff --git a/data/gfx/gui/table/default_800x480/cardholder_flop.png b/data/gfx/gui/table/default_800x480/cardholder_flop.png old mode 100755 new mode 100644 index 818e1b18fc6a77212128dd51204147ed06f06c7c..42f72135cc83f7e8222f84fd6fd23821837c86c9 GIT binary patch delta 372 zcmbOz)51JKvYv&3fnlrWdnq8rSRCZ;#IWw1%u67LDaqU2h2ejD|C#+j9%q3^WHAE+ zw=f7ZGR&GI0Tg5}@$_|NzsbVP!O3utk!1$Z1P)IZ$B>MBZ*ST99d;0Cdsu!g=YUh7 z7Z=wKN!t!%#k>QY84oyQ7{n(AcpZ?CnYPfeK7lpxpw3zIs}Xu~XZx2$F`M_W9q!;f zuDN69&WSeso4@KMPW)ZA#Werf$f&$PBiezkjk%N`~vaJgIZzxf0**CoRkS|Fnv(-eGnxxA2!| z>-jfxj#qIP*`Dm*v2bzs;XL)9hM#YoTIPGFJLYe5?|bKl6K1bs{#K>kJ$A=xYar10 zUA^@+{Qo!h#<6c|Qn&dY`s{0ux|elS=la#Mnx*qIuGG|g;^VyFU)n8{!UYT{22WQ% Jmvv4FO#o1rnP>n2 literal 3601 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 literal 3528 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 Nc)I$ztaD0e0svd9oU{M{ literal 3650 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 tabWidget_Right->setCurrentIndex(0); } + + textLabel_handLabel->hide(); #endif // userWidgetsArray init @@ -856,15 +858,15 @@ void gameTableImpl::initGui(int speed) #ifndef GUI_800x480 label_Pot->setText(PotString); #endif - label_Total->setText(TotalString+":"); - label_Sets->setText(BetsString+":"); + label_Sets->setText(BetsString+":"); label_handNumber->setText(HandString+":"); label_gameNumber->setText(GameString+":"); - #ifdef GUI_800x480 + label_Total->setText(":"+TotalString); tabs.groupBox_RightToolBox->setDisabled(FALSE); tabs.groupBox_LeftToolBox->setDisabled(FALSE); #else + label_Total->setText(TotalString+":"); groupBox_RightToolBox->setDisabled(FALSE); groupBox_LeftToolBox->setDisabled(FALSE); #endif @@ -4058,9 +4060,9 @@ void gameTableImpl::refreshGameTableStyle() myGameTableStyle->setPlayerNameLabelStyle(playerNameLabelArray[i]); } - myGameTableStyle->setSmallFontBoardStyle(label_Sets); - myGameTableStyle->setSmallFontBoardStyle(label_Total); #ifdef GUI_800x480 + myGameTableStyle->setBigFontBoardStyle(label_Sets); + myGameTableStyle->setBigFontBoardStyle(label_Total); myGameTableStyle->setBigFontBoardStyle(textLabel_Sets); myGameTableStyle->setBigFontBoardStyle(textLabel_Pot); myGameTableStyle->setBigFontBoardStyle(label_handNumber); @@ -4069,6 +4071,8 @@ void gameTableImpl::refreshGameTableStyle() myGameTableStyle->setBigFontBoardStyle(label_gameNumberValue); myGameTableStyle->setBigFontBoardStyle(textLabel_handLabel); #else + myGameTableStyle->setSmallFontBoardStyle(label_Sets); + myGameTableStyle->setSmallFontBoardStyle(label_Total); myGameTableStyle->setSmallFontBoardStyle(textLabel_Sets); myGameTableStyle->setSmallFontBoardStyle(textLabel_Pot); myGameTableStyle->setSmallFontBoardStyle(label_handNumber); diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 8002a5fa..5e3e6a66 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -56,21 +56,20 @@ 0 - - - - Qt::Vertical - - - - 20 - 40 - - - - + + 5 + + + 5 + + + 5 + + + 5 + @@ -79,12 +78,6 @@ 19 - - - 60 - 19 - - QObject {font: bold 20px} @@ -101,12 +94,6 @@ 19 - - - 60 - 19 - - QObject {font: bold 20px} @@ -178,8 +165,8 @@ - 12 - 6 + 11 + 8 136 15 @@ -206,22 +193,22 @@ - 56 - 104 - 90 - 13 + 57 + 123 + 100 + 15 - 90 - 13 + 100 + 15 - 90 - 13 + 100 + 15 @@ -231,22 +218,22 @@ - 50 - 20 + 54 + 22 90 - 13 + 15 90 - 13 + 15 90 - 13 + 15 @@ -256,7 +243,7 @@ - 21 + 23 86 28 28 @@ -284,8 +271,8 @@ - 68 - 30 + 71 + 37 48 76 @@ -309,8 +296,8 @@ - 90 - 30 + 95 + 37 48 76 @@ -334,8 +321,8 @@ - 52 - 46 + 57 + 68 100 40 @@ -362,7 +349,7 @@ - 12 + 11 77 50 7 @@ -527,7 +514,7 @@ p, li { white-space: pre-wrap; } 11 - 116 + 115 136 15 @@ -554,21 +541,21 @@ p, li { white-space: pre-wrap; } - 0 + 57 0 - 155 + 100 15 - 155 + 100 15 - 155 + 100 15 @@ -579,7 +566,7 @@ p, li { white-space: pre-wrap; } - 56 + 54 101 90 15 @@ -633,7 +620,7 @@ p, li { white-space: pre-wrap; } 71 - 24 + 25 48 76 @@ -710,7 +697,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 55 50 7 @@ -881,8 +868,8 @@ p, li { white-space: pre-wrap; } - 12 - 6 + 11 + 8 136 15 @@ -912,22 +899,22 @@ p, li { white-space: pre-wrap; } - 56 - 104 - 90 - 13 + 57 + 123 + 100 + 15 - 90 - 13 + 100 + 15 - 90 - 13 + 100 + 15 @@ -937,22 +924,22 @@ p, li { white-space: pre-wrap; } - 50 - 20 + 54 + 22 90 - 13 + 15 90 - 13 + 15 90 - 13 + 15 @@ -962,7 +949,7 @@ p, li { white-space: pre-wrap; } - 21 + 23 86 28 28 @@ -990,8 +977,8 @@ p, li { white-space: pre-wrap; } - 68 - 30 + 71 + 37 48 76 @@ -1015,8 +1002,8 @@ p, li { white-space: pre-wrap; } - 90 - 30 + 95 + 37 48 76 @@ -1040,8 +1027,8 @@ p, li { white-space: pre-wrap; } - 52 - 46 + 57 + 68 100 40 @@ -1068,7 +1055,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 77 50 7 @@ -1219,8 +1206,8 @@ p, li { white-space: pre-wrap; } - 12 - 6 + 11 + 8 136 15 @@ -1247,22 +1234,22 @@ p, li { white-space: pre-wrap; } - 56 - 104 - 90 - 13 + 57 + 123 + 100 + 15 - 90 - 13 + 100 + 15 - 90 - 13 + 100 + 15 @@ -1272,22 +1259,22 @@ p, li { white-space: pre-wrap; } - 50 - 20 + 54 + 22 90 - 13 + 15 90 - 13 + 15 90 - 13 + 15 @@ -1297,7 +1284,7 @@ p, li { white-space: pre-wrap; } - 21 + 23 86 28 28 @@ -1325,8 +1312,8 @@ p, li { white-space: pre-wrap; } - 68 - 30 + 71 + 37 48 76 @@ -1350,8 +1337,8 @@ p, li { white-space: pre-wrap; } - 90 - 30 + 95 + 37 48 76 @@ -1375,8 +1362,8 @@ p, li { white-space: pre-wrap; } - 52 - 46 + 57 + 68 100 40 @@ -1403,7 +1390,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 77 50 7 @@ -1554,8 +1541,8 @@ p, li { white-space: pre-wrap; } - 12 - 6 + 11 + 8 136 15 @@ -1582,22 +1569,22 @@ p, li { white-space: pre-wrap; } - 56 - 104 - 90 - 13 + 57 + 123 + 100 + 15 - 90 - 13 + 100 + 15 - 90 - 13 + 100 + 15 @@ -1607,22 +1594,22 @@ p, li { white-space: pre-wrap; } - 50 - 20 + 54 + 22 90 - 13 + 15 90 - 13 + 15 90 - 13 + 15 @@ -1632,7 +1619,7 @@ p, li { white-space: pre-wrap; } - 21 + 23 86 28 28 @@ -1660,8 +1647,8 @@ p, li { white-space: pre-wrap; } - 68 - 30 + 71 + 37 48 76 @@ -1685,8 +1672,8 @@ p, li { white-space: pre-wrap; } - 90 - 30 + 95 + 37 48 76 @@ -1710,8 +1697,8 @@ p, li { white-space: pre-wrap; } - 52 - 46 + 57 + 68 100 40 @@ -1738,7 +1725,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 77 50 7 @@ -1851,21 +1838,20 @@ p, li { white-space: pre-wrap; } 0 - - - - Qt::Vertical - - - - 20 - 40 - - - - + + 5 + + + 5 + + + 5 + + + 5 + @@ -1874,12 +1860,6 @@ p, li { white-space: pre-wrap; } 19 - - - 60 - 19 - - QLabel {font: bold 20px} @@ -1896,12 +1876,6 @@ p, li { white-space: pre-wrap; } 19 - - - 60 - 19 - - QLabel {font: bold 20px} @@ -1973,8 +1947,8 @@ p, li { white-space: pre-wrap; } - 12 - 6 + 11 + 8 136 15 @@ -2001,22 +1975,22 @@ p, li { white-space: pre-wrap; } - 56 - 104 - 90 - 13 + 57 + 123 + 100 + 15 - 90 - 13 + 100 + 15 - 90 - 13 + 100 + 15 @@ -2026,22 +2000,22 @@ p, li { white-space: pre-wrap; } - 50 - 20 + 54 + 22 90 - 13 + 15 90 - 13 + 15 90 - 13 + 15 @@ -2051,7 +2025,7 @@ p, li { white-space: pre-wrap; } - 21 + 23 86 28 28 @@ -2079,8 +2053,8 @@ p, li { white-space: pre-wrap; } - 68 - 30 + 71 + 37 48 76 @@ -2104,8 +2078,8 @@ p, li { white-space: pre-wrap; } - 90 - 30 + 95 + 37 48 76 @@ -2129,8 +2103,8 @@ p, li { white-space: pre-wrap; } - 52 - 46 + 57 + 68 100 40 @@ -2157,7 +2131,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 77 50 7 @@ -2322,7 +2296,7 @@ p, li { white-space: pre-wrap; } 11 - 116 + 115 136 15 @@ -2349,21 +2323,21 @@ p, li { white-space: pre-wrap; } - 0 + 57 0 - 155 + 100 15 - 155 + 100 15 - 155 + 100 15 @@ -2374,7 +2348,7 @@ p, li { white-space: pre-wrap; } - 56 + 54 101 90 15 @@ -2428,7 +2402,7 @@ p, li { white-space: pre-wrap; } 71 - 24 + 25 48 76 @@ -2505,7 +2479,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 55 50 7 @@ -2691,7 +2665,7 @@ p, li { white-space: pre-wrap; } - 309 + 299 3 48 76 @@ -2716,7 +2690,7 @@ p, li { white-space: pre-wrap; } - 102 + 107 3 48 76 @@ -2741,7 +2715,7 @@ p, li { white-space: pre-wrap; } - 99 + 104 0 54 82 @@ -2766,7 +2740,7 @@ p, li { white-space: pre-wrap; } - 30 + 40 0 54 82 @@ -2791,7 +2765,7 @@ p, li { white-space: pre-wrap; } - 33 + 43 3 48 76 @@ -2816,7 +2790,7 @@ p, li { white-space: pre-wrap; } - 306 + 296 0 54 82 @@ -2891,7 +2865,7 @@ p, li { white-space: pre-wrap; } - 237 + 232 0 54 82 @@ -2916,7 +2890,7 @@ p, li { white-space: pre-wrap; } - 240 + 235 3 48 76 @@ -2971,12 +2945,6 @@ p, li { white-space: pre-wrap; } 14 - - - 50 - 14 - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2984,6 +2952,12 @@ p, li { white-space: pre-wrap; } + + + 0 + 0 + + 100 @@ -3050,17 +3024,23 @@ p, li { white-space: pre-wrap; } - + + + + 0 + 0 + + - 50 - 14 + 100 + 21 - 50 - 14 + 100 + 21 @@ -3069,17 +3049,11 @@ p, li { white-space: pre-wrap; } - + - 100 - 21 - - - - - 100 - 21 + 50 + 14 @@ -3169,7 +3143,7 @@ p, li { white-space: pre-wrap; } 11 - 116 + 115 136 15 @@ -3196,21 +3170,21 @@ p, li { white-space: pre-wrap; } - 0 + 57 0 - 155 + 100 15 - 155 + 100 15 - 155 + 100 15 @@ -3221,7 +3195,7 @@ p, li { white-space: pre-wrap; } - 56 + 54 101 90 15 @@ -3275,7 +3249,7 @@ p, li { white-space: pre-wrap; } 71 - 24 + 25 48 76 @@ -3352,7 +3326,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 55 50 7 @@ -3504,7 +3478,7 @@ p, li { white-space: pre-wrap; } 11 - 116 + 115 136 15 @@ -3531,21 +3505,21 @@ p, li { white-space: pre-wrap; } - 0 + 57 0 - 155 + 100 15 - 155 + 100 15 - 155 + 100 15 @@ -3556,7 +3530,7 @@ p, li { white-space: pre-wrap; } - 56 + 54 101 90 15 @@ -3613,7 +3587,7 @@ p, li { white-space: pre-wrap; } 71 - 24 + 25 48 76 @@ -3687,7 +3661,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 55 50 7 @@ -3864,7 +3838,7 @@ p, li { white-space: pre-wrap; } 11 - 116 + 115 136 15 @@ -3891,21 +3865,21 @@ p, li { white-space: pre-wrap; } - 0 + 57 0 - 155 + 100 15 - 155 + 100 15 - 155 + 100 13 @@ -3916,7 +3890,7 @@ p, li { white-space: pre-wrap; } - 56 + 54 101 90 15 @@ -3970,7 +3944,7 @@ p, li { white-space: pre-wrap; } 71 - 24 + 25 48 76 @@ -4047,7 +4021,7 @@ p, li { white-space: pre-wrap; } - 12 + 11 55 50 7 @@ -4536,10 +4510,13 @@ p, li { white-space: pre-wrap; } Qt::Vertical + + QSizePolicy::Maximum + 20 - 40 + 30 diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index 2554e839..ddd94636 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -69,7 +69,7 @@ GameTableStyleReader::GameTableStyleReader(ConfigFile *c, QWidget *w) tabBarPaddingTop = "0"; tabBarPaddingSide = "9"; textBrowserFontsize= "10"; - cashFontSize = "13"; + cashFontSize = "12"; setLabelFontSize = "13"; playerNameLabelFontSize = "11"; smallBoardFontSize = "13";