diff --git a/src/gui/qt/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui
index 106aa65c..1ae28c8b 100755
--- a/src/gui/qt/aboutpokerth.ui
+++ b/src/gui/qt/aboutpokerth.ui
@@ -11,13 +11,25 @@
- About PokerTH 0.5
+ About PokerTH 0.6
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
@@ -33,13 +45,46 @@
About
-
- 9
-
-
- 6
-
-
-
+
-
+
+
+ <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;">
+<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:12pt; font-weight:600;">PokerTH 0.6</span></p></body></html>
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ - Poker Engine for the popular "Texas Holdem" Poker
+- Singleplayer games with up to 6 computer-opponents
+- Multiplayer network games
+- Coded in C++ / QT4
+
+
+© 2006-2007, FHammer, FThauer, LMay
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
Qt::Vertical
@@ -52,40 +97,29 @@
- -
-
-
-
- 3
- 5
- 0
- 0
-
+
-
+
+
+ Qt::Vertical
+
+
+ 20
+ 91
+
+
+
+
+ -
+
- <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; text-decoration: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-weight:600;">PokerTH 0.5</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-weight:600;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Poker Engine for the popular "Texas Holdem" Poker</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Singleplayer games with up to 6 computer-opponents</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Multiplayer network games</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Coded in C++ / QT4</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; font-weight:600;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"><span style=" font-weight:400;">© 2006-2007, FHammer & FThauer</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;"></p></body></html>
+ <a href="http://www.pokerth.net" target="_blank">http://www.pokerth.net<a>
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- -
-
-
- :/graphics/resources/graphics/logoChip3D.png
+
+ true
@@ -96,10 +130,22 @@ p, li { white-space: pre-wrap; }
Project
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
@@ -110,7 +156,7 @@ p, li { white-space: pre-wrap; }
<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; text-decoration:none;">
+</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Projectpage: </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://www.pokerth.net"><span style=" 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;"></p>
@@ -138,10 +184,22 @@ p, li { white-space: pre-wrap; }
Translation
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
@@ -149,7 +207,7 @@ p, li { white-space: pre-wrap; }
<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; text-decoration:none;">
+</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><your translator name> - <your language></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> <if you like your mail address></p></body></html>
@@ -165,10 +223,22 @@ p, li { white-space: pre-wrap; }
Thanks to
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
@@ -176,7 +246,7 @@ p, li { white-space: pre-wrap; }
<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; text-decoration:none;">
+</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
<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-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; font-weight:600;"> - <span style=" font-weight:400;">for different popular avatar picture resources</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;"></p>
@@ -201,17 +271,32 @@ p, li { white-space: pre-wrap; }
License
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
-
+
true
+
+ false
+
@@ -220,12 +305,21 @@ p, li { white-space: pre-wrap; }
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -250,9 +344,7 @@ p, li { white-space: pre-wrap; }
-
-
-
+
okButton
diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
index 5142230e..567cd6e9 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
@@ -18,19 +18,25 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "aboutpokerthimpl.h"
+#include "configfile.h"
-aboutPokerthImpl::aboutPokerthImpl(QWidget *parent)
- : QDialog(parent)
+aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
+ : QDialog(parent), myConfig(c)
{
setupUi(this);
+
+ myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
- QPalette myPalette = textBrowser->palette();
+ QPalette myPalette = textBrowser_licence->palette();
QColor myColor = myPalette.color(QPalette::Window);
myPalette.setColor(QPalette::Base, myColor);
- textBrowser->setPalette(myPalette);
+ textBrowser_licence->setPalette(myPalette);
textBrowser_2->setPalette(myPalette);
textBrowser_3->setPalette(myPalette);
textBrowser_4->setPalette(myPalette);
+
+ textBrowser_licence->setSource(QUrl(myAppDataPath+"misc/gpl2.html"));
+ label_logo->setPixmap(QPixmap(myAppDataPath+"gfx/gui/misc/logoChip3D.png"));
}
diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.h b/src/gui/qt/aboutpokerth/aboutpokerthimpl.h
index 5173fb78..9a075e86 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.h
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.h
@@ -22,11 +22,17 @@
#include "ui_aboutpokerth.h"
+class ConfigFile;
class aboutPokerthImpl: public QDialog, public Ui::aboutPokerth {
Q_OBJECT
public:
- aboutPokerthImpl(QWidget *parent = 0);
+ aboutPokerthImpl(QWidget *parent = 0, ConfigFile *c =0);
+
+private:
+
+ ConfigFile *myConfig;
+ QString myAppDataPath;
};
#endif
diff --git a/src/gui/qt/mainwindow/log/log.cpp b/src/gui/qt/mainwindow/log/log.cpp
index 3ad0ed63..47b2868c 100644
--- a/src/gui/qt/mainwindow/log/log.cpp
+++ b/src/gui/qt/mainwindow/log/log.cpp
@@ -65,7 +65,7 @@ Log::Log(mainWindowImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), m
stream << "\n";
stream << "\n";
stream << "
\n";
- stream << "Log-File for PokerTH 0.5 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"
\n";
+ stream << "Log-File for PokerTH 0.6 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"
\n";
// stream << "\n";
// stream << "