sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

string fixes + modified start-splash

Browse Source
This commit is contained in:
doitux
2007-06-11 22:57:36 +00:00
parent 0470bceeff
commit 28eb4ccc70
5 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/aboutpokerth.ui
+27 -1
View File
@@ -133,6 +133,26 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_5" >
<attribute name="title" >
<string>Translation</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QTextBrowser" name="textBrowser_4" >
<property name="openExternalLinks" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_4" > <widget class="QWidget" name="tab_4" >
<attribute name="title" > <attribute name="title" >
<string>Thanks to</string> <string>Thanks to</string>
@@ -151,7 +171,13 @@ p, li { white-space: pre-wrap; }
p, li { white-space: pre-wrap; } 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; 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;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;">&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 avatar pictures&lt;/span>&lt;/p>&lt;/body>&lt;/html></string> &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=" 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;">Linus, Mark, Viktoria, Florian, Benedikt&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;"> - for avatar pictures&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://kde-look.org/">&lt;span style=" font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/&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;"> - for different gpl lizensed sounds&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;span style=" font-weight:600;">doc_dos&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;"> - for self recorded chip sounds&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
<property name="openExternalLinks" > <property name="openExternalLinks" >
<bool>true</bool> <bool>true</bool>
src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+1
View File
@@ -31,5 +31,6 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent)
textBrowser->setPalette(myPalette); textBrowser->setPalette(myPalette);
textBrowser_2->setPalette(myPalette); textBrowser_2->setPalette(myPalette);
textBrowser_3->setPalette(myPalette); textBrowser_3->setPalette(myPalette);
textBrowser_4->setPalette(myPalette);
} }
src/gui/qt/createnetworkgamedialog.ui
+1 -1
View File
@@ -74,7 +74,7 @@
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label" > <widget class="QLabel" name="label" >
<property name="text" > <property name="text" >
<string>Number of players:</string> <string>Maximum number of players:</string>
</property> </property>
</widget> </widget>
</item> </item>
src/gui/qt/mainwindow/startsplash/startsplash.cpp
+25 -28
View File
@@ -73,30 +73,20 @@ void StartSplash::paintEvent(QPaintEvent * event) {
haveFont.setFamily("Andy MT"); haveFont.setFamily("Andy MT");
haveFont.setPixelSize(36); haveFont.setPixelSize(36);
#endif #endif
/*
#ifdef _WIN32 QFont versionFont;
QFont welcomeFont; versionFont.setFamily("Nimbus Sans L");
welcomeFont.setFamily("Times New Roman"); versionFont.setPixelSize(12);
welcomeFont.setPixelSize(42);
#else
QFont welcomeFont;
welcomeFont.setFamily("Century Schoolbook L");
welcomeFont.setPixelSize(35);
#endif
QFont haveFont;
haveFont.setFamily("Andy MT");
haveFont.setPixelSize(36);*/
QPixmap logo(":/graphics/resources/graphics/logoChip3D.png"); QPixmap logo(":/graphics/resources/graphics/logoChip3D.png");
if(frameNo >= 52 && frameNo < 65) { if(frameNo >= 52 && frameNo < 55) {
painter.setBrush(QColor(35,71,0)); painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); painter.drawRect(0,0,399,249);
} }
if(frameNo >= 65 && frameNo < 68) { if(frameNo >= 55 && frameNo < 57) {
painter.setBrush(QColor(35,71,0)); painter.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); 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.setBrush(QColor(35,71,0));
painter.drawRect(0,0,399,249); painter.drawRect(0,0,399,249);
@@ -274,11 +264,18 @@ void StartSplash::paintEvent(QPaintEvent * event) {
} }
if(frameNo >= 245) { if(frameNo >=190) {
this->hide(); this->hide();
// myW->label_logo->show(); // 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);
} }
src/gui/qt/settingsdialog.ui
+5 -12
View File
@@ -387,11 +387,6 @@ p, li { white-space: pre-wrap; }
<string>0.4 (current)</string> <string>0.4 (current)</string>
</property> </property>
</item> </item>
<item>
<property name="text" >
<string>0.3 (previous)</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="7" column="0" > <item row="7" column="0" >
@@ -425,6 +420,9 @@ p, li { white-space: pre-wrap; }
</property> </property>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QLineEdit" name="lineEdit_serverPassword" > <widget class="QLineEdit" name="lineEdit_serverPassword" >
<property name="maxLength" >
<number>60</number>
</property>
<property name="echoMode" > <property name="echoMode" >
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
</property> </property>
@@ -446,7 +444,7 @@ p, li { white-space: pre-wrap; }
<number>80</number> <number>80</number>
</property> </property>
<property name="value" > <property name="value" >
<number>80</number> <number>7234</number>
</property> </property>
</widget> </widget>
</item> </item>
@@ -585,7 +583,7 @@ p, li { white-space: pre-wrap; }
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_15" > <widget class="QLabel" name="label_15" >
<property name="text" > <property name="text" >
<string>Number of players:</string> <string>Maximum number of players:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -596,11 +594,6 @@ p, li { white-space: pre-wrap; }
<string>0.4 (actual)</string> <string>0.4 (actual)</string>
</property> </property>
</item> </item>
<item>
<property name="text" >
<string>0.3 (previous)</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="5" column="0" > <item row="5" column="0" >