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

Browse Source
This commit is contained in:
doitux
2007-03-01 21:30:40 +00:00
parent eae5f68f89
commit 2649ee716c
3 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/aboutpokerth.ui
+3 -3
View File
@@ -96,9 +96,9 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> #pokerth (irc.freenode.net)</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> #pokerth (irc.freenode.net)</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;"></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;">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-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;"> Felix Hammer (<a href="mailto:f.hammer@web.de"><span style=" text-decoration: underline; color:#0000ff;">f.hammer@web.de</span></a>)</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Felix Hammer (<a href="mailto:doitux@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a>)</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Florian Thauer (<a href="mailto:f.thauer@web.de"><span style=" text-decoration: underline; color:#0000ff;">f.thauer@web.de</span></a>)</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Florian Thauer (<a href="mailto:floty@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a>)</p>
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Lothar May (&lt;a href="mailto:l-may@gmx.de">&lt;span style=" text-decoration: underline; color:#0000ff;">l-may@gmx.de&lt;/span>&lt;/a>)&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;"> Lothar May (&lt;a href="mailto:lotodore@pokerth.net">&lt;span style=" text-decoration: underline; color:#0000ff;">lotodore@pokerth.net&lt;/span>&lt;/a>)&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
</widget> </widget>
</item> </item>
src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+34 -11
View File
@@ -165,20 +165,43 @@ void joinNetworkGameDialogImpl::saveServerProfile() {
TiXmlElement * testProfile = docHandle.FirstChild( "PokerTH" ).FirstChild( "ServerProfiles" ).FirstChild( lineEdit_profileName->text().toStdString() ).ToElement(); TiXmlElement * testProfile = docHandle.FirstChild( "PokerTH" ).FirstChild( "ServerProfiles" ).FirstChild( lineEdit_profileName->text().toStdString() ).ToElement();
if( testProfile ) { if( testProfile ) {
// Wenn der Name schon existiert --> Hinweis und nicht speichern // Wenn der Name schon existiert --> Überschreiben?
QMessageBox::warning(this, tr("Save Server Profile Error"), QMessageBox msgBox(QMessageBox::Warning, tr("Save Server Profile Error"),
tr("A Profile with this Name already exists.\nPlease select another Profile Name!"), tr("A Profile with this Name already exists.\nDo you want to overwrite ?"), QMessageBox::Yes | QMessageBox::No, this);
QMessageBox::Close); switch (msgBox.exec()) {
case QMessageBox::Yes: {
// yes was clicked
// remove the old
testProfile->Parent()->RemoveChild(testProfile);
// write the new
TiXmlElement * profile1 = new TiXmlElement( lineEdit_profileName->text().toStdString() );
profiles->LinkEndChild( profile1 );
profile1->SetAttribute("Name", lineEdit_profileName->text().toStdString());
profile1->SetAttribute("Address", lineEdit_ipAddress->text().toStdString());
profile1->SetAttribute("Password", lineEdit_password->text().toStdString());
profile1->SetAttribute("Port", spinBox_port->value());
profile1->SetAttribute("IsIpv6", checkBox_ipv6->isChecked());
}
break;
case QMessageBox::No:
// no was clicked
break;
default:
// should never be reached
break;
}
} }
else { else {
// Wenn der Name nicht existiert --> speichern // Wenn der Name nicht existiert --> speichern
TiXmlElement * profile = new TiXmlElement( lineEdit_profileName->text().toStdString() ); TiXmlElement * profile2 = new TiXmlElement( lineEdit_profileName->text().toStdString() );
profiles->LinkEndChild( profile ); profiles->LinkEndChild( profile2 );
profile->SetAttribute("Name", lineEdit_profileName->text().toStdString()); profile2->SetAttribute("Name", lineEdit_profileName->text().toStdString());
profile->SetAttribute("Address", lineEdit_ipAddress->text().toStdString()); profile2->SetAttribute("Address", lineEdit_ipAddress->text().toStdString());
profile->SetAttribute("Password", lineEdit_password->text().toStdString()); profile2->SetAttribute("Password", lineEdit_password->text().toStdString());
profile->SetAttribute("Port", spinBox_port->value()); profile2->SetAttribute("Port", spinBox_port->value());
profile->SetAttribute("IsIpv6", checkBox_ipv6->isChecked()); profile2->SetAttribute("IsIpv6", checkBox_ipv6->isChecked());
} }
} }
src/gui/qt/mainwindow/mainwindowimpl.cpp
+5 -4
View File
@@ -478,8 +478,8 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
connect(this, SIGNAL(SignalNetClientSuccess(int)), myConnectToServerDialog, SLOT(refresh(int))); connect(this, SIGNAL(SignalNetClientSuccess(int)), myConnectToServerDialog, SLOT(refresh(int)));
connect(this, SIGNAL(SignalNetClientError(int, int)), myConnectToServerDialog, SLOT(error(int, int))); connect(this, SIGNAL(SignalNetClientError(int, int)), myConnectToServerDialog, SLOT(error(int, int)));
textBrowser_Log->append(QString::number(this->pos().x(),10)+" "+QString::number(this->pos().y(),10)); // textBrowser_Log->append(QString::number(this->pos().x(),10)+" "+QString::number(this->pos().y(),10));
textBrowser_Log->append(QString::number(this->x(),10)+" "+QString::number(this->y(),10)); // textBrowser_Log->append(QString::number(this->x(),10)+" "+QString::number(this->y(),10));
} }
@@ -1977,8 +1977,9 @@ void mainWindowImpl::paintStartSplash() {
StartSplash *mySplash = new StartSplash(this); StartSplash *mySplash = new StartSplash(this);
mySplash->setMaximumSize(400,250); // mySplash->setMaximumSize(400,250);
mySplash->setMinimumSize(400,250); // mySplash->setMinimumSize(400,250);
mySplash->setGeometry(237,210,400,250);
// mySplash->setWindowFlags(Qt::SplashScreen); // mySplash->setWindowFlags(Qt::SplashScreen);
mySplash->show(); mySplash->show();
} }