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

fixed tab-order, remember external avatar directory, gui-speed-init only for first network game

Browse Source
This commit is contained in:
doitux
2007-06-13 08:03:59 +00:00
parent 13aca4f616
commit 32a0d99a54
18 changed files with 1550 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth.pro
+1
View File
@@ -245,6 +245,7 @@ TRANSLATIONS = ts/pokerth_de.ts \
ts/pokerth_se.ts \
ts/pokerth_pt.ts \
ts/pokerth_tr.ts \
ts/pokerth_ru.ts \
ts/pokerth_nl.ts
CODECFORSRC = UTF-8
src/gui/qt/createnetworkgamedialog.ui
+1
View File
@@ -196,6 +196,7 @@
<tabstop>spinBox_smallBlind</tabstop>
<tabstop>spinBox_handsBeforeRaiseSmallBlind</tabstop>
<tabstop>spinBox_gameSpeed</tabstop>
<tabstop>spinBox_netTimeOutPlayerAction</tabstop>
<tabstop>pushButton_createGame</tabstop>
<tabstop>pushButton_cancel</tabstop>
</tabstops>
src/gui/qt/joinnetworkgamedialog.ui
+1
View File
@@ -334,6 +334,7 @@ p, li { white-space: pre-wrap; }
<tabstop>lineEdit_profileName</tabstop>
<tabstop>spinBox_port</tabstop>
<tabstop>checkBox_ipv6</tabstop>
<tabstop>checkBox_sctp</tabstop>
<tabstop>treeWidget</tabstop>
<tabstop>pushButton_save</tabstop>
<tabstop>pushButton_delete</tabstop>
src/gui/qt/mainwindow/mainwindowimpl.cpp
+9 -5
View File
@@ -866,11 +866,15 @@ void mainWindowImpl::initGui(int speed)
for(int i=0; i<3; i++) {
userWidgetsArray[i]->show();
}
guiGameSpeed = speed;
//positioning Slider
horizontalSlider_speed->setValue(guiGameSpeed);
setSpeeds();
//set speeds for local game and for first network game
if( !mySession->isNetworkClientRunning() || (mySession->isNetworkClientRunning() && !mySession->getCurrentGame()) ) {
guiGameSpeed = speed;
//positioning Slider
horizontalSlider_speed->setValue(guiGameSpeed);
setSpeeds();
}
}
void mainWindowImpl::showServerStartDialog()
src/gui/qt/selectavatardialog.ui
+6
View File
@@ -127,6 +127,12 @@
</layout>
</widget>
</widget>
<tabstops>
<tabstop>listWidget</tabstop>
<tabstop>lineEdit</tabstop>
<tabstop>pushButton_OpenAvatarFile</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
src/gui/qt/settingsdialog.ui
+17
View File
@@ -2028,6 +2028,8 @@ p, li { white-space: pre-wrap; }
<tabstop>checkBox_showStatusbarMessages</tabstop>
<tabstop>checkBox_showFadeOutCardsAnimation</tabstop>
<tabstop>checkBox_showFlipCardsAnimation</tabstop>
<tabstop>checkBox_showBlindButtons</tabstop>
<tabstop>checkBox_playSoundEffects</tabstop>
<tabstop>radioButton_flipsideTux</tabstop>
<tabstop>radioButton_flipsideOwn</tabstop>
<tabstop>lineEdit_OwnFlipsideFilename</tabstop>
@@ -2046,10 +2048,25 @@ p, li { white-space: pre-wrap; }
<tabstop>spinBox_netHandsBeforeRaiseSmallBlind</tabstop>
<tabstop>spinBox_netGameSpeed</tabstop>
<tabstop>comboBox_netEngineVersion</tabstop>
<tabstop>spinBox_netTimeOutPlayerAction</tabstop>
<tabstop>spinBox_serverPort</tabstop>
<tabstop>lineEdit_serverPassword</tabstop>
<tabstop>checkBox_useIpv6</tabstop>
<tabstop>checkBox_useSctp</tabstop>
<tabstop>pushButton_HumanPlayerAvatar</tabstop>
<tabstop>lineEdit_HumanPlayerName</tabstop>
<tabstop>pushButton_Opponent1Avatar</tabstop>
<tabstop>lineEdit_Opponent1Name</tabstop>
<tabstop>pushButton_Opponent2Avatar</tabstop>
<tabstop>lineEdit_Opponent2Name</tabstop>
<tabstop>pushButton_Opponent3Avatar</tabstop>
<tabstop>lineEdit_Opponent3Name</tabstop>
<tabstop>pushButton_Opponent4Avatar</tabstop>
<tabstop>lineEdit_Opponent4Name</tabstop>
<tabstop>pushButton_Opponent5Avatar</tabstop>
<tabstop>lineEdit_Opponent5Name</tabstop>
<tabstop>pushButton_Opponent6Avatar</tabstop>
<tabstop>lineEdit_Opponent6Name</tabstop>
<tabstop>lineEdit_logDir</tabstop>
<tabstop>pushButton_openLogDir</tabstop>
<tabstop>spinBox_logStoreDuration</tabstop>
src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp
+7 -4
View File
@@ -24,7 +24,7 @@
selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c)
: QDialog(parent), myConfig(c), settingsCorrect(TRUE)
: QDialog(parent), myConfig(c), settingsCorrect(TRUE), avatarDir("")
{
setupUi(this);
@@ -159,9 +159,12 @@ void selectAvatarDialogImpl::isRejected() { settingsCorrect = FALSE; }
void selectAvatarDialogImpl::setExternalAvatar() {
QString fileName = QFileDialog::getOpenFileName(this, tr("Select external avatar picture"), QDir::homePath(), tr("Images (*.png)"));
if (avatarDir == "") avatarDir = QDir::homePath();
QString fileName = QFileDialog::getOpenFileName(this, tr("Select external avatar picture"), avatarDir, tr("Images (*.png)"));
if (!fileName.isEmpty())
lineEdit->setText(fileName);
if (!fileName.isEmpty()) {
lineEdit->setText(fileName);
avatarDir = fileName;
}
}
src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h
+1
View File
@@ -53,6 +53,7 @@ private:
ConfigFile* myConfig;
bool settingsCorrect;
QString externalAvatar;
QString avatarDir;
};
src/gui/qt/startnetworkgamedialog.ui
+1
View File
@@ -120,6 +120,7 @@
</widget>
<tabstops>
<tabstop>treeWidget</tabstop>
<tabstop>pushButton_Kick</tabstop>
<tabstop>pushButton_startGame</tabstop>
<tabstop>pushButton_cancel</tabstop>
</tabstops>
ts/pokerth_de.ts
+5 -5
View File
@@ -1426,28 +1426,28 @@ If the server is behind a NAT-Router, make sure port forwarding has been set up
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation type="unfinished"></translation>
</message>
ts/pokerth_es.ts
+5 -6
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="1.1" language="es">
<defaultcodec></defaultcodec>
<context>
<name>aboutPokerth</name>
<message>
@@ -1504,29 +1503,29 @@ Si el servidor está detrás de un enrutador NAT, asegúrese de que el puerto de
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation>Error en el archivo del avatar</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation>Seleccione un avatar de la lista</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation>La imagen del avatar introducida no existe.
Introduzca una imagen válida.</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation>Seleccione una imagen de avatar externa</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation>Imágenes (*.png)</translation>
</message>
ts/pokerth_fr.ts
+5 -5
View File
@@ -1493,28 +1493,28 @@ If the server is behind a NAT-Router, make sure port forwarding has been set up
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation type="unfinished">Images (*.png)</translation>
</message>
ts/pokerth_it.ts
+5 -5
View File
@@ -1029,28 +1029,28 @@ If the server is behind a NAT-Router, make sure port forwarding has been set up
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation type="unfinished"></translation>
</message>
ts/pokerth_nl.ts
+5 -6
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="1.1" language="de">
<defaultcodec></defaultcodec>
<context>
<name>aboutPokerth</name>
<message>
@@ -1528,29 +1527,29 @@ Als de server zich achter een NAT-router bevindt, controleer dan daar of port fo
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation>Bestandsfout spelerplaatje</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation>Kies a.u.b. een spelerplaatje uit de lijst!</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation>Het ingestelde spelerplaatje bestaat niet.
Stel a.u.b. een geldig plaatje in!</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation>Kies een extern spelerplaatje</translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation>Plaatjes (*.png)</translation>
</message>
ts/pokerth_pt.ts
+5 -5
View File
@@ -1029,28 +1029,28 @@ If the server is behind a NAT-Router, make sure port forwarding has been set up
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation type="unfinished"></translation>
</message>
ts/pokerth_ru.ts
+1466
View File
File diff suppressed because it is too large Load Diff
ts/pokerth_se.ts
+5 -5
View File
@@ -1029,28 +1029,28 @@ If the server is behind a NAT-Router, make sure port forwarding has been set up
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation type="unfinished"></translation>
</message>
ts/pokerth_tr.ts
+5 -5
View File
@@ -1029,28 +1029,28 @@ If the server is behind a NAT-Router, make sure port forwarding has been set up
<context>
<name>selectAvatarDialogImpl</name>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="143"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<source>Avatar File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="131"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="133"/>
<source>Please select an avatar from the list!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="145"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="147"/>
<source>The entered avatar picture doesn&apos;t exists.
Please enter an valid picture!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Select external avatar picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="160"/>
<location filename="../src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp" line="162"/>
<source>Images (*.png)</source>
<translation type="unfinished"></translation>
</message>