diff --git a/data/gfx/gui/misc/startwindowbg_800x480.png b/data/gfx/gui/misc/startwindowbg_800x480.png new file mode 100644 index 00000000..a07d6836 Binary files /dev/null and b/data/gfx/gui/misc/startwindowbg_800x480.png differ diff --git a/pokerth_db.pro b/pokerth_db.pro index 3981cbd8..2c10556d 100644 --- a/pokerth_db.pro +++ b/pokerth_db.pro @@ -15,7 +15,9 @@ MOC_DIR = mocs OBJECTS_DIR = obj DEFINES += ENABLE_IPV6 TIXML_USE_STL QT -= core gui -QMAKE_CXXFLAGS += -std=gnu++0x +!gui_800x480 { + QMAKE_CXXFLAGS += -std=gnu++0x +} #PRECOMPILED_HEADER = src/pch_lib.h INCLUDEPATH += . \ diff --git a/pokerth_game.pro b/pokerth_game.pro index 3921ac30..3b7887e0 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -15,7 +15,9 @@ CONFIG += qt \ warn_on include(src/third_party/qtsingleapplication/qtsingleapplication.pri) QT += sql -QMAKE_CXXFLAGS += -std=gnu++0x +!gui_800x480 { + QMAKE_CXXFLAGS += -std=gnu++0x +} UI_DIR = uics MOC_DIR = mocs OBJECTS_DIR = obj diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 8f4ef138..0b82a548 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -15,7 +15,9 @@ MOC_DIR = mocs OBJECTS_DIR = obj DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED QT -= core gui -QMAKE_CXXFLAGS += -std=gnu++0x +!gui_800x480 { + QMAKE_CXXFLAGS += -std=gnu++0x +} #PRECOMPILED_HEADER = src/pch_lib.h INCLUDEPATH += . \ diff --git a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui index b5ced9bd..64b1cb27 100755 --- a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui +++ b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui @@ -130,25 +130,25 @@ 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-size:9pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; 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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Project page: </span></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-size:8pt;"> </span><a href="http://www.pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></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-size:8pt;"></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-size:8pt; font-weight:600;">IRC: </span></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-size:8pt;"> #pokerth (irc.freenode.net)</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-size:8pt;"></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-size:8pt; font-weight:600;">Authors: </span></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-size:8pt;"> Felix Hammer (</span><a href="mailto:doitux@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a><span style=" font-size:8pt;">)</span></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-size:8pt;"> - initial idea, basic architecture, gui implementation, gui graphics editing, linux package</span></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-size:8pt;"> Florian Thauer (</span><a href="mailto:floty@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a><span style=" font-size:8pt;">)</span></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-size:8pt;"> - initial idea, basic architecture, engine development</span></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-size:8pt;"> Lothar May (</span><a href="mailto:lotodore@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">lotodore@pokerth.net</span></a><span style=" font-size:8pt;">)</span></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-size:8pt;"> - basic architecture, network development, windows package, MacOS package</span></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-size:8pt;"> Oskar Lindqvist (</span><a href="mailto:tranberry@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">tranberry@pokerth.net</span></a><span style=" font-size:8pt;">)</span></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-size:8pt;"> - initial gui graphics design</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; font-weight:600;">Project page: </span></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:'Nimbus Sans L'; font-size:8pt;"> </span><a href="http://www.pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></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:'Nimbus Sans L'; font-size:8pt;"></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">IRC: </span></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:'Nimbus Sans L'; font-size:8pt;"> #pokerth (irc.freenode.net)</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:'Nimbus Sans L'; font-size:8pt;"></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">Authors: </span></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:'Nimbus Sans L'; font-size:8pt;"> Felix Hammer (</span><a href="mailto:doitux@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></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:'Nimbus Sans L'; font-size:8pt;"> - initial idea, basic architecture, gui implementation, gui graphics editing, linux package</span></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:'Nimbus Sans L'; font-size:8pt;"> Florian Thauer (</span><a href="mailto:floty@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></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:'Nimbus Sans L'; font-size:8pt;"> - initial idea, basic architecture, engine development</span></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:'Nimbus Sans L'; font-size:8pt;"> Lothar May (</span><a href="mailto:lotodore@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">lotodore@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></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:'Nimbus Sans L'; font-size:8pt;"> - basic architecture, network development, windows package, MacOS package</span></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:'Nimbus Sans L'; font-size:8pt;"> Oskar Lindqvist (</span><a href="mailto:tranberry@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">tranberry@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></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:'Nimbus Sans L'; font-size:8pt;"> - initial gui graphics design</span></p></td></tr></table></body></html> true @@ -174,11 +174,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-size:9pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; 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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">translator name - mail address</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 @@ -204,30 +204,30 @@ 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-size:9pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; 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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-size:8pt; font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></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-size:8pt; font-weight:600;"> - </span><span style=" font-size:8pt;">for different popular avatar picture resources</span></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-size:8pt; font-weight:600;">Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro</span></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-size:8pt;"> - for people avatar pictures</span></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-size:8pt; font-weight:600;">ZeiZei</span><span style=" font-size:8pt;"> </span></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-size:8pt;"> - for &quot;misc&quot; avatar pictures</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-size:8pt; font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></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-size:8pt;"> - for different gpl licensed sounds</span></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-size:8pt; font-weight:600;">doc_dos</span></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-size:8pt;"> - for self recorded chip sounds</span></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-size:8pt; font-weight:600;">thiger, dunkanx, BerndA, coldz</span></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-size:8pt;"> - for different patches</span></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-size:8pt; font-weight:600;">kraut</span></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-size:8pt;"> - for internet-game-server hosting and administration</span></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-size:8pt; font-weight:600;">danuxi</span></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-size:8pt;"> - for startwindow background gfx and danuxi1 table background</span></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-size:8pt; font-weight:600;">heyn</span></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-size:8pt;"> - for moderating forum and organise bugtracker and feature requests</span></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-size:8pt; font-weight:600;">texas_outlaw</span></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-size:8pt;"> - for new table sounds</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;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;"> - </span><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">for different popular avatar picture resources</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro</span></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:'Nimbus Sans L'; font-size:8pt;"> - for people avatar pictures</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">ZeiZei</span><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> </span></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:'Nimbus Sans L'; font-size:8pt;"> - for &quot;misc&quot; avatar pictures</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></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:'Nimbus Sans L'; font-size:8pt;"> - for different gpl licensed sounds</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">doc_dos</span></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:'Nimbus Sans L'; font-size:8pt;"> - for self recorded chip sounds</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">thiger, dunkanx, BerndA, coldz</span></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:'Nimbus Sans L'; font-size:8pt;"> - for different patches</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">kraut</span></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:'Nimbus Sans L'; font-size:8pt;"> - for internet-game-server hosting and administration</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">danuxi</span></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:'Nimbus Sans L'; font-size:8pt;"> - for startwindow background gfx and danuxi1 table background</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">heyn</span></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:'Nimbus Sans L'; font-size:8pt;"> - for moderating forum and organise bugtracker and feature requests</span></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:'Nimbus Sans L'; font-size:8pt; font-weight:600;">texas_outlaw</span></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:'Nimbus Sans L'; font-size:8pt;"> - for new table sounds</span></p></td></tr></table></body></html> true diff --git a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui index e2cf728a..9dc38be0 100644 --- a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui @@ -279,6 +279,13 @@ + + + + Activate the "accidentally call after big raise" blocker + + + diff --git a/src/gui/qt/gui_800x480/startwindow_800x480.ui b/src/gui/qt/gui_800x480/startwindow_800x480.ui index 34b25b0c..c9cab3cd 100755 --- a/src/gui/qt/gui_800x480/startwindow_800x480.ui +++ b/src/gui/qt/gui_800x480/startwindow_800x480.ui @@ -6,26 +6,38 @@ 0 0 - 450 - 350 + 800 + 480 - 450 - 350 + 800 + 480 - 450 - 350 + 800 + 480 PokerTH - The Open-Source Texas Holdem Engine + + + 800 + 424 + + + + + 800 + 424 + + @@ -53,117 +65,6 @@ - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - &1 Start Local Game - - - - :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png - - - - 37 - 32 - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - &2 Internet Game - - - - :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png - - - - 37 - 32 - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - &3 Create Network Game - - - - :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png - - - - 37 - 32 - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - - - - &4 Join Network Game - - - - :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png - - - - 37 - 32 - - - - - - @@ -190,6 +91,173 @@ + + + + + + + 0 + 0 + + + + + 350 + 80 + + + + + 350 + 80 + + + + + 9 + 50 + false + false + + + + Qt::NoFocus + + + false + + + + + + &1 Start Local Game + + + + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png + + + + 37 + 32 + + + + + + + + + 0 + 0 + + + + + 350 + 80 + + + + + 350 + 80 + + + + Qt::NoFocus + + + + + + &2 Internet Game + + + + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png + + + + 37 + 32 + + + + + + + + + 0 + 0 + + + + + 350 + 80 + + + + + 350 + 80 + + + + Qt::NoFocus + + + + + + &3 Create Network Game + + + + :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png + + + + 37 + 32 + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + + + + &4 Join Network Game + + + + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png + + + + 37 + 32 + + + + + + @@ -197,26 +265,27 @@ 0 0 - 450 - 20 + 800 + 56 + + + 800 + 56 + + + + + 800 + 56 + + &PokerTH - - - Network Game - - - - - - - - @@ -227,10 +296,9 @@ - - + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png @@ -242,7 +310,7 @@ - + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png @@ -256,19 +324,31 @@ About PokerTH + + + 15 + + - + :/gfx/systemsettings.png:/gfx/systemsettings.png Configure PokerTH ... + + + 15 + 50 + false + + - + :/gfx/application_exit.png:/gfx/application_exit.png @@ -278,27 +358,30 @@ Ctrl+Q - - - - :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png - - - Create Network Game ... - - + + true + - + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png Join Network Game ... + + + + :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png + + + Create Network Game ... + + - + diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 0d580e68..98505c4d 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -71,6 +71,17 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) this->setWindowIcon(QIcon(myAppDataPath+"gfx/gui/misc/windowicon.png")); this->setStatusBar(0); + +#ifdef GUI_800x480 + this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); + + centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_800x480.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); + + pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); + pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); + pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); + pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:20px; border-width: 0px;}"); +#else this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:12px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); @@ -79,6 +90,7 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); +#endif // Dialogs