From 6a1e8f3a12e33735403244b5ceaa3136e73a348c Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 30 Dec 2012 00:21:20 +0100 Subject: [PATCH] mobile gui tweaks --- src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp | 19 ----------- .../qt/gui_800x480/aboutpokerth_800x480.ui | 33 +++++-------------- 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp index 9c349de3..8c945413 100755 --- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp +++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp @@ -51,24 +51,6 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); - 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)); -#else - 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); - myPalette.setColor(QPalette::Base, myColor); -#endif - textBrowser_licence->setPalette(myPalette); - textBrowser_2->setPalette(myPalette); - textBrowser_3->setPalette(myPalette); - textBrowser_4->setPalette(myPalette); - QFile gplFile(QDir::toNativeSeparators(myAppDataPath+"misc/agpl.html")); QString gplString; if(gplFile.exists()) { @@ -79,7 +61,6 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) } } - label_logo->setPixmap(QPixmap(":/gfx/logoChip3D.png")); #ifdef GUI_800x480 diff --git a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui index d54ae3eb..4da768a3 100755 --- a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui +++ b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui @@ -61,7 +61,7 @@ - :/gfx/logoChip3D.png + :/gfx/logoChip3D.png @@ -77,7 +77,7 @@ - QObject {font-size: 22px; font-color: rgb(0, 0, 0)} + QObject {font-size: 20px; } @@ -154,8 +154,8 @@ <!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> +</style></head><body style=" font-family:'Liberation Sans'; font-size:26px; 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; font-family:'Nimbus Sans L';"><br /></p></body></html> true @@ -181,26 +181,11 @@ p, li { white-space: pre-wrap; } <!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;"> +</style></head><body style=" font-family:'Liberation Sans'; font-size:26px; font-weight:400; font-style:normal;"> <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;"></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;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></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;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></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;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></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;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';"><br /></span></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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';"><br /></span></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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';"><br /></span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">translator name - mail address</span></p></td></tr></table></body></html> true @@ -226,8 +211,8 @@ p, li { white-space: pre-wrap; } <!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> +</style></head><body style=" font-family:'Liberation Sans'; font-size:26px; 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; font-family:'Nimbus Sans L';"><br /></p></body></html> true @@ -274,7 +259,7 @@ p, li { white-space: pre-wrap; } - +