diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index e1b79f7f..d6256345 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -112,12 +112,13 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) treeView_GameList->setColumnWidth(0,190); treeView_GameList->setColumnWidth(1,65); - treeView_GameList->setColumnWidth(2,65); + treeView_GameList->setColumnWidth(2,65); treeView_GameList->setColumnWidth(3,40); treeView_GameList->setColumnWidth(4,40); #ifdef GUI_800x480 - treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 14px}"); + treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 20px}"); + treeView_GameList->header()->setStyleSheet("QObject {font: bold 18px}"); #else treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}"); #endif @@ -1494,8 +1495,10 @@ void gameLobbyDialogImpl::changeGameListFilter(int index) writeDialogSettings(1); #ifdef GUI_800x480 - if(index) treeView_GameList->setStyleSheet("QTreeView { border-radius: 4px; border: 2px solid blue; background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 14px}"); - else treeView_GameList->setStyleSheet("QTreeView { background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 14px}"); + if(index) treeView_GameList->setStyleSheet("QTreeView { border-radius: 4px; border: 2px solid blue; background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 20px}"); + else treeView_GameList->setStyleSheet("QTreeView { background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 20px}"); + + treeView_GameList->header()->setStyleSheet("QObject {font: bold 18px}"); #else if(index) treeView_GameList->setStyleSheet("QTreeView { border-radius: 4px; border: 2px solid blue; background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}"); else treeView_GameList->setStyleSheet("QTreeView { background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}"); @@ -1709,7 +1712,7 @@ void gameLobbyDialogImpl::showAutoStartTimer() autoStartTimerOverlay->setGeometry(((scrollArea_gameInfos->geometry().width()-190)/2), ((scrollArea_gameInfos->geometry().height()-50)/2), 190, 50); QString string(tr("The game will start in
%1 seconds.").arg(6)); - autoStartTimerOverlay->setText(""+string+""); + autoStartTimerOverlay->setText(""+string+""); autoStartTimerCounter = 6; autoStartTimer->start(1000); @@ -1720,7 +1723,7 @@ void gameLobbyDialogImpl::updateAutoStartTimer() --autoStartTimerCounter; if(autoStartTimerCounter) { QString string(tr("The game will start in
%1 seconds.").arg(autoStartTimerCounter)); - autoStartTimerOverlay->setText(""+string+""); + autoStartTimerOverlay->setText(""+string+""); } else { autoStartTimer->stop(); autoStartTimerOverlay->hide(); diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 1baecec7..ad99ffd4 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -504,10 +504,11 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) myUniversalMessageDialog = new myMessageDialogImpl(myConfig, this); myUniversalMessageDialog->setParent(this); - //hide left and right icon from maemo gui for ANDROID + //hide left and right icon and menubar from maemo gui for ANDROID #ifdef ANDROID fullscreenButton->hide(); tabsButton->hide(); + menubar->hide(); #endif //Connects diff --git a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui index 09627fd6..7ec9f2d7 100755 --- a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui +++ b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui @@ -44,11 +44,8 @@ 16777215 - - true - - QObject {font-size: 20px} + QObject {font-size: 20px; font-color: rgb(0, 0, 0)} 0 @@ -157,6 +154,9 @@ p, li { white-space: pre-wrap; } + + QObject {font-size: 20px; font-color: rgb(0, 0, 0)} + QTextEdit::NoWrap @@ -210,6 +210,7 @@ p, li { white-space: pre-wrap; } <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"></p></td></tr></table></body></html> @@ -295,6 +296,16 @@ p, li { white-space: pre-wrap; } + + + + QObject {font-size: 30px} + + + QDialogButtonBox::Close + + + diff --git a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui index c6aceda9..774d0d07 100644 --- a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui +++ b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui @@ -10,6 +10,12 @@ 424 + + + 0 + 0 + + 800 @@ -44,7 +50,7 @@ - QObject {font: bold 18px} + QObject {font: 24px} 0 @@ -67,9 +73,18 @@ - + + 4 + + + 4 + + 0 + + 5 + @@ -112,18 +127,6 @@ 0 - - - 310 - 24 - - - - - 300 - 24 - - QObject {font: bold 18px} @@ -186,18 +189,6 @@ 0 - - - 150 - 24 - - - - - 150 - 24 - - QObject {font: bold 18px} @@ -234,18 +225,6 @@ 0 - - - 150 - 24 - - - - - 150 - 24 - - QObject {font: bold 18px} @@ -288,7 +267,7 @@ - QObject {font: 18px} + QObject {font: 20px} @@ -345,7 +324,7 @@ - QObject {font: bold 18px} + QObject {font: bold 20px} Join &any game @@ -384,7 +363,7 @@ - QObject {font: bold 18px} + QObject {font: bold 20px} &Create Game @@ -410,7 +389,7 @@ - QObject {font: bold 18px} + QObject {font: bold 20px} &Join Game @@ -434,9 +413,6 @@ Qt::CustomContextMenu - - QObject { font: 18px; } QTreeView::item { font: 16px; } - Qt::ScrollBarAlwaysOff @@ -533,7 +509,7 @@ 252 - 190 + 210 @@ -548,7 +524,7 @@ 0 0 292 - 186 + 206 @@ -1041,7 +1017,7 @@ - QObject {font: 12px} + QObject {font: 14px} @@ -1057,7 +1033,7 @@ - QObject {font: 12px} + QObject {font: 14px} @@ -1067,7 +1043,7 @@ - QObject {font: 12px} + QObject {font: 14px} @@ -1092,7 +1068,7 @@ - QObject {font: 12px} + QObject {font: 14px} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -1125,7 +1101,7 @@ p, li { white-space: pre-wrap; } - QObject {font: 12px} + QObject {font: 14px} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> diff --git a/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui b/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui index 03a071a7..e0329054 100644 --- a/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui +++ b/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui @@ -78,7 +78,7 @@ false - + 0 diff --git a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui index 55fb6e34..7ae1ed32 100644 --- a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui @@ -155,6 +155,9 @@ + + 6 + @@ -320,7 +323,7 @@ - 0 + 1 @@ -718,6 +721,9 @@ p, li { white-space: pre-wrap; } false + + Qt::ImhNoPredictiveText + @@ -1751,7 +1757,11 @@ p, li { white-space: pre-wrap; } - + + + Qt::ImhNoPredictiveText + + @@ -1786,6 +1796,9 @@ p, li { white-space: pre-wrap; } + + Qt::ImhNoPredictiveText + 60 @@ -1822,7 +1835,11 @@ p, li { white-space: pre-wrap; } - + + + Qt::ImhNoPredictiveText + + @@ -1934,7 +1951,11 @@ p, li { white-space: pre-wrap; } - + + + Qt::ImhNoPredictiveText + + @@ -2118,6 +2139,9 @@ p, li { white-space: pre-wrap; } 0 + + Qt::ImhNoPredictiveText + 12 @@ -2201,6 +2225,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -2334,6 +2361,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -2495,6 +2525,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -2600,6 +2633,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -2831,6 +2867,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -2940,6 +2979,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -3073,6 +3115,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -3206,6 +3251,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -3339,6 +3387,9 @@ p, li { white-space: pre-wrap; } 25 + + Qt::ImhNoPredictiveText + 12 @@ -3530,7 +3581,11 @@ p, li { white-space: pre-wrap; } 0 - + + + Qt::ImhNoPredictiveText + + diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui index 6ac240ae..daacad6e 100644 --- a/src/gui/qt/gui_800x480/tabs_800x480.ui +++ b/src/gui/qt/gui_800x480/tabs_800x480.ui @@ -81,7 +81,7 @@ Qt::NoFocus - 1 + 0 @@ -660,6 +660,12 @@ 0 + + + 0 + 45 + + Qt::NoFocus diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc index ad411dcf..36ee986e 100644 --- a/src/gui/qt/resources/pokerth_android.qrc +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -421,5 +421,118 @@ android-data/gfx/gui/misc/windowicon.png android-data/fonts/DejaVuSans-Bold.ttf android-data/fonts/n019003l.pfb + android-data/gfx/avatars/default/misc/00a0b3d26a67841239b8883183b7a8f0.png + android-data/gfx/avatars/default/misc/0f2ca195ebaec613ffc8626185415b18.png + android-data/gfx/avatars/default/misc/2b0fca47b50e2cc4f910eba9ffa858a9.png + android-data/gfx/avatars/default/misc/2d5248926bda0c674f31e25981de33a4.png + android-data/gfx/avatars/default/misc/5e802a524d92f339ad1adedf5675c467.png + android-data/gfx/avatars/default/misc/6b1ae8bfc14ffb2ae3247c7327b1f5ed.png + android-data/gfx/avatars/default/misc/7b7d565bf61d15722085e0489c474078.png + android-data/gfx/avatars/default/misc/7ee6c7e39bdecf872f782f7fefeffc6c.png + android-data/gfx/avatars/default/misc/08ced517579b3d258c947aec6c0a0dd4.png + android-data/gfx/avatars/default/misc/08e18c4e25a5052575e6a409e71959f5.png + android-data/gfx/avatars/default/misc/9a106f3f5f9647c77174da1977dcb3c1.png + android-data/gfx/avatars/default/misc/9ae421286ad12b4a5e7d2ca767e3d9a3.png + android-data/gfx/avatars/default/misc/9ff203623c75d8570126599d45922aa3.png + android-data/gfx/avatars/default/misc/20e7e95df017855a44a16ff54bb8252a.png + android-data/gfx/avatars/default/misc/20f0819f145c3a6e7272adc2909f35e7.png + android-data/gfx/avatars/default/misc/030a14c105d3fd164cb4bae54bad6191.png + android-data/gfx/avatars/default/misc/41c06d77495fbcd69cfbb4457ebc11dc.png + android-data/gfx/avatars/default/misc/44d23de146bd9d753571915226c44cfd.png + android-data/gfx/avatars/default/misc/53d7f2bda9b904adf62153a9341d48db.png + android-data/gfx/avatars/default/misc/70bf201de8b46b19a30b94d6ea717043.png + android-data/gfx/avatars/default/misc/76fcf5f16951e17a63e4ff50d09278f7.png + android-data/gfx/avatars/default/misc/85de4941160836a15745859dfcd9828e.png + android-data/gfx/avatars/default/misc/88fdee1614fdbf125d0a82bc349da0ff.png + android-data/gfx/avatars/default/misc/150bfd890394dceb33c66ec8d033b7f4.png + android-data/gfx/avatars/default/misc/192f2abb785082aa9cbd745f763c7afb.png + android-data/gfx/avatars/default/misc/663f3d7a9ad330b2c77aa5f542fedf38.png + android-data/gfx/avatars/default/misc/778eca12f78519ac598f8858bdaf5ffa.png + android-data/gfx/avatars/default/misc/3036f43bab1f56a3c3dd693c0551bbd8.png + android-data/gfx/avatars/default/misc/3956df277e41217641829542a4591c5f.png + android-data/gfx/avatars/default/misc/5858abb9942a4d7faabfb6e7ff2520fd.png + android-data/gfx/avatars/default/misc/8426dadd34be5db4f4cdfa12ec1e8c53.png + android-data/gfx/avatars/default/misc/32955c19e24eba10fd63f1dcc75b5a25.png + android-data/gfx/avatars/default/misc/71348dd09e29dbe4ee6accc25d74bc94.png + android-data/gfx/avatars/default/misc/82487a6a11cfd4174d3c56c13f47c03e.png + android-data/gfx/avatars/default/misc/276648a9e4397177ba6e065bb8392a0f.png + android-data/gfx/avatars/default/misc/92875006f8786c9fa082ca13ae188a28.png + android-data/gfx/avatars/default/misc/910800128fa4afacd15c61a67e6d01a5.png + android-data/gfx/avatars/default/misc/a8c3d13377c17b06341b3904185ca30d.png + android-data/gfx/avatars/default/misc/aafbbe402e1883657b2db3e2f7574e5a.png + android-data/gfx/avatars/default/misc/bb2ae3396e8523545a955ceec97a273b.png + android-data/gfx/avatars/default/misc/c824fc964b0f051569d961d24d0897cd.png + android-data/gfx/avatars/default/misc/c10142a7b42f9e5c89ad4c644c570b74.png + android-data/gfx/avatars/default/misc/cd78743ae833cb838395e126ddc4b298.png + android-data/gfx/avatars/default/misc/d0b3c777001d2548fc87c112a181ddbf.png + android-data/gfx/avatars/default/misc/d2dfc050bd61af58f05853864d5f9c4e.png + android-data/gfx/avatars/default/misc/d2e74be7f80276f90091f90b2a78ddfb.png + android-data/gfx/avatars/default/misc/d9a4712147692ace05d5b87a5f76223f.png + android-data/gfx/avatars/default/misc/d7204e29016ca8963c02f46d4d41dc7d.png + android-data/gfx/avatars/default/misc/dccda20e75901d151e199cf0d74451d4.png + android-data/gfx/avatars/default/misc/e4e0c2850b68a65dcce6e83512e60665.png + android-data/gfx/avatars/default/misc/e6a7b4c2d32f5c5ff8cd895b928b5594.png + android-data/gfx/avatars/default/misc/e6e6b9af8c7bea68e359538e1298efd6.png + android-data/gfx/avatars/default/misc/e604d933cf5dcbef120c516c66083b13.png + android-data/gfx/avatars/default/misc/eb427f89e4773e87afb87505885cf698.png + android-data/gfx/avatars/default/misc/eb7612a2b515bd826babec8f649b44cf.png + android-data/gfx/avatars/default/misc/ed1dc23e53b713ab69850f808e39498e.png + android-data/gfx/avatars/default/misc/f3e4763d3f5ba1a4bde813667efa82a1.png + android-data/gfx/avatars/default/misc/f08cff60124b7690f13319fcf67a0b26.png + android-data/gfx/avatars/default/misc/f12b7ce0222d0303a0de70c7dfa9ac0f.png + android-data/gfx/avatars/default/misc/f48c98f3814cafa82e1c444915ceb0a7.png + android-data/gfx/avatars/default/misc/f4893bf7b611d72231e94fa487cc74e9.png + android-data/gfx/avatars/default/misc/f69440dd7d5483cc33d93c52cbb2c64d.png + android-data/gfx/avatars/default/misc/fee2595e8a7be7ea50a39604e8c72e5e.png + android-data/gfx/avatars/default/people/0c24b06358f7b308d6b47c59ebace73d.png + android-data/gfx/avatars/default/people/0c04318e6fa54534935e3e6cfe12c4a1.png + android-data/gfx/avatars/default/people/6ad16e2c3e4b8e4e6da47032d4372f4b.png + android-data/gfx/avatars/default/people/6ecea83d9fac6b4cae97e2fccd09a5f6.png + android-data/gfx/avatars/default/people/9f49fc3d6062ddc08dc6bbd9ef9b399d.png + android-data/gfx/avatars/default/people/14e3f39cc775608bcecf5597248b3558.png + android-data/gfx/avatars/default/people/16b702a87f681c4343486523a1a867e8.png + android-data/gfx/avatars/default/people/39fa73528e8dc1a5a478938affe79100.png + android-data/gfx/avatars/default/people/45e16bc214942321a3814fb43a84a88e.png + android-data/gfx/avatars/default/people/95df673e5ee4d02f0f95d5c7ff091cfb.png + android-data/gfx/avatars/default/people/237c518f2bb6ac99f6eb1012e18460b9.png + android-data/gfx/avatars/default/people/490ed3a748f6f4d6c261436198f2368f.png + android-data/gfx/avatars/default/people/74672ebfa2ab02968386c4e441a08668.png + android-data/gfx/avatars/default/people/bc28d08c451a775f9e332c14a397096b.png + android-data/gfx/avatars/default/people/bed234c6672d512bdb4c2768f0b3f90c.png + android-data/gfx/avatars/default/people/c6d57064672b9a6c78a06248d2a60770.png + android-data/gfx/avatars/default/people/c018b15b8164a303b9395b1e89c51004.png + android-data/gfx/avatars/default/people/cbd2e0c6ee579fb8e0f3942639cf988d.png + android-data/gfx/avatars/default/people/d6f8a45e9243b7e7e4e2c8e41df1c9f5.png + android-data/gfx/avatars/default/people/d21268e1d2ec969367ee5b54bd34738b.png + android-data/gfx/avatars/default/people/d66940c138c207c68a338769d683e691.png + android-data/gfx/avatars/default/people/da34195981d255656f39c05481de3b6a.png + android-data/gfx/avatars/default/people/e3e1ae15f7d808fce16c26c049e2cbe9.png + android-data/gfx/avatars/default/people/e54e67ebd5265cf549362a2cda5a999c.png + android-data/gfx/avatars/default/people/ef0975f38a367a45cb8042b438957304.png + android-data/translations/pokerth_af.qm + android-data/translations/pokerth_bg.qm + android-data/translations/pokerth_ca.qm + android-data/translations/pokerth_cz.qm + android-data/translations/pokerth_de.qm + android-data/translations/pokerth_dk.qm + android-data/translations/pokerth_es.qm + android-data/translations/pokerth_fi.qm + android-data/translations/pokerth_fr.qm + android-data/translations/pokerth_gr.qm + android-data/translations/pokerth_hu.qm + android-data/translations/pokerth_it.qm + android-data/translations/pokerth_jp.qm + android-data/translations/pokerth_lt.qm + android-data/translations/pokerth_nl.qm + android-data/translations/pokerth_no.qm + android-data/translations/pokerth_pl.qm + android-data/translations/pokerth_ptbr.qm + android-data/translations/pokerth_ptpt.qm + android-data/translations/pokerth_ru.qm + android-data/translations/pokerth_sk.qm + android-data/translations/pokerth_sv.qm + android-data/translations/pokerth_ta.qm + android-data/translations/pokerth_tr.qm + android-data/translations/pokerth_zhcn.qm