diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
index 2913c434..85e8e138 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
@@ -35,11 +35,11 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
QPalette myPalette = textBrowser_licence->palette();
#ifdef GUI_800x480
#ifdef ANDROID
- myPalette.setColor(QPalette::Base, QColor(255,255,255,255));
- myPalette.setColor(QPalette::Text, QColor(0,0,0,255));
+ myPalette.setColor(QPalette::Base, QColor(255,255,255,255));
+ myPalette.setColor(QPalette::Text, QColor(0,0,0,255));
#else
- myPalette.setColor(QPalette::Base, QColor(0,0,0,255));
- myPalette.setColor(QPalette::Text, QColor(255,255,255,255));
+ myPalette.setColor(QPalette::Base, QColor(0,0,0,255));
+ myPalette.setColor(QPalette::Text, QColor(255,255,255,255));
#endif
#else
QColor myColor = myPalette.color(QPalette::Window);
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 565784ea..77b37e3e 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -114,17 +114,23 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P");
myGameListModel->setHorizontalHeaderLabels(headerList);
- treeView_GameList->setColumnWidth(0,190);
- treeView_GameList->setColumnWidth(1,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: 20px}");
- treeView_GameList->header()->setStyleSheet("QObject {font: bold 18px}");
+ treeView_GameList->setColumnWidth(0,220);
+ treeView_GameList->setColumnWidth(1,65);
+ treeView_GameList->setColumnWidth(2,90);
+ treeView_GameList->setColumnWidth(3,30);
+ treeView_GameList->setColumnWidth(4,30);
+
+ 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: 22px}");
+ 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;}");
+ treeView_GameList->setColumnWidth(0,190);
+ treeView_GameList->setColumnWidth(1,65);
+ treeView_GameList->setColumnWidth(2,65);
+ treeView_GameList->setColumnWidth(3,40);
+ treeView_GameList->setColumnWidth(4,40);
+
+ 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
treeView_GameList->setAutoFillBackground(TRUE);
@@ -404,11 +410,20 @@ void gameLobbyDialogImpl::refresh(int actionID)
QStringList headerList;
headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P");
myGameListModel->setHorizontalHeaderLabels(headerList);
- treeView_GameList->setColumnWidth(0,190);
+
+#ifdef GUI_800x480
+ treeView_GameList->setColumnWidth(0,220);
+ treeView_GameList->setColumnWidth(1,65);
+ treeView_GameList->setColumnWidth(2,90);
+ treeView_GameList->setColumnWidth(3,30);
+ treeView_GameList->setColumnWidth(4,30);
+#else
+ treeView_GameList->setColumnWidth(0,190);
treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,65);
treeView_GameList->setColumnWidth(3,40);
treeView_GameList->setColumnWidth(4,40);
+#endif
QStringList headerList2;
headerList2 << tr("Available Players");
@@ -797,11 +812,20 @@ void gameLobbyDialogImpl::clearDialog()
QStringList headerList;
headerList << tr("Game") << tr("Players") << tr("State") << tr("T") << tr("P");
myGameListModel->setHorizontalHeaderLabels(headerList);
- treeView_GameList->setColumnWidth(0,190);
+
+#ifdef GUI_800x480
+ treeView_GameList->setColumnWidth(0,220);
+ treeView_GameList->setColumnWidth(1,65);
+ treeView_GameList->setColumnWidth(2,90);
+ treeView_GameList->setColumnWidth(3,30);
+ treeView_GameList->setColumnWidth(4,30);
+#else
+ treeView_GameList->setColumnWidth(0,190);
treeView_GameList->setColumnWidth(1,65);
treeView_GameList->setColumnWidth(2,65);
treeView_GameList->setColumnWidth(3,40);
treeView_GameList->setColumnWidth(4,40);
+#endif
pushButton_CreateGame->clearFocus();
lineEdit_ChatInput->setFocus();
diff --git a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui
index 73816080..8c19b065 100644
--- a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui
+++ b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui
@@ -7,19 +7,13 @@
0
0
800
- 400
+ 424
800
- 400
-
-
-
-
- 800
- 400
+ 424
diff --git a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
index 0cbc2813..d448e6c5 100644
--- a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
+++ b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui
@@ -473,6 +473,12 @@
-
+
+
+ 0
+ 0
+
+
221
@@ -506,10 +512,16 @@
-
+
+
+ 0
+ 0
+
+
252
- 210
+ 208
@@ -524,7 +536,7 @@
0
0
292
- 206
+ 204
@@ -840,7 +852,7 @@
- QObject {font: 14 px}
+ QObject {font: 22px}
search for player ...
@@ -871,7 +883,7 @@
Qt::CustomContextMenu
- QObject {font: 14 px}
+ QObject {font: 16px;}
QAbstractItemView::NoEditTriggers
@@ -971,7 +983,7 @@
- QObject {font: 14px}
+ QObject {font: 18px;}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -985,7 +997,7 @@ p, li { white-space: pre-wrap; }
-
- QObject {font: 14 px}
+ QObject {font: 22px;}
diff --git a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui
index 48d105f0..e3d9ec2a 100755
--- a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui
+++ b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui
@@ -29,145 +29,11 @@
QObject {font: 26px}
-
- 30
+
+ 16
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- Number of players:
-
-
- spinBox_quantityPlayers
-
-
-
- -
-
-
- 2
-
-
- 10
-
-
- 10
-
-
-
-
-
- -
-
-
-
-
-
- Start Cash:
-
-
- spinBox_startCash
-
-
-
- -
-
-
- QAbstractSpinBox::UpDownArrows
-
-
- $
-
-
- 1000
-
-
- 1000000
-
-
- 50
-
-
- 2000
-
-
-
-
-
- -
-
-
- Blinds
-
-
-
- 1
-
-
- 9
-
-
- 1
-
-
- 0
-
-
-
-
-
- Change blinds settings ...
-
-
-
- -
-
-
- Use saved blinds settings
-
-
- true
-
-
-
-
-
-
- -
-
-
-
-
-
- Game Speed:
-
-
- spinBox_gameSpeed
-
-
-
- -
-
-
- 1
-
-
- 11
-
-
- 4
-
-
-
-
-
- -
-
+
Qt::Vertical
@@ -180,17 +46,251 @@
-
-
-
- QObject {font: 30px}
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 54
+ 297
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 500
+ 300
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Plain
+
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Number of players:
+
+
+ spinBox_quantityPlayers
+
+
+
+ -
+
+
+ 2
+
+
+ 10
+
+
+ 10
+
+
+
+
+
+ -
+
+
-
+
+
+ Start Cash:
+
+
+ spinBox_startCash
+
+
+
+ -
+
+
+ QAbstractSpinBox::UpDownArrows
+
+
+ $
+
+
+ 1000
+
+
+ 1000000
+
+
+ 50
+
+
+ 2000
+
+
+
+
+
+ -
+
+
+ Blinds
+
+
+
+ 1
+
+
+ 9
+
+
+ 1
+
+
+ 0
+
+
-
+
+
+ Change blinds settings ...
+
+
+
+ -
+
+
+ Use saved blinds settings
+
+
+ true
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Game Speed:
+
+
+ spinBox_gameSpeed
+
+
+
+ -
+
+
+ 1
+
+
+ 11
+
+
+ 4
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QObject {font: bold 30px}
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Ok
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 100
+ 20
+
+
+
+
+
+
+ -
+
- Qt::Horizontal
+ Qt::Vertical
-
- QDialogButtonBox::Ok
+
+
+ 497
+ 0
+
-
+
diff --git a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui
index 2af086aa..23052d25 100644
--- a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui
+++ b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui
@@ -23,7 +23,13 @@
QObject {font: 18px}
-
+
+ 0
+
+
+ 0
+
+
0
@@ -1328,7 +1334,19 @@ p, li { white-space: pre-wrap; }
-
+
+ 2
+
+
+ 4
+
+
+ 0
+
+
+ 4
+
+
4
-
@@ -3668,7 +3686,14 @@ p, li { white-space: pre-wrap; }
- QObject {color: rgb(255, 255, 255);}
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Nimbus Sans L'; font-weight:400; font-style:normal;">
+<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></body></html>
@@ -3851,24 +3876,53 @@ p, li { white-space: pre-wrap; }
-
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- QObject {font: bold 20px}
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Ok
-
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QObject {font: bold 20px}
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Ok
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 40
+ 20
+
+
+
+
+
diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui
index 98cf27f0..81a6c67c 100644
--- a/src/gui/qt/gui_800x480/tabs_800x480.ui
+++ b/src/gui/qt/gui_800x480/tabs_800x480.ui
@@ -155,7 +155,11 @@
-
-
+
+
+ QObject {font: 20px;}
+
+
diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp
index f4c1d782..000a0c4e 100644
--- a/src/gui/qt/styles/gametablestylereader.cpp
+++ b/src/gui/qt/styles/gametablestylereader.cpp
@@ -1364,7 +1364,7 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
// default
case 0:
#ifdef GUI_800x480
- bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+"; font-size: 20px} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900; font-size: 20px}");
+ bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+"; font-size: 26px} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900; font-size: 26px}");
#else
bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+";} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900;}");
#endif
@@ -1372,7 +1372,7 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
// blink
case 1:
#ifdef GUI_800x480
- bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+"; font-size: 20px}");
+ bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+"; font-size: 26px}");
#else
bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+";}");
#endif
@@ -1383,7 +1383,7 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
void GameTableStyleReader::setSpeedStringStyle(QLabel *l)
{
#ifdef GUI_800x480
- l->setStyleSheet("QLabel { color: #"+SpeedTextColor+"; font-size: 20px}");
+ l->setStyleSheet("QLabel { color: #"+SpeedTextColor+"; font-size: 24px}");
#else
l->setStyleSheet("QLabel { color: #"+SpeedTextColor+";}");
#endif