diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml index 8dd5c92c..9cbfaa64 100644 --- a/data/gfx/gui/table/default/defaulttablestyle.xml +++ b/data/gfx/gui/table/default/defaulttablestyle.xml @@ -41,6 +41,11 @@ + + + + + @@ -93,6 +98,10 @@ + + + + \ No newline at end of file diff --git a/data/gfx/gui/table/default/radiobutton_checked.png b/data/gfx/gui/table/default/radiobutton_checked.png new file mode 100644 index 00000000..613fc624 Binary files /dev/null and b/data/gfx/gui/table/default/radiobutton_checked.png differ diff --git a/data/gfx/gui/table/default/radiobutton_checked_hover.png b/data/gfx/gui/table/default/radiobutton_checked_hover.png new file mode 100644 index 00000000..6239c23a Binary files /dev/null and b/data/gfx/gui/table/default/radiobutton_checked_hover.png differ diff --git a/data/gfx/gui/table/default/radiobutton_pressed.png b/data/gfx/gui/table/default/radiobutton_pressed.png new file mode 100644 index 00000000..149bc663 Binary files /dev/null and b/data/gfx/gui/table/default/radiobutton_pressed.png differ diff --git a/data/gfx/gui/table/default/radiobutton_unchecked.png b/data/gfx/gui/table/default/radiobutton_unchecked.png new file mode 100644 index 00000000..6ac3f963 Binary files /dev/null and b/data/gfx/gui/table/default/radiobutton_unchecked.png differ diff --git a/data/gfx/gui/table/default/radiobutton_unchecked_hover.png b/data/gfx/gui/table/default/radiobutton_unchecked_hover.png new file mode 100644 index 00000000..e6841e61 Binary files /dev/null and b/data/gfx/gui/table/default/radiobutton_unchecked_hover.png differ diff --git a/pokerth_game.pro b/pokerth_game.pro index 7e6c5de7..c110045a 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -7,8 +7,8 @@ isEmpty( PREFIX ){ TEMPLATE = app CODECFORSRC = UTF-8 -CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release -#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug +#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release +CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug #####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt) #QTPLUGIN += qjpeg qgif diff --git a/pokerth_lib.pro b/pokerth_lib.pro index d0126fcc..97c88aaa 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -3,8 +3,8 @@ TEMPLATE = lib CODECFORSRC = UTF-8 -CONFIG += staticlib thread exceptions rtti stl warn_on release -#CONFIG += staticlib thread exceptions rtti stl warn_on debug +#CONFIG += staticlib thread exceptions rtti stl warn_on release +CONFIG += staticlib thread exceptions rtti stl warn_on debug UI_DIR = uics TARGET = lib/pokerth_lib diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index a665e662..11862d79 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1,8 +1,7 @@ - - + gameTable - - + + 0 0 @@ -10,55 +9,55 @@ 600 - + 1024 600 - + 1920 1280 - + false - + PokerTH 0.6-beta - The Open-Source Texas Holdem Engine - - QStatusbar { height:0px; } + + QStatusbar { height:0px; } - - - + + + 2 - + 0 - + 2 - + 3 - + 0 - - - + + + 0 - - + + Qt::Vertical - + 20 17 @@ -67,24 +66,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -92,24 +91,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -117,24 +116,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -142,24 +141,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -167,21 +166,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -189,27 +188,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -217,12 +216,12 @@ 76 - + true - - + + 110 39 @@ -230,12 +229,12 @@ 76 - + true - - + + 67 55 @@ -243,27 +242,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 13 @@ -272,24 +271,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -297,24 +296,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -322,24 +321,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -347,24 +346,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -372,21 +371,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 16 @@ -394,27 +393,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -422,12 +421,12 @@ 76 - + true - - + + 110 26 @@ -435,12 +434,12 @@ 76 - + true - - + + 67 42 @@ -448,27 +447,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 18 @@ -478,30 +477,30 @@ - - - + + + 0 - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -509,24 +508,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -534,24 +533,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -559,24 +558,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -584,21 +583,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -606,27 +605,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -634,12 +633,12 @@ 76 - + true - - + + 110 39 @@ -647,12 +646,12 @@ 76 - + true - - + + 67 55 @@ -660,40 +659,40 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -701,24 +700,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -726,24 +725,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -751,24 +750,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -776,21 +775,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -798,27 +797,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -826,12 +825,12 @@ 76 - + true - - + + 110 39 @@ -839,12 +838,12 @@ 76 - + true - - + + 67 55 @@ -852,40 +851,40 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -893,24 +892,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -918,24 +917,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -943,24 +942,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -968,21 +967,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -990,27 +989,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -1018,12 +1017,12 @@ 76 - + true - - + + 110 39 @@ -1031,12 +1030,12 @@ 76 - + true - - + + 67 55 @@ -1044,16 +1043,16 @@ 40 - + 0 20 - + - + Qt::AlignCenter @@ -1061,17 +1060,17 @@ - - - + + + 0 - - + + Qt::Vertical - + 20 13 @@ -1080,24 +1079,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -1105,24 +1104,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -1130,24 +1129,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -1155,24 +1154,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -1180,21 +1179,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -1202,27 +1201,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -1230,12 +1229,12 @@ 76 - + true - - + + 110 39 @@ -1243,12 +1242,12 @@ 76 - + true - - + + 67 55 @@ -1256,27 +1255,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 28 @@ -1285,24 +1284,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -1310,24 +1309,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -1335,24 +1334,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -1360,24 +1359,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -1385,21 +1384,21 @@ 12 - + 35 12 - + 16777215 12 - - + + 18 16 @@ -1407,27 +1406,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -1435,12 +1434,12 @@ 76 - + true - - + + 110 26 @@ -1448,12 +1447,12 @@ 76 - + true - - + + 67 40 @@ -1461,27 +1460,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 18 @@ -1491,12 +1490,12 @@ - - - + + + Qt::Vertical - + 20 40 @@ -1504,14 +1503,14 @@ - - + + - - + + Qt::Horizontal - + 40 20 @@ -1520,30 +1519,30 @@ - - - + + + 0 0 - + 535 94 - + 535 94 - - QGroupBox {border-style:none;} + + QGroupBox {border-style:none;} - - + + 440 42 @@ -1551,58 +1550,58 @@ 36 - + 90 0 - + 90 16777215 - - + + 0 - + 2 - + 0 - - + + - - - + + + - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - - + + 0 15 @@ -1610,54 +1609,54 @@ 62 - - + + 4 - + 0 - - + + - + Qt::AlignCenter - - + + 0 - + 2 - + 0 - - - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - - - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1666,8 +1665,8 @@ - - + + 440 15 @@ -1675,12 +1674,12 @@ 22 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + 140 5 @@ -1688,12 +1687,12 @@ 82 - + true - - + + 195 5 @@ -1701,12 +1700,12 @@ 82 - + true - - + + 250 5 @@ -1714,12 +1713,12 @@ 82 - + true - - + + 305 5 @@ -1727,12 +1726,12 @@ 82 - + true - - + + 360 5 @@ -1740,12 +1739,12 @@ 82 - + true - - + + 143 8 @@ -1753,12 +1752,12 @@ 76 - + true - - + + 198 8 @@ -1766,12 +1765,12 @@ 76 - + true - - + + 253 8 @@ -1779,12 +1778,12 @@ 76 - + true - - + + 308 8 @@ -1792,12 +1791,12 @@ 76 - + true - - + + 363 8 @@ -1805,18 +1804,18 @@ 76 - + true - - + + Qt::Horizontal - + 40 20 @@ -1826,12 +1825,12 @@ - - - + + + Qt::Vertical - + 20 40 @@ -1839,30 +1838,30 @@ - - - + + + 0 - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -1870,24 +1869,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -1895,24 +1894,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -1920,24 +1919,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -1945,21 +1944,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 16 @@ -1967,27 +1966,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -1995,12 +1994,12 @@ 76 - + true - - + + 110 26 @@ -2008,12 +2007,12 @@ 76 - + true - - + + 67 42 @@ -2021,40 +2020,40 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -2062,24 +2061,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -2087,24 +2086,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -2112,24 +2111,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -2137,21 +2136,21 @@ 12 - + 35 12 - + 16777215 12 - - + + 18 16 @@ -2159,27 +2158,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -2187,12 +2186,12 @@ 76 - + true - - + + 110 26 @@ -2200,12 +2199,12 @@ 76 - + true - - + + 67 42 @@ -2213,40 +2212,40 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -2254,24 +2253,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -2279,24 +2278,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -2304,24 +2303,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -2329,21 +2328,21 @@ 12 - + 35 12 - + 16777215 12 - - + + 18 16 @@ -2351,27 +2350,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -2379,12 +2378,12 @@ 76 - + true - - + + 110 26 @@ -2392,12 +2391,12 @@ 76 - + true - - + + 67 40 @@ -2405,16 +2404,16 @@ 40 - + 0 20 - + - + Qt::AlignCenter @@ -2422,25 +2421,25 @@ - - + + - - + + 0 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 260 0 @@ -2450,13 +2449,13 @@ - + Qt::Vertical - + QSizePolicy::Expanding - + 0 0 @@ -2465,120 +2464,120 @@ - - + + 260 188 - + 260 188 - - + + 4 - - - + + + Qt::NoFocus - + 0 - - + + Hands - - + + 0 - + 0 - - - + + + Qt::AlignCenter - - + + Chat - - + + 0 - + 0 - - - + + + Qt::NoFocus - + true - + Qt::ScrollBarAlwaysOff - - + + - - + + Kick - - + + 0 - + 6 - + 5 - - - + + + 0 - - + + 5 - - + + Vote started by: - - - + + + 0 0 - + @@ -2586,26 +2585,26 @@ - - + + 5 - - + + Vote Timeout: - - - + + + 0 0 - + @@ -2614,62 +2613,62 @@ - - - - + + + + 0 0 - + - - + + - - + + 80 20 - + Yes - - + + 80 20 - + No - - - + + + - - - + + + Qt::Vertical - + 20 27 @@ -2688,13 +2687,13 @@ - + Qt::Horizontal - + QSizePolicy::MinimumExpanding - + 155 0 @@ -2703,58 +2702,58 @@ - - + + true - - + + 0 0 - + 160 - 186 + 188 - + 160 - 186 + 188 - - QGroupBox {border-style:none;} + + QGroupBox {border-style:none;} - + - - + + 0 - + 1 - + 0 - - - + + + 2 - - + + 0 21 - + 16777215 21 @@ -2763,220 +2762,129 @@ - - + + 85 25 - + 85 25 - + Qt::NoFocus - - - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - + + + Qt::NoFocus - + 99999 - + 10 - + Qt::Horizontal - + QSlider::NoTicks - + 10 - - - - + + + + 0 0 - + 160 35 - + 160 35 - + Qt::NoFocus - - - - + + + + 0 0 - + 160 35 - + 160 35 - + Qt::NoFocus - - - - + + + + 0 0 - + 160 35 - + 160 35 - + Qt::NoFocus - - - + + + Qt::Vertical - + 20 0 @@ -2984,12 +2892,12 @@ - - - + + + Qt::Vertical - + 20 0 @@ -3002,13 +2910,13 @@ - + Qt::Horizontal - + QSizePolicy::MinimumExpanding - + 155 0 @@ -3017,22 +2925,22 @@ - - + + 0 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 260 0 @@ -3042,13 +2950,13 @@ - + Qt::Vertical - + QSizePolicy::Expanding - + 0 0 @@ -3057,107 +2965,107 @@ - - + + 260 188 - + 260 188 - - + + 1 - + 2 - + 4 - - - + + + Qt::NoFocus - + 0 - - + + Log - - + + 0 - + 0 - - - + + + Qt::NoFocus - + true - + Qt::ScrollBarAlwaysOff - - + + Away - - - - + + + + Qt::NoFocus - + Manual Action (default) - + true - - - + + + Qt::NoFocus - + Auto-Check / Auto-Fold - - - + + + Qt::NoFocus - + Auto-Check / Auto-Call-Any - + - + Qt::Vertical - + 20 40 @@ -3167,29 +3075,29 @@ - - + + Chance - - + + 1 - + 0 - + 1 - + 1 - + 0 - - - + + + @@ -3198,31 +3106,31 @@ - - - + + + 6 - + 0 - - + + - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3231,18 +3139,18 @@ - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3251,18 +3159,18 @@ - - - + + + 128 128 128 - - - + + + 199 199 199 @@ -3272,34 +3180,34 @@ - + Speed: - - + + 18 0 - + - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3308,18 +3216,18 @@ - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3328,18 +3236,18 @@ - - - + + + 128 128 128 - - - + + + 199 199 199 @@ -3349,136 +3257,45 @@ - + - - - + + + 0 0 - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 40 - 100 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - 40 - 100 - 0 - - - - - - - + Qt::NoFocus - + 1 - + 11 - + Qt::Horizontal - - + + true - + 40 20 - + Qt::NoFocus @@ -3494,162 +3311,162 @@ - - + + 0 0 1024 - 25 + 23 - - + + &View - - - - - - - + + + + + + + - - + + &Settings - + - - + + - - + + Start Local Game ... - + Ctrl+N - - + + Quit - + Ctrl+Q - - + + About PokerTH ... - - + + Settings ... - - + + Create Network Game ... - + Ctrl+O - - + + Join Network Game ... - + Ctrl+J - - - + + + :/gfx/view-fullscreen.png:/gfx/view-fullscreen.png - + Fullscreen - + Ctrl+F - - + + Show/Hide Chat Window - + Ctrl+T - - + + Show/Hide Hands Window - + Show/Hide Hands Window - + Show/Hide Hands Window - + Ctrl+H - - + + Show/Hide Log Window - + Ctrl+L - - + + Internet Game ... - + Ctrl+I - - + + Show/Hide Away Window - + Ctrl+A - - - + + + :/gfx/systemsettings.png:/gfx/systemsettings.png - + Configure PokerTH ... - - - + + + :/gfx/application_exit.png:/gfx/application_exit.png - + Close - + Ctrl+X - - + + Show/Hide Chance Window - + Ctrl+C @@ -3699,7 +3516,7 @@ - + @@ -3708,11 +3525,11 @@ label_speedValue setNum(int) - + 886 624 - + 800 638 diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index f97142e0..1856d4d9 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -2717,7 +2717,7 @@ void gameTableImpl::blinkingStartButtonAnimationAction() { QString style = pushButton_break->styleSheet(); - if(style.contains("QPushButton:enabled { background-color: #145300;")) { + if(style.contains("QPushButton:enabled { background-color: #"+myGameTableStyle->getBreakLobbyButtonBgColor())) { myGameTableStyle->setBreakButtonStyle(pushButton_break,1); } else { @@ -3214,6 +3214,8 @@ void gameTableImpl::refreshGameTableStyle() myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0); myGameTableStyle->setBetValueInputStyle(lineEdit_betValue); + myGameTableStyle->setSliderStyle(horizontalSlider_bet); + myGameTableStyle->setSliderStyle(horizontalSlider_speed); // away radiobuttons myGameTableStyle->setAwayRadioButtonsStyle(radioButton_manualAction); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index d3fbd3dc..5710d172 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -147,6 +147,11 @@ void GameTableStyleReader::readStyleFile(QString file) { else if (itemsList->ValueStr() == "AllInButtonHover") { AllInButtonHover = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonChecked") { AllInButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonCheckedHover") { AllInButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "RadioButtonPressed") { RadioButtonPressed = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "RadioButtonChecked") { RadioButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "RadioButtonCheckedHover") { RadioButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "RadioButtonUnchecked") { RadioButtonUnchecked = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "RadioButtonUncheckedHover") { RadioButtonUncheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "Table") { Table = currentDir+QString::fromUtf8(tempString1.c_str()); } @@ -200,6 +205,10 @@ void GameTableStyleReader::readStyleFile(QString file) { else if (itemsList->ValueStr() == "BetRaiseButtonCheckableTextColor") { BetRaiseButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonTextColor") { AllInButtonTextColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonCheckableTextColor") { AllInButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetSpeedSliderGrooveBgColor") { BetSpeedSliderGrooveBgColor = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetSpeedSliderGrooveBorderColor") { BetSpeedSliderGrooveBorderColor = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetSpeedSliderHandleBgColor") { BetSpeedSliderHandleBgColor = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetSpeedSliderHandleBorderColor") { BetSpeedSliderHandleBorderColor = QString::fromUtf8(tempString1.c_str()); } // SIZES else if (itemsList->ValueStr() == "ChatLogTextSize") { ChatLogTextSize = QString::fromUtf8(tempString1.c_str()); } @@ -245,6 +254,11 @@ void GameTableStyleReader::readStyleFile(QString file) { if(AllInButtonHover == "") { wrongItems << "AllInButtonHover"; } if(AllInButtonChecked == "") { wrongItems << "AllInButtonChecked"; } if(AllInButtonCheckedHover == "") { wrongItems << "AllInButtonCheckedHover"; } + if(RadioButtonPressed == "") { wrongItems << "RadioButtonPressed"; } + if(RadioButtonChecked == "") { wrongItems << "RadioButtonChecked"; } + if(RadioButtonCheckedHover == "") { wrongItems << "RadioButtonCheckedHover"; } + if(RadioButtonUnchecked == "") { wrongItems << "RadioButtonUnchecked"; } + if(RadioButtonUncheckedHover == "") { wrongItems << "RadioButtonUncheckedHover"; } if(PlayerSeatActive == "") { wrongItems << "PlayerSeatActive"; } if(PlayerSeatInActive == "") { wrongItems << "PlayerSeatInActive"; } if(Table == "") { wrongItems << "Table"; } @@ -297,6 +311,10 @@ void GameTableStyleReader::readStyleFile(QString file) { if(BetRaiseButtonCheckableTextColor == "") { wrongItems << "BetRaiseButtonCheckableTextColor"; } if(AllInButtonTextColor == "") { wrongItems << "AllInButtonTextColor"; } if(AllInButtonCheckableTextColor == "") { wrongItems << "AllInButtonCheckableTextColor"; } + if(BetSpeedSliderGrooveBgColor == "") { wrongItems << "BetSpeedSliderGrooveBgColor"; } + if(BetSpeedSliderGrooveBorderColor == "") { wrongItems << "BetSpeedSliderGrooveBorderColor"; } + if(BetSpeedSliderHandleBgColor == "") { wrongItems << "BetSpeedSliderHandleBgColor"; } + if(BetSpeedSliderHandleBorderColor == "") { wrongItems << "BetSpeedSliderHandleBorderColor"; } if(ChatLogTextSize == "") { wrongItems << "ChatLogTextSize"; } //if one or more items are wrong or left show detailed error message @@ -417,7 +435,8 @@ void GameTableStyleReader::setBetValueInputStyle(QLineEdit *bv) void GameTableStyleReader::setAwayRadioButtonsStyle(QRadioButton *rb) { - rb->setStyleSheet("QRadioButton { color: #"+TabWidgetTextColor+"; } QRadioButton::indicator { color: #"+TabWidgetTextColor+"; }"); + rb->setStyleSheet("QRadioButton { color: #"+TabWidgetTextColor+"; } QRadioButton::indicator { width: 13px; height: 13px;} QRadioButton::indicator::checked { image: url("+RadioButtonChecked+");} QRadioButton::indicator::unchecked { image: url("+RadioButtonUnchecked+");} QRadioButton::indicator:unchecked:hover { image: url("+RadioButtonUncheckedHover+");} QRadioButton::indicator:unchecked:pressed { image: url("+RadioButtonPressed+");} QRadioButton::indicator::checked { image: url("+RadioButtonChecked+");} QRadioButton::indicator:checked:hover { image: url("+RadioButtonCheckedHover+");} QRadioButton::indicator:checked:pressed { image: url("+RadioButtonPressed+");}"); + } QString GameTableStyleReader::getActionPic(int action) @@ -533,3 +552,9 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt) } } + +void GameTableStyleReader::setSliderStyle(QSlider *s) +{ + s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+"; height: 3px; background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 4px; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 9px; margin: -6px 0; border-radius: 4px;}"); + +} diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h index a638b70b..2f68a5e2 100644 --- a/src/gui/qt/styles/gametablestylereader.h +++ b/src/gui/qt/styles/gametablestylereader.h @@ -78,6 +78,7 @@ public: void setVoteButtonStyle(QPushButton*); void setVoteStringsStyle(QLabel*); void setBetValueInputStyle(QLineEdit*); + void setSliderStyle(QSlider*); void setTabWidgetStyle(QTabWidget*, QTabBar*); @@ -91,6 +92,7 @@ public: QString getLogWinnerSidePotColor() const { return LogWinnerSidePotColor; } QString getLogPlayerSitsOutColor() const { return LogPlayerSitsOutColor; } QString getLogNewGameAdminColor() const { return LogNewGameAdminColor; } + QString getBreakLobbyButtonBgColor() const { return BreakLobbyButtonBgColor; } private: //style values @@ -137,6 +139,11 @@ private: QString AllInButtonHover; QString AllInButtonChecked; QString AllInButtonCheckedHover; + QString RadioButtonPressed; + QString RadioButtonChecked; + QString RadioButtonCheckedHover; + QString RadioButtonUnchecked; + QString RadioButtonUncheckedHover; QString PlayerSeatInActive; QString PlayerSeatActive; QString Table; @@ -190,6 +197,10 @@ private: QString BetRaiseButtonCheckableTextColor; QString AllInButtonTextColor; QString AllInButtonCheckableTextColor; + QString BetSpeedSliderGrooveBgColor; + QString BetSpeedSliderGrooveBorderColor; + QString BetSpeedSliderHandleBgColor; + QString BetSpeedSliderHandleBorderColor; // SIZES QString ChatLogTextSize;