diff --git a/src/gui/qt/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui
index efbdb216..79b9a522 100755
--- a/src/gui/qt/aboutpokerth.ui
+++ b/src/gui/qt/aboutpokerth.ui
@@ -133,6 +133,26 @@ p, li { white-space: pre-wrap; }
+
+
+ Translation
+
+
+
+ 9
+
+
+ 6
+
+ -
+
+
+ true
+
+
+
+
+
Thanks to
@@ -151,7 +171,13 @@ p, li { white-space: pre-wrap; }
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;"><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 avatar pictures</span></p></body></html>
+<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=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Linus, Mark, Viktoria, Florian, Benedikt</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for avatar pictures</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-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;"> - for different gpl lizensed sounds</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-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;"> - for self recorded chip sounds</p></body></html>
true
diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
index 8be8f468..5142230e 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
@@ -31,5 +31,6 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent)
textBrowser->setPalette(myPalette);
textBrowser_2->setPalette(myPalette);
textBrowser_3->setPalette(myPalette);
+ textBrowser_4->setPalette(myPalette);
}
diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui
index 7cbf62c4..90239fc6 100644
--- a/src/gui/qt/createnetworkgamedialog.ui
+++ b/src/gui/qt/createnetworkgamedialog.ui
@@ -74,7 +74,7 @@
-
- Number of players:
+ Maximum number of players:
diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp
index 31800ba1..7c829eb3 100644
--- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp
+++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp
@@ -73,30 +73,20 @@ void StartSplash::paintEvent(QPaintEvent * event) {
haveFont.setFamily("Andy MT");
haveFont.setPixelSize(36);
#endif
-/*
-
-#ifdef _WIN32
- QFont welcomeFont;
- welcomeFont.setFamily("Times New Roman");
- welcomeFont.setPixelSize(42);
-#else
- QFont welcomeFont;
- welcomeFont.setFamily("Century Schoolbook L");
- welcomeFont.setPixelSize(35);
-#endif
- QFont haveFont;
- haveFont.setFamily("Andy MT");
- haveFont.setPixelSize(36);*/
+ QFont versionFont;
+ versionFont.setFamily("Nimbus Sans L");
+ versionFont.setPixelSize(12);
+
QPixmap logo(":/graphics/resources/graphics/logoChip3D.png");
- if(frameNo >= 52 && frameNo < 65) {
+ if(frameNo >= 52 && frameNo < 55) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
}
- if(frameNo >= 65 && frameNo < 68) {
+ if(frameNo >= 55 && frameNo < 57) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -109,7 +99,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 68 && frameNo < 71) {
+ if(frameNo >= 57 && frameNo < 59) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -121,7 +111,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 71 && frameNo < 74) {
+ if(frameNo >= 59 && frameNo < 61) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -133,7 +123,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 74 && frameNo < 77) {
+ if(frameNo >= 61 && frameNo < 63) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -145,7 +135,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 77 && frameNo < 80) {
+ if(frameNo >= 63 && frameNo < 65) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -157,7 +147,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 80 && frameNo < 83) {
+ if(frameNo >= 65 && frameNo < 67) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -169,7 +159,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 83 && frameNo < 92) {
+ if(frameNo >= 67 && frameNo < 72) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -181,7 +171,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 92 && frameNo < 95) {
+ if(frameNo >= 72 && frameNo < 74) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -193,7 +183,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 95 && frameNo < 120 ) {
+ if(frameNo >= 74 && frameNo < 79 ) {
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -205,7 +195,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 120 && frameNo < 132) {
+ if(frameNo >= 79 && frameNo < 91) {
//
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -224,7 +214,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 132 && frameNo < 155) {
+ if(frameNo >= 91 && frameNo < 106) {
//
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -238,7 +228,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 155 && frameNo < 195) {
+ if(frameNo >= 106 && frameNo < 136) {
//
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -256,7 +246,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 195 && frameNo < 245) {
+ if(frameNo >= 136 && frameNo < 190) {
//
painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249);
@@ -274,11 +264,18 @@ void StartSplash::paintEvent(QPaintEvent * event) {
}
- if(frameNo >= 245) {
+ if(frameNo >=190) {
this->hide();
// myW->label_logo->show();
}
+ //even draw version number
+ painter.setOpacity(1.0);
+ painter.setFont(versionFont);
+ painter.setPen(QColor(102,153,0));
+ painter.drawText(312,230,100,20,4,"Version 0.5");
+ painter.setOpacity(opacity);
+
}
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index bc52a7bc..fa4acba1 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -387,11 +387,6 @@ p, li { white-space: pre-wrap; }
0.4 (current)
- -
-
- 0.3 (previous)
-
-
-
@@ -425,6 +420,9 @@ p, li { white-space: pre-wrap; }
-
+
+ 60
+
QLineEdit::Password
@@ -446,7 +444,7 @@ p, li { white-space: pre-wrap; }
80
- 80
+ 7234
@@ -585,7 +583,7 @@ p, li { white-space: pre-wrap; }
-
- Number of players:
+ Maximum number of players:
@@ -596,11 +594,6 @@ p, li { white-space: pre-wrap; }
0.4 (actual)
- -
-
- 0.3 (previous)
-
-
-