sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:/pokerth/pokerth

Browse Source
This commit is contained in:
lotodore
2012-06-01 21:27:29 +02:00
parent 26a152c157 c01bd1c057
commit 730171f0ac
7 changed files with 1782 additions and 1754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/gfx/gui/table/default_800x480/playerSeatActive.png
Executable → Regular
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 996 B

After

Width:  |  Height:  |  Size: 1.5 KiB

data/gfx/gui/table/default_800x480/playerSeatActive_old.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 996 B

data/gfx/gui/table/default_800x480/playerSeatActive_old_old.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

data/gfx/gui/table/default_800x480/playerSeatInactive.png
Executable → Regular
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 560 B

data/gfx/gui/table/default_800x480/playerSeatInactive_old.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 533 B

src/gui/qt/gui_800x480/gametable_800x480.ui
+361 -361
View File
File diff suppressed because it is too large Load Diff
src/gui/qt/styles/gametablestylereader.cpp
+36 -8
View File
@@ -35,23 +35,52 @@ GameTableStyleReader::GameTableStyleReader(ConfigFile *c, QWidget *w)
bigBoardFontSize = "18"; bigBoardFontSize = "18";
humanPlayerButtonFontSize = "13"; humanPlayerButtonFontSize = "13";
betValueFontSize = "11"; betValueFontSize = "11";
tabBarPaddingTop = "2"; tabBarPaddingTop = "2";
tabBarPaddingSide = "10"; tabBarPaddingSide = "10";
#else #elif __APPLE__
#ifdef __APPLE__
font1String = "font-family: \"Lucida Grande\";"; font1String = "font-family: \"Lucida Grande\";";
font2String = "font-family: \"Lucida Grande\";"; font2String = "font-family: \"Lucida Grande\";";
tabBarPaddingTop = "1"; tabBarPaddingTop = "1";
tabBarPaddingSide = "9"; tabBarPaddingSide = "9";
#else textBrowserFontsize= "10";
cashFontSize = "10";
setLabelFontSize = "10";
playerNameLabelFontSize = "11";
smallBoardFontSize = "13";
bigBoardFontSize = "17";
humanPlayerButtonFontSize = "12";
betValueFontSize = "10";
#elif MAEMO
font1String = "font-family: \"Nimbus Sans L\";";
font2String = "font-family: \"DejaVu Sans\";";
tabBarPaddingTop = "0";
tabBarPaddingSide = "9";
textBrowserFontsize= "10";
cashFontSize = "10";
setLabelFontSize = "10";
playerNameLabelFontSize = "11";
smallBoardFontSize = "13";
bigBoardFontSize = "17";
humanPlayerButtonFontSize = "12";
betValueFontSize = "10";
#elif ANDROID
font1String = "font-family: \"Nimbus Sans L\";";
font2String = "font-family: \"DejaVu Sans\";";
tabBarPaddingTop = "0";
tabBarPaddingSide = "9";
textBrowserFontsize= "10";
cashFontSize = "13";
setLabelFontSize = "13";
playerNameLabelFontSize = "11";
smallBoardFontSize = "13";
bigBoardFontSize = "17";
humanPlayerButtonFontSize = "12";
betValueFontSize = "10";
#else //Linux
font1String = "font-family: \"Nimbus Sans L\";"; font1String = "font-family: \"Nimbus Sans L\";";
font2String = "font-family: \"DejaVu Sans\";"; font2String = "font-family: \"DejaVu Sans\";";
tabBarPaddingTop = "0"; tabBarPaddingTop = "0";
tabBarPaddingSide = "9"; tabBarPaddingSide = "9";
#endif
textBrowserFontsize= "10"; textBrowserFontsize= "10";
cashFontSize = "10"; cashFontSize = "10";
setLabelFontSize = "10"; setLabelFontSize = "10";
@@ -61,7 +90,6 @@ GameTableStyleReader::GameTableStyleReader(ConfigFile *c, QWidget *w)
humanPlayerButtonFontSize = "12"; humanPlayerButtonFontSize = "12";
betValueFontSize = "10"; betValueFontSize = "10";
#endif #endif
} }