translation update ptbr and ru. backtolobby button more in foreground now. also warning window for leaving online-game
This commit is contained in:
doitux
Binary file not shown.
Binary file not shown.
+7
-24
@@ -3,8 +3,8 @@
|
||||
TEMPLATE = app
|
||||
CODECFORSRC = UTF-8
|
||||
|
||||
CONFIG += qt thread embed_manifest_exe warn_on release
|
||||
#CONFIG += qt thread embed_manifest_exe warn_on debug
|
||||
#CONFIG += qt thread embed_manifest_exe warn_on release
|
||||
CONFIG += qt thread embed_manifest_exe warn_on debug
|
||||
|
||||
#Uncomment this for RELEASE
|
||||
QTPLUGIN += qjpeg qgif
|
||||
@@ -46,6 +46,7 @@ INCLUDEPATH += . \
|
||||
src/gui/qt/startnetworkgamedialog \
|
||||
src/gui/qt/changehumanplayernamedialog \
|
||||
src/gui/qt/changecompleteblindsdialog \
|
||||
src/gui/qt/mymessagedialog \
|
||||
src/gui/qt/gamelobbydialog \
|
||||
src/gui/qt/gamelobbydialog/lobbychat
|
||||
|
||||
@@ -82,6 +83,7 @@ DEPENDPATH += . \
|
||||
src/gui/qt/startnetworkgamedialog \
|
||||
src/gui/qt/changehumanplayernamedialog \
|
||||
src/gui/qt/changecompleteblindsdialog \
|
||||
src/gui/qt/mymessagedialog \
|
||||
src/gui/qt/gamelobbydialog \
|
||||
src/gui/qt/gamelobbydialog/lobbychat
|
||||
|
||||
@@ -162,6 +164,7 @@ HEADERS += \
|
||||
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h \
|
||||
src/gui/qt/gamelobbydialog/mygamelisttreewidget.h \
|
||||
src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h \
|
||||
src/gui/qt/mymessagedialog/mymessagedialogimpl.h \
|
||||
src/gui/qttoolsinterface.h \
|
||||
src/gui/qt/qttools/qttoolswrapper.h \
|
||||
src/gui/qt/qttools/qthelper/qthelper.h \
|
||||
@@ -181,6 +184,7 @@ FORMS += \
|
||||
src/gui/qt/changehumanplayernamedialog.ui \
|
||||
src/gui/qt/changecompleteblindsdialog.ui \
|
||||
src/gui/qt/gamelobbydialog.ui \
|
||||
src/gui/qt/mymessagedialog.ui \
|
||||
src/gui/qt/manualblindsorderdialog.ui
|
||||
|
||||
SOURCES += \
|
||||
@@ -214,6 +218,7 @@ SOURCES += \
|
||||
src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \
|
||||
src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp \
|
||||
src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp \
|
||||
src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp \
|
||||
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp \
|
||||
src/gui/qt/gamelobbydialog/mygamelisttreewidget.cpp \
|
||||
src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
|
||||
@@ -309,28 +314,6 @@ unix: !mac{
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
exists( /usr/lib/libboost_regex-mt.so ){
|
||||
message("Found libboost_regex-mt")
|
||||
LIBS += -lboost_regex-mt
|
||||
}
|
||||
exists( /usr/lib64/libboost_regex-mt.so ){
|
||||
message("Found libboost_regex-mt")
|
||||
LIBS += -lboost_regex-mt
|
||||
}
|
||||
!exists( /usr/lib/libboost_regex-mt.so ){
|
||||
exists( /usr/lib/libboost_regex.so ){
|
||||
message("Found libboost_regex")
|
||||
LIBS += -lboost_regex
|
||||
}
|
||||
}
|
||||
!exists( /usr/lib64/libboost_regex-mt.so ){
|
||||
exists( /usr/lib64/libboost_regex.so ){
|
||||
message("Found libboost_regex")
|
||||
LIBS += -lboost_regex
|
||||
}
|
||||
}
|
||||
|
||||
LIBPATH += lib
|
||||
LIBS += -lpokerth_lib
|
||||
LIBS += -lcrypto -lSDL_mixer
|
||||
|
||||
@@ -53,7 +53,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
|
||||
if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; }
|
||||
}
|
||||
// !!!! Revisionsnummer der Configdefaults !!!!!
|
||||
configRev = 47;
|
||||
configRev = 48;
|
||||
|
||||
//standard defaults
|
||||
logOnOffDefault = "1";
|
||||
@@ -235,6 +235,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
|
||||
configList.push_back(ConfigInfo("UserDataDir", CONFIG_TYPE_STRING, dataDir));
|
||||
configList.push_back(ConfigInfo("CacheDir", CONFIG_TYPE_STRING, cacheDir));
|
||||
configList.push_back(ConfigInfo("CLA_NoWriteAccess", CONFIG_TYPE_INT, claNoWriteAccess));
|
||||
configList.push_back(ConfigInfo("DisableBackToLobbyWarning", CONFIG_TYPE_INT, "0"));
|
||||
|
||||
//fill tempList firstTime
|
||||
configBufferList = configList;
|
||||
|
||||
@@ -3204,9 +3204,6 @@
|
||||
<property name="focusPolicy" >
|
||||
<enum>Qt::NoFocus</enum>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Stop</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "newgamedialogimpl.h"
|
||||
#include "aboutpokerthimpl.h"
|
||||
#include "mymessagedialogimpl.h"
|
||||
#include "settingsdialogimpl.h"
|
||||
#include "selectavatardialogimpl.h"
|
||||
#include "joinnetworkgamedialogimpl.h"
|
||||
@@ -77,6 +78,9 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
|
||||
setupUi(this);
|
||||
|
||||
//hide until he isnt really used TODO
|
||||
pushButton_backToLobby->hide();
|
||||
|
||||
//Player0 pixmapCardsLabel needs Myw
|
||||
pixmapLabel_card0b->setMyW(this);
|
||||
pixmapLabel_card0a->setMyW(this);
|
||||
@@ -923,6 +927,30 @@ void mainWindowImpl::joinGameLobby() {
|
||||
|
||||
// Clear Lobby dialog.
|
||||
myGameLobbyDialog->clearDialog();
|
||||
|
||||
//set clean irc nick
|
||||
QString myNick(QString::fromUtf8(myConfig->readConfigString("MyName").c_str()));
|
||||
myNick.replace(QString::fromUtf8("é"),"e");
|
||||
myNick.replace(QString::fromUtf8("è"),"e");
|
||||
myNick.replace(QString::fromUtf8("á"),"a");
|
||||
myNick.replace(QString::fromUtf8("à"),"a");
|
||||
myNick.replace(QString::fromUtf8("ó"),"o");
|
||||
myNick.replace(QString::fromUtf8("ò"),"o");
|
||||
myNick.replace(QString::fromUtf8("ú"),"u");
|
||||
myNick.replace(QString::fromUtf8("ù"),"u");
|
||||
myNick.replace(QString::fromUtf8("É"),"E");
|
||||
myNick.replace(QString::fromUtf8("È"),"E");
|
||||
myNick.replace(QString::fromUtf8("Á"),"A");
|
||||
myNick.replace(QString::fromUtf8("À"),"A");
|
||||
myNick.replace(QString::fromUtf8("Ó"),"O");
|
||||
myNick.replace(QString::fromUtf8("Ò"),"O");
|
||||
myNick.replace(QString::fromUtf8("Ú"),"U");
|
||||
myNick.replace(QString::fromUtf8("Ù"),"U");
|
||||
myNick.remove(QRegExp("[^A-Z^a-z^0-9|\\-_\\\\^]*"));
|
||||
myNick = myNick.mid(0,16);
|
||||
|
||||
mySession->setIrcNick(myNick.toUtf8().constData());
|
||||
|
||||
// Start client for dedicated server.
|
||||
mySession->startInternetClient();
|
||||
|
||||
@@ -2742,14 +2770,16 @@ void mainWindowImpl::postRiverRunAnimation6() {
|
||||
}
|
||||
|
||||
if( !DEBUG_MODE ) {
|
||||
currentGameOver = TRUE;
|
||||
|
||||
pushButton_break->setDisabled(FALSE);
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Start"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
pushButton_break->setText(tr("Start"));
|
||||
blinkingStartButtonAnimationTimer->start(500);
|
||||
|
||||
if(mySession->getGameType() == Session::GAME_TYPE_LOCAL) {
|
||||
currentGameOver = TRUE;
|
||||
pushButton_break->setDisabled(FALSE);
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Start"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
pushButton_break->setText(tr("Start"));
|
||||
blinkingStartButtonAnimationTimer->start(500);
|
||||
}
|
||||
}
|
||||
else {
|
||||
callNewGameDialog();
|
||||
@@ -2859,16 +2889,19 @@ void mainWindowImpl::startNewHand() {
|
||||
mySession->getCurrentGame()->startHand();
|
||||
}
|
||||
else {
|
||||
pushButton_break->setDisabled(FALSE);
|
||||
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Start"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
|
||||
pushButton_break->setText(tr("Start"));
|
||||
breakAfterCurrentHand=FALSE;
|
||||
|
||||
blinkingStartButtonAnimationTimer->start(500);
|
||||
if(mySession->getGameType() == Session::GAME_TYPE_LOCAL) {
|
||||
pushButton_break->setDisabled(FALSE);
|
||||
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Start"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
|
||||
pushButton_break->setText(tr("Start"));
|
||||
breakAfterCurrentHand=FALSE;
|
||||
|
||||
blinkingStartButtonAnimationTimer->start(500);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2915,7 +2948,7 @@ void mainWindowImpl::nextRoundCleanGui() {
|
||||
flipHolecardsAllInAlreadyDone = FALSE;
|
||||
|
||||
//Wenn Pause zwischen den Hands in der Konfiguration steht den Stop Button drücken!
|
||||
if (myConfig->readConfigInt("PauseBetweenHands") && blinkingStartButtonAnimationTimer->isActive() == FALSE ) {
|
||||
if (myConfig->readConfigInt("PauseBetweenHands") && blinkingStartButtonAnimationTimer->isActive() == FALSE && mySession->getGameType() == Session::GAME_TYPE_LOCAL) {
|
||||
pushButton_break->click();
|
||||
}
|
||||
else {
|
||||
@@ -2925,14 +2958,15 @@ void mainWindowImpl::nextRoundCleanGui() {
|
||||
}
|
||||
|
||||
//Clean breakbutton
|
||||
blinkingStartButtonAnimationTimer->stop();
|
||||
pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
|
||||
blinkingStartButtonAnimationTimer->stop();
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Stop"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
pushButton_break->setText(tr("Stop"));
|
||||
|
||||
if(mySession->getGameType() == Session::GAME_TYPE_LOCAL) {
|
||||
blinkingStartButtonAnimationTimer->stop();
|
||||
pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
|
||||
blinkingStartButtonAnimationTimer->stop();
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Stop"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
pushButton_break->setText(tr("Stop"));
|
||||
}
|
||||
//Clear Statusbarmessage
|
||||
statusBar()->clearMessage();
|
||||
|
||||
@@ -3006,7 +3040,11 @@ void mainWindowImpl::breakButtonClicked() {
|
||||
pushButton_break->setDisabled(TRUE);
|
||||
breakAfterCurrentHand=TRUE;
|
||||
}
|
||||
else {
|
||||
else if (pushButton_break->text() == tr("Lobby")) {
|
||||
leaveCurrentNetworkGame();
|
||||
}
|
||||
else if (pushButton_break->text() == tr("Start")) {
|
||||
|
||||
blinkingStartButtonAnimationTimer->stop();
|
||||
//Set default Color
|
||||
pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
|
||||
@@ -3336,8 +3374,10 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
|
||||
if (event->key() == Qt::Key_F6) { radioButton_autoCheckFold->click(); }
|
||||
if (event->key() == Qt::Key_F7) { radioButton_autoCheckCallAny->click(); }
|
||||
if (event->key() == 16777249) { //CTRL
|
||||
pushButton_break->click();
|
||||
ctrlPressed = TRUE;
|
||||
if(mySession->getGameType() == Session::GAME_TYPE_LOCAL) {
|
||||
pushButton_break->click();
|
||||
ctrlPressed = TRUE;
|
||||
}
|
||||
}
|
||||
if (event->key() == Qt::Key_Escape && (myActionIsBet || myActionIsRaise)) {
|
||||
meInAction();
|
||||
@@ -3510,7 +3550,12 @@ void mainWindowImpl::localGameModification() {
|
||||
setLabelArray[i]->stopTimeOutAnimation();
|
||||
}
|
||||
|
||||
pushButton_break->show();
|
||||
// pushButton_break->show();
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Stop"));
|
||||
pushButton_break->setText(tr("Stop"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
|
||||
pushButton_backToLobby->hide();
|
||||
|
||||
//Set the playing mode to "manual"
|
||||
@@ -3528,8 +3573,13 @@ void mainWindowImpl::networkGameModification() {
|
||||
tabWidget_Left->setCurrentIndex(1);
|
||||
myChat->clearNewGame();
|
||||
|
||||
pushButton_break->hide();
|
||||
// pushButton_break->hide();
|
||||
pushButton_backToLobby->show();
|
||||
|
||||
QFontMetrics tempMetrics = this->fontMetrics();
|
||||
int width = tempMetrics.width(tr("Lobby"));
|
||||
pushButton_break->setText(tr("Lobby"));
|
||||
pushButton_break->setMinimumSize(width+10,20);
|
||||
//Set the playing mode to "manual"
|
||||
radioButton_manualAction->click();
|
||||
|
||||
@@ -3666,6 +3716,28 @@ void mainWindowImpl::changeSpinBoxBetValue(int value) {
|
||||
|
||||
void mainWindowImpl::leaveCurrentNetworkGame() {
|
||||
|
||||
assert(mySession);
|
||||
mySession->sendLeaveCurrentGame();
|
||||
if (mySession->isNetworkClientRunning()) {
|
||||
|
||||
if(myConfig->readConfigInt("DisableBackToLobbyWarning")) {
|
||||
|
||||
assert(mySession);
|
||||
mySession->sendLeaveCurrentGame();
|
||||
}
|
||||
else {
|
||||
myMessageDialogImpl dialog(this);
|
||||
dialog.setWindowTitle(tr("PokerTH - Internet Game Message"));
|
||||
dialog.label_icon->setPixmap(QPixmap(myAppDataPath +"gfx/gui/misc/logoChip3D.png").scaled(50,50,Qt::KeepAspectRatio,Qt::SmoothTransformation));
|
||||
dialog.label->setText(tr("Attention! Do you really want to leave the current game \nand go back to lobby?"));
|
||||
|
||||
if (dialog.exec() == QDialog::Accepted ) {
|
||||
|
||||
if(dialog.checkBox->isChecked()) {
|
||||
myConfig->writeConfigInt("DisableBackToLobbyWarning",1);
|
||||
myConfig->writeBuffer();
|
||||
}
|
||||
assert(mySession);
|
||||
mySession->sendLeaveCurrentGame();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
<ui version="4.0" >
|
||||
<class>myMessageDialog</class>
|
||||
<widget class="QDialog" name="myMessageDialog" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>275</width>
|
||||
<height>118</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" >
|
||||
<property name="topMargin" >
|
||||
<number>9</number>
|
||||
</property>
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="label_icon" >
|
||||
<property name="minimumSize" >
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item rowspan="2" row="0" column="1" >
|
||||
<layout class="QGridLayout" >
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="label" >
|
||||
<property name="text" >
|
||||
<string>MessageText</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<enum>QSizePolicy::Fixed</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>199</width>
|
||||
<height>13</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="2" column="0" >
|
||||
<widget class="QCheckBox" name="checkBox" >
|
||||
<property name="text" >
|
||||
<string>Do not show this warning again.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" >
|
||||
<widget class="QDialogButtonBox" name="buttonBox" >
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons" >
|
||||
<set>QDialogButtonBox::No|QDialogButtonBox::NoButton|QDialogButtonBox::Yes</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>81</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>myMessageDialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>myMessageDialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel" >
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel" >
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
@@ -0,0 +1,27 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2006 by FThauer FHammer *
|
||||
* f.thauer@web.de *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
#include "mymessagedialogimpl.h"
|
||||
|
||||
|
||||
myMessageDialogImpl::myMessageDialogImpl(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
{
|
||||
setupUi(this);
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2006 by FThauer FHammer *
|
||||
* f.thauer@web.de *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
#ifndef MYMESSAGEDIALOGIMPL_H
|
||||
#define MYMESSAGEDIALOGIMPL_H
|
||||
|
||||
#include "ui_mymessagedialog.h"
|
||||
|
||||
class myMessageDialogImpl: public QDialog, public Ui::myMessageDialog {
|
||||
Q_OBJECT
|
||||
public:
|
||||
myMessageDialogImpl(QWidget *parent = 0);
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
+1
-10
@@ -27,7 +27,6 @@
|
||||
#include <net/serveracceptthread.h>
|
||||
#include <net/ircthread.h>
|
||||
#include <core/avatarmanager.h>
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
@@ -149,20 +148,12 @@ void Session::startInternetClient()
|
||||
|
||||
if (myConfig->readConfigInt("UseIRCLobbyChat"))
|
||||
{
|
||||
//testing boost::regexp
|
||||
// boost::regex pattern (" ",boost::regex_constants::icase|boost::regex_constants::perl);
|
||||
// std::string stringa (myConfig->readConfigString("MyName"));
|
||||
// std::string replace ("");
|
||||
// std::string myNameNewString;
|
||||
// myNameNewString = boost::regex_replace (stringa, pattern, replace);
|
||||
//testing boost:;regexp
|
||||
|
||||
myIrcThread = new IrcThread(*myGui);
|
||||
myIrcThread->Init(
|
||||
myConfig->readConfigString("IRCServerAddress"),
|
||||
myConfig->readConfigInt("IRCServerPort"),
|
||||
myConfig->readConfigInt("IRCServerUseIpv6") == 1,
|
||||
myConfig->readConfigString("MyName"),
|
||||
myIrcNick,
|
||||
myConfig->readConfigString("IRCChannel"));
|
||||
myIrcThread->Run();
|
||||
}
|
||||
|
||||
@@ -70,6 +70,7 @@ public:
|
||||
bool waitForNetworkServer(unsigned timeoutMsec);
|
||||
|
||||
void sendIrcChatMessage(const std::string &message);
|
||||
void setIrcNick(const std::string &value) { myIrcNick = value; }
|
||||
|
||||
void sendClientPlayerAction();
|
||||
|
||||
@@ -91,6 +92,8 @@ private:
|
||||
|
||||
int currentGameNum;
|
||||
|
||||
std::string myIrcNick;
|
||||
|
||||
ClientThread *myNetClient;
|
||||
ServerAcceptThread *myNetServer;
|
||||
IrcThread *myIrcThread;
|
||||
|
||||
+17
-17
@@ -5,12 +5,12 @@
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow/chat/chat.cpp" line="53"/>
|
||||
<source>You cannot kick yourself!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Você não pode chutar a si mesmo!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow/chat/chat.cpp" line="60"/>
|
||||
<source>You cannot kick any player - You are not game admin!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Você não pode chutar qualquer jogador - Você não é o administrador do jogo!</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -600,7 +600,7 @@ 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;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">!!!Please replace this with your translator name!!! - !!!Please replace this with your language!!! - !!!If you like please replace this with your mail address (otherwise please remove)!!!</p></body></html></source>
|
||||
<translation type="unfinished"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">!!!Leandro Fregnani!!! - !!!Português - Brasil!!! - !!!maxputo@gmail.com!!!</p></body></html></translation>
|
||||
<translation><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">!!!Leandro Fregnani!!! - !!!Português - Brasil!!! - !!!maxputo@gmail.com!!!</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/aboutpokerth.ui" line="249"/>
|
||||
@@ -626,7 +626,7 @@ p, li { white-space: pre-wrap; }
|
||||
<message>
|
||||
<location filename="../src/gui/qt/aboutpokerth.ui" line="14"/>
|
||||
<source>About PokerTH 0.6-beta</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Sobre PokerTH 0.6-beta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/aboutpokerth.ui" line="51"/>
|
||||
@@ -634,7 +634,7 @@ 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;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">PokerTH 0.6-beta</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">PokerTH 0.6-beta</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/aboutpokerth.ui" line="157"/>
|
||||
@@ -658,7 +658,7 @@ 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;"> - gui graphics design, webdesign</p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Erhard List (<a href="mailto:dunkanx@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">dunkanx@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;"> - MacOS package</p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"><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;">Projectpage: </span></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://www.pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></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;">IRC: </span></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=" 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: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;"> - idéia incial, arquitetura básica, implementação do gui, pacote linux</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><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - idéia inicial, arquitetura básica, engenharia básica</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Lothar May (<a href="mailto:lotodore@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">lotodore@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;"> - arquitetura básica, desenvolvimento de rede, pacote windows</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Oskar Lindqvist (<a href="mailto:tranberry@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">tranberry@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;"> - designer de gráficos, webdesign</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Erhard List (<a href="mailto:dunkanx@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">dunkanx@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;"> - Pacote MacOS</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/aboutpokerth.ui" line="249"/>
|
||||
@@ -679,7 +679,7 @@ p, li { white-space: pre-wrap; }
|
||||
<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;">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></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"><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;">por diferentes e populares imagens de avatar</span></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;">Viktoria, Benedikt, Erhard, Felix, Florian, Linus, Lothar, Mark</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - para imagens de avatar</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;">ZeiZei</span> </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - por "mix" de imagens de avatar</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;"><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;"> - por diferentes gpl sons licenciados</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;">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;"> - pela própria gravação de sons</p></body></html></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1216,7 +1216,7 @@ p, li { white-space: pre-wrap; }
|
||||
<message>
|
||||
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="137"/>
|
||||
<source>%1's game</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>%1's jogo</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1583,22 +1583,22 @@ Você gostaria de substituir ?</translation>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow.ui" line="25"/>
|
||||
<source>PokerTH 0.6-beta - The Open-Source Texas Holdem Engine</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>PokerTH 0.6-beta - Jogo Texas Holdem Open-Source</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow.ui" line="2907"/>
|
||||
<source>Back to lobby</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Voltar a Sala</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow.ui" line="3354"/>
|
||||
<source>Show/Hide Away Window</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Mostrar/Esconder Janela de indisponível</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow.ui" line="3357"/>
|
||||
<source>Ctrl+A</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Ctrl+A</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -1945,17 +1945,17 @@ Por favor vá para <a href="http://www.pokerth.net/" target="_
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow/mainwindowimpl.cpp" line="3118"/>
|
||||
<source>The PokerTH server does not support this version of the game.<br>Please go to <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net</a> and download the latest version.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>O servidor do PokerTH não suporta está versão do jogo.<br>Por favor vá para <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net/<a/> e faça o download da última versão.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow/mainwindowimpl.cpp" line="3256"/>
|
||||
<source>A new release of PokerTH is available.<br>Please go to <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net</a> and download the latest version.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Uma nova versão do PokerTH is disponivel.<br>Por favor vá para <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net/<a/> e faça o download da última versão.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/mainwindow/mainwindowimpl.cpp" line="3264"/>
|
||||
<source>This beta release of PokerTH is outdated.<br>Please go to <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net</a> and download the latest version.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Está versão beta do PokerTH está desatualizada.<br>Por favor vá para <a href="http://www.pokerth.net/"target="_blank">http://www.pokerth.net/<a/> e faça o download da última versão.</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -2631,7 +2631,7 @@ p, li { white-space: pre-wrap; }
|
||||
<message>
|
||||
<location filename="../src/gui/qt/settingsdialog.ui" line="150"/>
|
||||
<source>Reverse order of F-Keys (F1 - F4)</source>
|
||||
<translation type="unfinished">Reverter as ordens das teclas F* (F1 - F3) {1 ?} {4)?}</translation>
|
||||
<translation>Reverter as ordens das teclas F (F1 - F4)</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -2771,7 +2771,7 @@ Please select an valid directory!</source>
|
||||
<message>
|
||||
<location filename="../src/gui/qt/settingsdialog/settingsdialogimpl.cpp" line="50"/>
|
||||
<source>Norwegian</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Noruegues</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
||||
+433
-433
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user