From 4678c7cc3347efa5bcd5f969e62235931876e2b3 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Tue, 2 Oct 2007 20:32:35 +0000
Subject: [PATCH] fixes 0.5->0.6 stings. added extern gpl2 text

---
 src/gui/qt/aboutpokerth.ui                    | 206 +++++++++++++-----
 src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp  |  14 +-
 src/gui/qt/aboutpokerth/aboutpokerthimpl.h    |   8 +-
 src/gui/qt/mainwindow/log/log.cpp             |   2 +-
 src/gui/qt/mainwindow/mainwindowimpl.cpp      |   2 +-
 .../qt/mainwindow/startsplash/startsplash.cpp |   2 +-
 6 files changed, 169 insertions(+), 65 deletions(-)

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 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>About PokerTH 0.5</string>
+   <string>About PokerTH 0.6</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
+   <property name="leftMargin" >
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin" >
+    <number>9</number>
+   </property>
+   <property name="rightMargin" >
+    <number>9</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>9</number>
+   </property>
+   <property name="horizontalSpacing" >
+    <number>6</number>
+   </property>
+   <property name="verticalSpacing" >
     <number>6</number>
    </property>
    <item row="0" column="0" >
@@ -33,13 +45,46 @@
        <string>About</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item row="1" column="1" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:12pt; font-weight:600;">PokerTH 0.6&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="0" column="1" >
+        <widget class="QLabel" name="label_logo" >
+         <property name="pixmap" >
+          <pixmap/>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="1" column="0" >
+        <widget class="QLabel" name="label" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>- 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</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="2" column="1" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -52,40 +97,29 @@
          </property>
         </spacer>
        </item>
-       <item rowspan="2" row="0" column="0" >
-        <widget class="QLabel" name="label" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>3</hsizetype>
-           <vsizetype>5</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item row="3" column="0" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
          </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>91</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="4" column="0" colspan="2" >
+        <widget class="QLabel" name="label_3" >
          <property name="text" >
-          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">PokerTH 0.5&lt;/span>&lt;/p>
-&lt;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;">&lt;/p>
-&lt;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&lt;/p>
-&lt;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&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Multiplayer network games&lt;/p>
-&lt;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&lt;/p>
-&lt;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;">&lt;/p>
-&lt;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;">&lt;/p>
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;">&lt;span style=" font-weight:400;">© 2006-2007, FHammer &amp;amp; FThauer&lt;/span>&lt;/p>
-&lt;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;">&lt;/p>&lt;/body>&lt;/html></string>
+          <string>&lt;a href="http://www.pokerth.net" target="_blank">http://www.pokerth.net&lt;a></string>
          </property>
          <property name="alignment" >
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
-        </widget>
-       </item>
-       <item row="0" column="1" >
-        <widget class="QLabel" name="label_3" >
-         <property name="pixmap" >
-          <pixmap resource="resources.qrc" >:/graphics/resources/graphics/logoChip3D.png</pixmap>
+         <property name="openExternalLinks" >
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -96,10 +130,22 @@ p, li { white-space: pre-wrap; }
        <string>Project</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
+        <number>6</number>
+       </property>
+       <property name="verticalSpacing" >
         <number>6</number>
        </property>
        <item row="0" column="0" >
@@ -110,7 +156,7 @@ p, li { white-space: pre-wrap; }
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Projectpage: &lt;/span>&lt;/p>
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">     &lt;a href="http://www.pokerth.net">&lt;span style=" text-decoration: underline; color:#0000ff;">http://www.pokerth.net&lt;/span>&lt;/a>&lt;/p>
 &lt;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;">&lt;/p>
@@ -138,10 +184,22 @@ p, li { white-space: pre-wrap; }
        <string>Translation</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
+        <number>6</number>
+       </property>
+       <property name="verticalSpacing" >
         <number>6</number>
        </property>
        <item row="0" column="0" >
@@ -149,7 +207,7 @@ p, li { white-space: pre-wrap; }
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&amp;lt;your translator name&amp;gt; - &amp;lt;your language&amp;gt;&lt;/p>
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">     &amp;lt;if you like your mail address&amp;gt;&lt;/p>&lt;/body>&lt;/html></string>
          </property>
@@ -165,10 +223,22 @@ p, li { white-space: pre-wrap; }
        <string>Thanks to</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
+        <number>6</number>
+       </property>
+       <property name="verticalSpacing" >
         <number>6</number>
        </property>
        <item row="0" column="0" >
@@ -176,7 +246,7 @@ p, li { white-space: pre-wrap; }
          <property name="html" >
           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;a href="http://commons.wikimedia.org/wiki/Main_Page">&lt;span style=" font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons&lt;/span>&lt;/a>&lt;/p>
 &lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;">     - &lt;span style=" font-weight:400;">for different popular avatar picture resources&lt;/span>&lt;/p>
 &lt;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;">&lt;/p>
@@ -201,17 +271,32 @@ p, li { white-space: pre-wrap; }
        <string>License</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="margin" >
+       <property name="leftMargin" >
         <number>9</number>
        </property>
-       <property name="spacing" >
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
+       <property name="horizontalSpacing" >
+        <number>6</number>
+       </property>
+       <property name="verticalSpacing" >
         <number>6</number>
        </property>
        <item row="0" column="0" >
-        <widget class="QTextBrowser" name="textBrowser" >
+        <widget class="QTextBrowser" name="textBrowser_licence" >
          <property name="autoFillBackground" >
           <bool>true</bool>
          </property>
+         <property name="openLinks" >
+          <bool>false</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -220,12 +305,21 @@ p, li { white-space: pre-wrap; }
    </item>
    <item row="1" column="0" >
     <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <property name="spacing" >
       <number>6</number>
      </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
      <item>
       <spacer>
        <property name="orientation" >
@@ -250,9 +344,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="resources.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>okButton</sender>
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 << "</head>\n";
 			stream << "<body>\n";
 			stream << "<img src='logo.png'>\n";
-			stream << "<h3><b>Log-File for PokerTH 0.5 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"</b></h3>\n";
+			stream << "<h3><b>Log-File for PokerTH 0.6 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"</b></h3>\n";
 	// 		stream << "</body>\n";
 	// 		stream << "</html>\n";
 			myLogFile->close();
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index ad97cfe4..fb386592 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -531,7 +531,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 	myConnectToServerDialog = new connectToServerDialogImpl(this);
 	myStartNetworkGameDialog = new startNetworkGameDialogImpl(this, myConfig);
 	myCreateNetworkGameDialog = new createNetworkGameDialogImpl(this, myConfig);
-	myAboutPokerthDialog = new aboutPokerthImpl(this);
+	myAboutPokerthDialog = new aboutPokerthImpl(this, myConfig);
 	myGameLobbyDialog = new gameLobbyDialogImpl(this, myConfig);
 	
 	myStartNetworkGameDialog->setMyW(this);
diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp
index dc77e292..b20f4434 100644
--- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp
+++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp
@@ -281,7 +281,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
 	painter.setOpacity(1.0);
 	painter.setFont(versionFont);
 	painter.setPen(QColor(102,153,0));
-	painter.drawText(312,230,100,20,4,"Version 0.5");
+	painter.drawText(312,230,100,20,4,"Version 0.6");
 	painter.setOpacity(opacity);
 
 }