dutch, german translation update; string updates; IRC server configuration added; password-dialog to join a private game; return-event for chat-input (chat-classes not implementet)
This commit is contained in:
doitux
@@ -51,7 +51,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
|
||||
if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; }
|
||||
}
|
||||
// !!!! Revisionsnummer der Configdefaults !!!!!
|
||||
configRev = 28;
|
||||
configRev = 30;
|
||||
|
||||
//standard defaults
|
||||
logOnOffDefault = "1";
|
||||
@@ -177,6 +177,10 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
|
||||
configList.push_back(ConfigInfo("InternetServerUseSctp", CONFIG_TYPE_INT, "0"));
|
||||
configList.push_back(ConfigInfo("UseInternetGamePassword", CONFIG_TYPE_INT, "0"));
|
||||
configList.push_back(ConfigInfo("InternetGamePassword", CONFIG_TYPE_STRING, ""));
|
||||
configList.push_back(ConfigInfo("IRCServerAddress", CONFIG_TYPE_STRING, "chat.freenode.net"));
|
||||
configList.push_back(ConfigInfo("IRCServerPort", CONFIG_TYPE_INT, "6667"));
|
||||
configList.push_back(ConfigInfo("IRCChannel", CONFIG_TYPE_STRING, "#pokerth"));
|
||||
configList.push_back(ConfigInfo("IRCServerUseIpv6", CONFIG_TYPE_INT, "0"));
|
||||
configList.push_back(ConfigInfo("MyName", CONFIG_TYPE_STRING, "Human Player"));
|
||||
configList.push_back(ConfigInfo("MyAvatar", CONFIG_TYPE_STRING, ""));
|
||||
configList.push_back(ConfigInfo("Opponent1Name", CONFIG_TYPE_STRING, "Player 1"));
|
||||
|
||||
@@ -5,18 +5,30 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>297</width>
|
||||
<height>305</height>
|
||||
<width>303</width>
|
||||
<height>316</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Create Game</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" >
|
||||
@@ -25,10 +37,22 @@
|
||||
<string>Game Settings</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="4" column="0" colspan="3" >
|
||||
@@ -51,7 +75,7 @@
|
||||
<item row="3" column="0" colspan="2" >
|
||||
<widget class="QLabel" name="label_4" >
|
||||
<property name="text" >
|
||||
<string>Hands before raise small blind:</string>
|
||||
<string>Hands before raise blinds:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -64,12 +88,12 @@
|
||||
</item>
|
||||
<item row="5" column="2" colspan="2" >
|
||||
<widget class="QSpinBox" name="spinBox_netTimeOutPlayerAction" >
|
||||
<property name="maximum" >
|
||||
<number>60</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>60</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>20</number>
|
||||
</property>
|
||||
@@ -77,12 +101,12 @@
|
||||
</item>
|
||||
<item row="0" column="1" colspan="3" >
|
||||
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
|
||||
<property name="maximum" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
@@ -90,12 +114,12 @@
|
||||
</item>
|
||||
<item row="1" column="1" colspan="3" >
|
||||
<widget class="QSpinBox" name="spinBox_startCash" >
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>2000</number>
|
||||
</property>
|
||||
@@ -124,12 +148,12 @@
|
||||
</item>
|
||||
<item row="2" column="1" colspan="3" >
|
||||
<widget class="QSpinBox" name="spinBox_smallBlind" >
|
||||
<property name="maximum" >
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>10</number>
|
||||
</property>
|
||||
@@ -137,12 +161,12 @@
|
||||
</item>
|
||||
<item row="4" column="3" >
|
||||
<widget class="QSpinBox" name="spinBox_gameSpeed" >
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>4</number>
|
||||
</property>
|
||||
@@ -150,12 +174,21 @@
|
||||
</item>
|
||||
<item row="6" column="0" colspan="4" >
|
||||
<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>
|
||||
<widget class="QCheckBox" name="checkBox_Password" >
|
||||
<property name="text" >
|
||||
@@ -180,12 +213,21 @@
|
||||
</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" >
|
||||
|
||||
@@ -5,18 +5,30 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>290</width>
|
||||
<height>272</height>
|
||||
<width>303</width>
|
||||
<height>284</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Create Network Game</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" >
|
||||
@@ -25,10 +37,22 @@
|
||||
<string>Network Game Settings</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="4" column="0" colspan="3" >
|
||||
@@ -51,7 +75,7 @@
|
||||
<item row="3" column="0" colspan="2" >
|
||||
<widget class="QLabel" name="label_4" >
|
||||
<property name="text" >
|
||||
<string>Hands before raise small blind:</string>
|
||||
<string>Hands before raise blinds:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -64,12 +88,12 @@
|
||||
</item>
|
||||
<item row="5" column="2" colspan="2" >
|
||||
<widget class="QSpinBox" name="spinBox_netTimeOutPlayerAction" >
|
||||
<property name="maximum" >
|
||||
<number>60</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>60</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>20</number>
|
||||
</property>
|
||||
@@ -77,12 +101,12 @@
|
||||
</item>
|
||||
<item row="0" column="1" colspan="3" >
|
||||
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
|
||||
<property name="maximum" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
@@ -90,12 +114,12 @@
|
||||
</item>
|
||||
<item row="1" column="1" colspan="3" >
|
||||
<widget class="QSpinBox" name="spinBox_startCash" >
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>2000</number>
|
||||
</property>
|
||||
@@ -124,12 +148,12 @@
|
||||
</item>
|
||||
<item row="2" column="1" colspan="3" >
|
||||
<widget class="QSpinBox" name="spinBox_smallBlind" >
|
||||
<property name="maximum" >
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>10</number>
|
||||
</property>
|
||||
@@ -137,12 +161,12 @@
|
||||
</item>
|
||||
<item row="4" column="3" >
|
||||
<widget class="QSpinBox" name="spinBox_gameSpeed" >
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>4</number>
|
||||
</property>
|
||||
@@ -153,12 +177,21 @@
|
||||
</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" >
|
||||
|
||||
@@ -187,37 +187,6 @@
|
||||
<string>Game Info</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" >
|
||||
<property name="leftMargin" >
|
||||
<number>9</number>
|
||||
</property>
|
||||
<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="4" column="0" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>125</width>
|
||||
<height>71</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0" >
|
||||
<widget class="QTreeWidget" name="treeWidget_connectedPlayers" >
|
||||
<property name="minimumSize" >
|
||||
@@ -233,6 +202,13 @@
|
||||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" >
|
||||
<widget class="QCheckBox" name="checkBox_fillUpWithComputerOpponents" >
|
||||
<property name="text" >
|
||||
<string>Fill up with computer opponents</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" >
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="spacing" >
|
||||
@@ -295,13 +271,6 @@
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="5" column="0" >
|
||||
<widget class="QPushButton" name="pushButton_Leave" >
|
||||
<property name="text" >
|
||||
<string>Leave</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" >
|
||||
<layout class="QGridLayout" >
|
||||
<property name="leftMargin" >
|
||||
@@ -325,7 +294,7 @@
|
||||
<item row="3" column="0" >
|
||||
<widget class="QLabel" name="label_5" >
|
||||
<property name="text" >
|
||||
<string>Hands to raise small blind:</string>
|
||||
<string>Hands before raise blinds:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -394,12 +363,29 @@
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0" >
|
||||
<widget class="QCheckBox" name="checkBox_fillUpWithComputerOpponents" >
|
||||
<property name="text" >
|
||||
<string>Fill up with computer opponents</string>
|
||||
<item row="4" column="0" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>125</width>
|
||||
<height>71</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="5" column="0" >
|
||||
<layout class="QHBoxLayout" >
|
||||
<item>
|
||||
<widget class="QPushButton" name="pushButton_Leave" >
|
||||
<property name="text" >
|
||||
<string>Leave Game</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
||||
@@ -27,6 +27,7 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
|
||||
connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) );
|
||||
connect( pushButton_Leave, SIGNAL( clicked() ), this, SLOT( leaveGame() ) );
|
||||
connect( treeWidget_connectedPlayers, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( playerSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
|
||||
connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) );
|
||||
|
||||
clearDialog();
|
||||
}
|
||||
@@ -65,7 +66,8 @@ void gameLobbyDialogImpl::createGame()
|
||||
gameData.guiSpeed = myCreateInternetGameDialog->spinBox_gameSpeed->value();
|
||||
gameData.playerActionTimeoutSec = myCreateInternetGameDialog->spinBox_netTimeOutPlayerAction->value();
|
||||
|
||||
currentGameName = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()) + QString("'s game");
|
||||
QString gameString(tr("game"));
|
||||
currentGameName = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()) + QString("'s "+ gameString);
|
||||
|
||||
label_SmallBlind->setText(QString::number(gameData.smallBlind));
|
||||
label_StartCash->setText(QString::number(gameData.startMoney));
|
||||
@@ -73,7 +75,7 @@ void gameLobbyDialogImpl::createGame()
|
||||
label_HandsToRaiseSmallBlind->setText(QString::number(gameData.handsBeforeRaise));
|
||||
label_TimeoutForPlayerAction->setText(QString::number(gameData.playerActionTimeoutSec));
|
||||
|
||||
mySession->clientCreateGame(gameData, myConfig->readConfigString("MyName") + "'s game", myCreateInternetGameDialog->lineEdit_Password->text().toUtf8().constData());
|
||||
mySession->clientCreateGame(gameData, myConfig->readConfigString("MyName") + "'s "+ gameString.toUtf8().constData(), myCreateInternetGameDialog->lineEdit_Password->text().toUtf8().constData());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,6 +85,20 @@ void gameLobbyDialogImpl::joinGame()
|
||||
if (item)
|
||||
{
|
||||
assert(mySession);
|
||||
|
||||
int isPrivate = 1;
|
||||
//if private ask for password
|
||||
if(isPrivate) {
|
||||
|
||||
bool ok;
|
||||
QString password = QInputDialog::getText(this, tr("Join a private Game"),
|
||||
tr("You like to join a private game. Please enter the password!"), QLineEdit::Password, (""), &ok);
|
||||
if (ok && !password.isEmpty()) {
|
||||
// std::cout << password.toStdString() << "\n";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
mySession->clientJoinGame(item->data(0, Qt::UserRole).toUInt(), "");
|
||||
}
|
||||
}
|
||||
@@ -362,3 +378,4 @@ void gameLobbyDialogImpl::kickPlayer() {
|
||||
pushButton_Kick->setEnabled(false);
|
||||
}
|
||||
|
||||
void gameLobbyDialogImpl::sendChatMessage() { /*myChat->sendMessage();*/ }
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
#include <QtGui>
|
||||
#include <QtCore>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "createinternetgamedialogimpl.h"
|
||||
#include "sdlplayer.h"
|
||||
#include "mainwindowimpl.h"
|
||||
@@ -73,6 +75,8 @@ public slots:
|
||||
void gameModeDialogUpdate();
|
||||
void clearDialog();
|
||||
|
||||
void sendChatMessage();
|
||||
|
||||
private:
|
||||
|
||||
mainWindowImpl* myW;
|
||||
|
||||
@@ -401,8 +401,9 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
textBrowser_Log->setStyleSheet("QTextBrowser { "+ font1String +" font-size: 11px; color: #F0F0F0; background-color: #1D3B00; border:none; }");
|
||||
#else
|
||||
textBrowser_Log->setStyleSheet("QTextBrowser { "+ font1String +" font-size: 10px; color: #F0F0F0; background-color: #1D3B00; border:none; }");
|
||||
// textBrowser_Log->verticalScrollBar()->setStyleSheet("background: yellow");
|
||||
// textBrowser_Log->verticalScrollBar()->setPalette(QColor(0,20,20));
|
||||
// textBrowser_Log->verticalScrollBar()->setAutoFillBackground ( TRUE );
|
||||
|
||||
textBrowser_Chat->setStyleSheet("QTextBrowser { "+ font1String +" font-size: 10px; color: #F0F0F0; background-color: #1D3B00; border:none; }");
|
||||
lineEdit_ChatInput->setStyleSheet("QLineEdit { "+ font1String +" font-size: 10px; color: #F0F0F0; background-color: #1D3B00; border-top: 2px solid #286400; }");
|
||||
#endif
|
||||
@@ -1742,8 +1743,8 @@ void mainWindowImpl::myCall(){
|
||||
|
||||
void mainWindowImpl::myBet(){
|
||||
|
||||
spinBox_set->show();
|
||||
pushButton_BetRaise->hide();
|
||||
spinBox_set->show();
|
||||
pushButton_CallCheckSet->setText("Set");
|
||||
pushButton_FoldAllin->setText("All-In");
|
||||
|
||||
@@ -1762,8 +1763,8 @@ void mainWindowImpl::myBet(){
|
||||
|
||||
void mainWindowImpl::myRaise(){
|
||||
|
||||
spinBox_set->show();
|
||||
pushButton_BetRaise->hide();
|
||||
spinBox_set->show();
|
||||
pushButton_CallCheckSet->setText("Set");
|
||||
pushButton_FoldAllin->setText("All-In");
|
||||
|
||||
|
||||
+42
-18
@@ -6,17 +6,29 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>280</width>
|
||||
<height>241</height>
|
||||
<height>249</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Start Local Game</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" >
|
||||
@@ -25,20 +37,32 @@
|
||||
<string>Local Game Settings</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="4" column="1" colspan="2" >
|
||||
<widget class="QSpinBox" name="spinBox_gameSpeed" >
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>11</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>4</number>
|
||||
</property>
|
||||
@@ -63,12 +87,12 @@
|
||||
</item>
|
||||
<item row="2" column="1" colspan="2" >
|
||||
<widget class="QSpinBox" name="spinBox_smallBlind" >
|
||||
<property name="maximum" >
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>5</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>10</number>
|
||||
</property>
|
||||
@@ -76,12 +100,12 @@
|
||||
</item>
|
||||
<item row="0" column="1" colspan="2" >
|
||||
<widget class="QSpinBox" name="spinBox_quantityPlayers" >
|
||||
<property name="maximum" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>7</number>
|
||||
</property>
|
||||
@@ -110,12 +134,12 @@
|
||||
</item>
|
||||
<item row="1" column="1" colspan="2" >
|
||||
<widget class="QSpinBox" name="spinBox_startCash" >
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="minimum" >
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum" >
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="value" >
|
||||
<number>2000</number>
|
||||
</property>
|
||||
@@ -124,7 +148,7 @@
|
||||
<item row="3" column="0" colspan="2" >
|
||||
<widget class="QLabel" name="label_4" >
|
||||
<property name="text" >
|
||||
<string>Hands before raise small blind:</string>
|
||||
<string>Hands before raise blinds:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
+686
-296
File diff suppressed because it is too large
Load Diff
@@ -34,6 +34,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
|
||||
QtHelper *myQtHelper = new QtHelper;
|
||||
|
||||
pushButton_openFlipsidePicture->setIcon(QIcon(QPixmap(myQtHelper->getDataPath()+"gfx/gui/misc/fileopen16.png")));
|
||||
pushButton_openLogDir->setIcon(QIcon(QPixmap(myQtHelper->getDataPath()+"gfx/gui/misc/fileopen16.png")));
|
||||
|
||||
if (myConfig->readConfigInt("CLA_NoWriteAccess")) { groupBox_logOnOff->setDisabled(TRUE); }
|
||||
|
||||
@@ -132,6 +133,10 @@ void settingsDialogImpl::exec() {
|
||||
if(myConfig->readConfigInt("UseInternetGamePassword")) {
|
||||
lineEdit_InternetGamePassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str()));
|
||||
}
|
||||
lineEdit_IRCServerAddress->setText(QString::fromUtf8(myConfig->readConfigString("IRCServerAddress").c_str()));
|
||||
spinBox_IRCServerPort->setValue(myConfig->readConfigInt("IRCServerPort"));
|
||||
lineEdit_IRCChannel->setText(QString::fromUtf8(myConfig->readConfigString("IRCChannel").c_str()));
|
||||
checkBox_IRCServerUseIpv6->setChecked(myConfig->readConfigInt("IRCServerUseIpv6"));
|
||||
|
||||
//Interface
|
||||
checkBox_showLeftToolbox->setChecked(myConfig->readConfigInt("ShowLeftToolBox"));
|
||||
@@ -222,6 +227,10 @@ void settingsDialogImpl::isAccepted() {
|
||||
myConfig->writeConfigInt("InternetServerUseSctp", checkBox_InternetServerUseSctp->isChecked());
|
||||
myConfig->writeConfigInt("UseInternetGamePassword", checkBox_UseInternetGamePassword->isChecked());
|
||||
myConfig->writeConfigString("InternetGamePassword", lineEdit_InternetGamePassword->text().toUtf8().constData());
|
||||
myConfig->writeConfigString("IRCServerAddress", lineEdit_IRCServerAddress->text().toUtf8().constData());
|
||||
myConfig->writeConfigInt("IRCServerPort", spinBox_IRCServerPort->value());
|
||||
myConfig->writeConfigString("IRCChannel", lineEdit_IRCChannel->text().toUtf8().constData());
|
||||
myConfig->writeConfigInt("IRCServerUseIpv6", checkBox_IRCServerUseIpv6->isChecked());
|
||||
|
||||
// Interface
|
||||
myConfig->writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked());
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>388</width>
|
||||
<height>550</height>
|
||||
<width>403</width>
|
||||
<height>560</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
|
||||
@@ -31,6 +31,8 @@ startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFi
|
||||
connect( pushButton_startGame, SIGNAL( clicked() ), this, SLOT( startGame() ) );
|
||||
connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) );
|
||||
connect( treeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( playerSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
|
||||
connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) );
|
||||
|
||||
|
||||
clearDialog();
|
||||
}
|
||||
@@ -174,3 +176,5 @@ void startNetworkGameDialogImpl::keyPressEvent ( QKeyEvent * event ) {
|
||||
if (event->key() == 16777220) { pushButton_startGame->click(); } //ENTER
|
||||
|
||||
}
|
||||
|
||||
void startNetworkGameDialogImpl::sendChatMessage() { /*myChat->sendMessage();*/ }
|
||||
|
||||
@@ -61,6 +61,8 @@ public slots:
|
||||
|
||||
void exec();
|
||||
|
||||
void sendChatMessage();
|
||||
|
||||
private:
|
||||
|
||||
mainWindowImpl* myW;
|
||||
|
||||
Reference in New Issue
Block a user