From f13311c9e6e4c08e32723a9c91a0aa3010efb143 Mon Sep 17 00:00:00 2001 From: doitux Date: Mon, 29 Oct 2007 21:45:37 +0000 Subject: [PATCH] --- data/translations/pokerth_de.qm | Bin 66520 -> 82636 bytes src/gui/qt/aboutpokerth.ui | 4 +- src/gui/qt/mainwindow.ui | 294 ++++++++++++++++-- src/gui/qt/mainwindow/log/log.cpp | 2 +- src/gui/qt/mainwindow/mainwindowimpl.cpp | 136 ++------ src/gui/qt/mainwindow/mainwindowimpl.h | 25 +- src/gui/qt/mainwindow/mycardspixmaplabel.cpp | 8 +- src/gui/qt/mainwindow/mycardspixmaplabel.h | 2 +- .../qt/mainwindow/startsplash/startsplash.cpp | 2 +- ts/pokerth_de.ts | 55 +++- 10 files changed, 335 insertions(+), 193 deletions(-) diff --git a/data/translations/pokerth_de.qm b/data/translations/pokerth_de.qm index 6d348fae5748946eaeadced9cdb0fea524c8cfd7..a8c895d9127266cd79fd1a886fa8d0d38e3cbe2c 100644 GIT binary patch delta 6306 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 UVpsc3Ns`>Yyq;^r$)`j93-F9po&W#< delta 2821 zcmXZd2V4|a9tZH>?9R;Y%}<&mC~E&;4a$8o0P`f=iSZ-f%34Ip4i->9(FYhDkLIE-vL0Pl zPQZ|%OppFKWCGLAA{wwf$c*WAkbKQJmJ|Y3lbMN+B=RUTb7Lz^7M$&j3C~ypSVzm+SSpq?nUDJdw(iVcE%moO!eoCEK)z*8G*SQ09Tk(AOR%MS6I0!B z97qN=m1iu_Xztp=DpLOn9rm5fl2+C(=@(W+)t5r4{R_R~D)oPgOQ~M2e(iS>nC{PV*NVt$mNR`Q zxESRImw7C2LxH$Nvzi+rz>IOM=s5(K>B|oHrw7b@!j9{+2$-M2F7Y%2+|=xb?g@Z< zB^z6^2Us+PO=D@iMMo8%$u1trX3j1F7JDk@C_Z9MA1`=}U~?X210HMHgHyVJCG*)M z7d(Ka=4?UYYjPp^mW&}g$undZ`GkB2EbC9weamK(@5yksAc-LhNS173k6Ql#cp4Pl z6cbJC^{dzD!Y{I32KL5W%7E8Y_IB?8^1STwDT)`^`m$2soAGRYWhR-zHl=MP+u3J! zBH%rgef7x)y~zP&E;)*9CMNoFN0o3l7Eo)i}E`27YX00!ml}8Wo=eWcE5#%QBpT*&1HFtTJH~Efh z{*)qKw^;E4*Wzaj1PtKXp4I~EhjGsw>CM;Y$p(T~FW3tNF6Mg=rVIqu$p%>}27J_n zpyRy7J|`gPCGSxCD-e8$pFDvc9DIvkcgPP2nar>ItCCFMBdt%9fAHHXN`VbNe4I4} z5E{)VOq>pE+`%WT@FMH@l84+*B%#wU78@_?RZ0rMsck*{O()NppgXa8@CgP8m4hS z^%Lo@S=#WNtk8H@Yk_U7X7zlUl5NhKu$5!TN=@>W4q$tYCS6D4NAsE=?M)PM^khxJ z?pCr!)7Xy!iIFtVy9F{(YjC0M6+2KXEsG(`w1W;T0pi9g7HGdR(0LHwSG(vcopAB4 z+K@R8d`^yiQoFXSx9C!fovO%r~waRSm(h4Yd0#^0w1l?Akq_ly&& z+{TlegsTy47xd^-6KtQE~yQ=|tvWV8ImF|Cy1tQK*i zFQqj5OVP=bGIcOVu|qa@mN=`3rX+Wd=(cDfaL8OSMO@M)0f!;_%zZ?f{KUZhu2eWC z29KZ%`C(#`Bh~YZ#Uma8K!Lqj=+s62Bo_UApL{2l><$5rjTOsydc$Mk;+2dlpzsUv z+2%Q9q}bU_87OSfseOh6#{+a+P$}80;~mHo%XGt46xfMe-KcodbaK4T&My%-nWb}> zMf?0zl5V?&El`xFOZf5}aJrXnUpU=(`a4}QD4;WOy5egbaCU|6s>KzuO84)r=YfCq z(LMOgi`=Jc@f{7E^VGE#(jq>8NY}Q#1NeEk?#%!*@`+x*&KW2htsghegZ}@^N9m_- zv;@ivWiOg5Cg@#1uLmyvp?B+W0xDeeOH*i7*L3Lv|3@jmu~i>bO@ZIIrjHmvYv|V< z`lEAQ$wvLrcgulVcYQGvOkU8}IMUSKWc4@7sD9H&@%;yB|KG~gzq->6+#as@qrone zQgg@JFzc%{GETNmYgm~^Ct97!u-d&0sPAJ4dS6Ip8lqe&z`K5iOuw&z2EkB%FokqA zT)OTBG%he)6{)=`*l?#OWw7ay;eq{q;9iiSGt_h#xIahgS(8lWN@HGR0}mjL|4Sr~ zOD>tTY9BgFZkwt8uvS`Mk_t3iN`a}rld)0+PpiB6xfCU-HXt#?LVQCE7aAUE0N z4wB@O+wo&+W>s4EsksB~F%lMtz-an)#+HxevD8N8qIpI6J>?tBs!Dmew5g`k>SO6_ JKZ!X#_W$5Lj1vF= diff --git a/src/gui/qt/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui index 2e243187..8c3d8e18 100755 --- a/src/gui/qt/aboutpokerth.ui +++ b/src/gui/qt/aboutpokerth.ui @@ -11,7 +11,7 @@ - About PokerTH 0.6 + About PokerTH 0.6-beta @@ -51,7 +51,7 @@ <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</span></p></body></html> +<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> diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index ce5702f6..7d659f31 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -22,7 +22,7 @@ - PokerTH 0.6 - The Open-Source Texas Holdem Engine + PokerTH 0.6-beta - The Open-Source Texas Holdem Engine @@ -193,6 +193,32 @@ Qt::AlignCenter + + + + 0 + 0 + 80 + 111 + + + + true + + + + + + 39 + 0 + 80 + 111 + + + + true + + @@ -392,6 +418,32 @@ Qt::AlignCenter + + + + 0 + 0 + 80 + 111 + + + + true + + + + + + 39 + 0 + 80 + 111 + + + + true + + @@ -498,6 +550,32 @@ Qt::AlignCenter + + + + 0 + 0 + 80 + 111 + + + + true + + + + + + 39 + 0 + 80 + 111 + + + + true + + @@ -790,6 +868,32 @@ Qt::AlignCenter + + + + 0 + 0 + 80 + 111 + + + + true + + + + + + 39 + 0 + 80 + 111 + + + + true + + @@ -1038,6 +1142,32 @@ Qt::AlignCenter + + + + 0 + 0 + 80 + 111 + + + + true + + + + + + 39 + 0 + 80 + 111 + + + + true + + @@ -1384,6 +1514,71 @@ true + + + + 6 + 64 + 79 + 114 + + + + true + + + + + + 95 + 64 + 79 + 114 + + + + true + + + + + + 184 + 64 + 79 + 114 + + + + true + + + + + + 280 + 64 + 79 + 114 + + + + true + + + + + + 376 + 64 + 79 + 114 + + + + true + + @@ -1557,6 +1752,32 @@ Qt::AlignCenter + + + + 0 + 0 + 80 + 111 + + + + true + + + + + + 39 + 0 + 80 + 111 + + + + true + + @@ -2271,6 +2492,12 @@ Qt::Horizontal + + QSlider::NoTicks + + + 10 + @@ -2426,6 +2653,32 @@ Qt::NoTextInteraction + + + + 0 + 0 + 80 + 111 + + + + true + + + + + + 39 + 0 + 80 + 111 + + + + true + + @@ -3106,6 +3359,11 @@ QLabel
mystatuslabel.h
+ + MyCardsPixmapLabel + QLabel +
mycardspixmaplabel.h
+ spinBox_set @@ -3123,42 +3381,10 @@ 624 - 808 + 800 638 - - horizontalSlider_bet - valueChanged(int) - spinBox_set - setValue(int) - - - 585 - 509 - - - 579 - 479 - - - - - spinBox_set - valueChanged(int) - horizontalSlider_bet - setValue(int) - - - 621 - 479 - - - 621 - 509 - - - diff --git a/src/gui/qt/mainwindow/log/log.cpp b/src/gui/qt/mainwindow/log/log.cpp index 226999c6..1ccc0322 100644 --- a/src/gui/qt/mainwindow/log/log.cpp +++ b/src/gui/qt/mainwindow/log/log.cpp @@ -70,7 +70,7 @@ Log::Log(mainWindowImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), m stream << "\n"; stream << "\n"; stream << "\n"; - stream << "

Log-File for PokerTH 0.6 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"

\n"; + stream << "

Log-File for PokerTH 0.6-beta Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"

\n"; myLogFile->close(); //Zu alte Dateien löschen!!! diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index a31ecf77..7019180f 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -53,6 +53,8 @@ #include +#include "math.h" + #define FORMATLEFT(X) "

(X)" #define FORMATRIGHT(X) "(X)

" @@ -75,108 +77,10 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) setupUi(this); - //pixmapCardsLabel erstellen und ins Layout einfügen! - pixmapLabel_cardBoard0 = new MyCardsPixmapLabel(frame_Board); - pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_BoardCard0")); - pixmapLabel_cardBoard0->setScaledContents(true); - pixmapLabel_cardBoard0->setGeometry(QRect(6, 64, 79, 114)); - - pixmapLabel_cardBoard1 = new MyCardsPixmapLabel(frame_Board); - pixmapLabel_cardBoard1->setObjectName(QString::fromUtf8("pixmapLabel_BoardCard1")); - pixmapLabel_cardBoard1->setScaledContents(true); - pixmapLabel_cardBoard1->setGeometry(QRect(95, 64, 79, 114)); - - pixmapLabel_cardBoard2 = new MyCardsPixmapLabel(frame_Board); - pixmapLabel_cardBoard2->setObjectName(QString::fromUtf8("pixmapLabel_BoardCard2")); - pixmapLabel_cardBoard2->setScaledContents(true); - pixmapLabel_cardBoard2->setGeometry(QRect(184, 64, 79, 114)); - - pixmapLabel_cardBoard3 = new MyCardsPixmapLabel(frame_Board); - pixmapLabel_cardBoard3->setObjectName(QString::fromUtf8("pixmapLabel_BoardCard3")); - pixmapLabel_cardBoard3->setScaledContents(true); - pixmapLabel_cardBoard3->setGeometry(QRect(280, 64, 79, 114)); - - pixmapLabel_cardBoard4 = new MyCardsPixmapLabel(frame_Board); - pixmapLabel_cardBoard4->setObjectName(QString::fromUtf8("pixmapLabel_BoardCard4")); - pixmapLabel_cardBoard4->setScaledContents(true); - pixmapLabel_cardBoard4->setGeometry(QRect(376, 64, 79, 114)); - - - pixmapLabel_card0a = new MyCardsPixmapLabel(frame_Cards0); - pixmapLabel_card0a->setObjectName(QString::fromUtf8("pixmapLabel_card0a")); - pixmapLabel_card0a->setScaledContents(true); - pixmapLabel_card0a->setGeometry(QRect(0, 0, 80, 111)); -// pixmapLabel_card0a->setFocusPolicy(Qt::NoFocus); - - pixmapLabel_card0b = new MyCardsPixmapLabel(frame_Cards0); - pixmapLabel_card0b->setObjectName(QString::fromUtf8("pixmapLabel_card0b")); - pixmapLabel_card0b->setScaledContents(true); - pixmapLabel_card0b->setGeometry(QRect(39, 0, 80, 111)); - + //Player0 pixmapCardsLabel needs Myw pixmapLabel_card0b->setMyW(this); pixmapLabel_card0a->setMyW(this); - pixmapLabel_card1a = new MyCardsPixmapLabel(frame_Cards1); - pixmapLabel_card1a->setObjectName(QString::fromUtf8("pixmapLabel_card1a")); - pixmapLabel_card1a->setScaledContents(true); - pixmapLabel_card1a->setGeometry(QRect(0, 0, 80, 111)); - - pixmapLabel_card1b = new MyCardsPixmapLabel(frame_Cards1); - pixmapLabel_card1b->setObjectName(QString::fromUtf8("pixmapLabel_card1b")); - pixmapLabel_card1b->setScaledContents(true); - pixmapLabel_card1b->setGeometry(QRect(39, 0, 80, 111)); - - pixmapLabel_card2a = new MyCardsPixmapLabel(frame_Cards2); - pixmapLabel_card2a->setObjectName(QString::fromUtf8("pixmapLabel_card2a")); - pixmapLabel_card2a->setScaledContents(true); - pixmapLabel_card2a->setGeometry(QRect(0, 0, 80, 111)); - - pixmapLabel_card2b = new MyCardsPixmapLabel(frame_Cards2); - pixmapLabel_card2b->setObjectName(QString::fromUtf8("pixmapLabel_card2b")); - pixmapLabel_card2b->setScaledContents(true); - pixmapLabel_card2b->setGeometry(QRect(39, 0, 80, 111)); - - pixmapLabel_card3a = new MyCardsPixmapLabel(frame_Cards3); - pixmapLabel_card3a->setObjectName(QString::fromUtf8("pixmapLabel_card3a")); - pixmapLabel_card3a->setScaledContents(true); - pixmapLabel_card3a->setGeometry(QRect(0, 0, 80, 111)); - - pixmapLabel_card3b = new MyCardsPixmapLabel(frame_Cards3); - pixmapLabel_card3b->setObjectName(QString::fromUtf8("pixmapLabel_card3b")); - pixmapLabel_card3b->setScaledContents(true); - pixmapLabel_card3b->setGeometry(QRect(39, 0, 80, 111)); - - pixmapLabel_card4a = new MyCardsPixmapLabel(frame_Cards4); - pixmapLabel_card4a->setObjectName(QString::fromUtf8("pixmapLabel_card4a")); - pixmapLabel_card4a->setScaledContents(true); - pixmapLabel_card4a->setGeometry(QRect(0, 0, 80, 111)); - - pixmapLabel_card4b = new MyCardsPixmapLabel(frame_Cards4); - pixmapLabel_card4b->setObjectName(QString::fromUtf8("pixmapLabel_card4b")); - pixmapLabel_card4b->setScaledContents(true); - pixmapLabel_card4b->setGeometry(QRect(39, 0, 80, 111)); - - pixmapLabel_card5a = new MyCardsPixmapLabel(frame_Cards5); - pixmapLabel_card5a->setObjectName(QString::fromUtf8("pixmapLabel_card5a")); - pixmapLabel_card5a->setScaledContents(true); - pixmapLabel_card5a->setGeometry(QRect(0, 0, 80, 111)); - - pixmapLabel_card5b = new MyCardsPixmapLabel(frame_Cards5); - pixmapLabel_card5b->setObjectName(QString::fromUtf8("pixmapLabel_card5b")); - pixmapLabel_card5b->setScaledContents(true); - pixmapLabel_card5b->setGeometry(QRect(39, 0, 80, 111)); - - pixmapLabel_card6a = new MyCardsPixmapLabel(frame_Cards6); - pixmapLabel_card6a->setObjectName(QString::fromUtf8("pixmapLabel_card6a")); - pixmapLabel_card6a->setScaledContents(true); - pixmapLabel_card6a->setGeometry(QRect(0, 0, 80, 111)); - - pixmapLabel_card6b = new MyCardsPixmapLabel(frame_Cards6); - pixmapLabel_card6b->setObjectName(QString::fromUtf8("pixmapLabel_card6b")); - pixmapLabel_card6b->setScaledContents(true); - pixmapLabel_card6b->setGeometry(QRect(39, 0, 80, 111)); - - //Flipside festlegen; flipside = new QPixmap(myAppDataPath +"gfx/cards/default/flipside.png"); @@ -609,9 +513,11 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) connect( pushButton_Fold, SIGNAL( clicked(bool) ), this, SLOT( pushButtonFoldClicked(bool) ) ); connect( pushButton_CallCheck, SIGNAL( clicked(bool) ), this, SLOT( pushButtonCallCheckClicked(bool) ) ); connect( pushButton_AllIn, SIGNAL( clicked(bool) ), this, SLOT(pushButtonAllInClicked(bool) ) ); - - connect ( horizontalSlider_speed, SIGNAL( valueChanged(int)), this, SLOT ( setGameSpeed(int) ) ); - connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!! + + connect( horizontalSlider_bet, SIGNAL( valueChanged(int)), this, SLOT ( changeSpinBoxBetValue(int) ) ); + + connect( horizontalSlider_speed, SIGNAL( valueChanged(int)), this, SLOT ( setGameSpeed(int) ) ); + connect( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!! connect( tabWidget_Left, SIGNAL( currentChanged(int) ), this, SLOT( tabSwitchAction() ) ); connect( lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) ); @@ -2015,19 +1921,12 @@ void mainWindowImpl::disableMyButtons() { spinBox_set->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); horizontalSlider_bet->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); spinBox_set->setValue(0); + horizontalSlider_bet->setValue(0); pushButton_AllIn->setDisabled(TRUE); horizontalSlider_bet->setDisabled(TRUE); spinBox_set->setDisabled(TRUE); -// spinBox_set->setDisabled(TRUE); -// horizontalSlider_bet->setDisabled(TRUE); -// spinBox_set->hide(); -// pushButton_BetRaise->show(); -// pushButton_BetRaise->setText(""); -// pushButton_CallCheck->setText(""); -// pushButton_Fold->setText(""); - } void mainWindowImpl::myBetRaise() { @@ -2038,14 +1937,7 @@ void mainWindowImpl::myBetRaise() { else if(pushButton_BetRaise->text() == "Bet") { myBet(); } - else { -// spinBox_set->setMinimum(0); -// horizontalSlider_bet->setMinimum(0); -// spinBox_set->setValue(0); -// horizontalSlider_bet->setValue(0); -// spinBox_set->setDisabled(TRUE); -// horizontalSlider_bet->setDisabled(TRUE); - } + else {} } void mainWindowImpl::myCallCheck() { @@ -3663,3 +3555,11 @@ void mainWindowImpl::quitPokerTH() { // // QMainWindow::paintEvent(event); // } + +void mainWindowImpl::changeSpinBoxBetValue(int value) { + + if(spinBox_set->maximum() <= 1000 ) + spinBox_set->setValue((int)((value/10)*10)); + else + spinBox_set->setValue((int)((value/50)*50)); +} diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 381ef3d1..4c3d77d6 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -319,6 +319,7 @@ public slots: void myButtonsCheckable(bool state); void changePlayingMode(); + void changeSpinBoxBetValue(int); void showMaximized (); void quitPokerTH(); @@ -333,30 +334,6 @@ private: Chat *myChat; ConfigFile *myConfig; - //Logo - QLabel *label_logoleft; - QLabel *label_logoright; - - //MyPixmapCardsLabel - MyCardsPixmapLabel *pixmapLabel_cardBoard0; - MyCardsPixmapLabel *pixmapLabel_cardBoard1; - MyCardsPixmapLabel *pixmapLabel_cardBoard2; - MyCardsPixmapLabel *pixmapLabel_cardBoard3; - MyCardsPixmapLabel *pixmapLabel_cardBoard4; - MyCardsPixmapLabel *pixmapLabel_card0a; - MyCardsPixmapLabel *pixmapLabel_card0b; - MyCardsPixmapLabel *pixmapLabel_card1a; - MyCardsPixmapLabel *pixmapLabel_card1b; - MyCardsPixmapLabel *pixmapLabel_card2a; - MyCardsPixmapLabel *pixmapLabel_card2b; - MyCardsPixmapLabel *pixmapLabel_card3a; - MyCardsPixmapLabel *pixmapLabel_card3b; - MyCardsPixmapLabel *pixmapLabel_card4a; - MyCardsPixmapLabel *pixmapLabel_card4b; - MyCardsPixmapLabel *pixmapLabel_card5a; - MyCardsPixmapLabel *pixmapLabel_card5b; - MyCardsPixmapLabel *pixmapLabel_card6a; - MyCardsPixmapLabel *pixmapLabel_card6b; //Timer QTimer *potDistributeTimer; QTimer *timer; diff --git a/src/gui/qt/mainwindow/mycardspixmaplabel.cpp b/src/gui/qt/mainwindow/mycardspixmaplabel.cpp index d867dcef..d3d677b8 100644 --- a/src/gui/qt/mainwindow/mycardspixmaplabel.cpp +++ b/src/gui/qt/mainwindow/mycardspixmaplabel.cpp @@ -10,7 +10,7 @@ // // #include "mycardspixmaplabel.h" - +#include "mainwindowimpl.h" // using namespace std; MyCardsPixmapLabel::MyCardsPixmapLabel(QFrame* parent) @@ -168,10 +168,10 @@ void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) { painter.setOpacity(frameOpacity); // painter.drawRect(this->geometry()); - if(objectName().contains("pixmapLabel_card")) - painter.drawRect(-1,-1,81,112); + if(objectName().contains("pixmapLabel_cardBoard")) + painter.drawRect(-1,-1,80,115); else - painter.drawRect(-1,-1,80,115); + painter.drawRect(-1,-1,81,112); } diff --git a/src/gui/qt/mainwindow/mycardspixmaplabel.h b/src/gui/qt/mainwindow/mycardspixmaplabel.h index 88c70b3f..22b48c03 100644 --- a/src/gui/qt/mainwindow/mycardspixmaplabel.h +++ b/src/gui/qt/mainwindow/mycardspixmaplabel.h @@ -17,7 +17,7 @@ #include #include -#include "mainwindowimpl.h" +class mainWindowImpl; class MyCardsPixmapLabel : public QLabel { diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index b20f4434..40b0ea65 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -281,7 +281,7 @@ void StartSplash::paintEvent(QPaintEvent * event) { painter.setOpacity(1.0); painter.setFont(versionFont); painter.setPen(QColor(102,153,0)); - painter.drawText(312,230,100,20,4,"Version 0.6"); + painter.drawText(295,230,100,20,4,"Version 0.6-beta"); painter.setOpacity(opacity); } diff --git a/ts/pokerth_de.ts b/ts/pokerth_de.ts index 99d8e428..4c942add 100644 --- a/ts/pokerth_de.ts +++ b/ts/pokerth_de.ts @@ -1,16 +1,17 @@ + Chat You cannot kick yourself! - + Sie können sich nicht selbst entfernen! You cannot kick any player - You are not game admin! - + Sie können keinen Spieler entfernen - Sie sind kein Spieladministrator! @@ -381,7 +382,26 @@ 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; font-family:'Nimbus Sans L';"> - 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; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - MacOS package</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; 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; font-family:'Nimbus Sans L';"><span style=" font-weight:600;">Projektwebseite: </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> <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; font-family:'Nimbus Sans L';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> #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; font-family:'Nimbus Sans L';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><span style=" font-weight:600;">Autoren: </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - Grundidee, Programm-Architektur, grafische Benutzeroberfläche, Linux-Paket</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - Grundidee, Programm-Architektur, Engine-Entwicklung</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - Netzwerk-Entwicklung, Windows-Paket</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - Grafikdesign für die grafische Benutzeroberfläche, Webdesign</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - MacOS-Paket</p></body></html> @@ -389,7 +409,10 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; 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; font-family:'Nimbus Sans L';">!!!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> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; 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; font-family:'Nimbus Sans L';">Mirko Albrecht - deutsch<br />Felix Hammer - deutsch<br />Bernd Arnold - deutsch</p></body></html> @@ -410,7 +433,23 @@ 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; font-family:'Nimbus Sans L';"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> - for self recorded chip sounds</p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; 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; font-family:'Nimbus Sans L';"><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-family:'Nimbus Sans L'; font-weight:600;"> - <span style=" font-weight:400;">für verschiedene beliebte Avatar-Bildquellen</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; font-family:'Nimbus Sans L';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><span style=" font-weight:600;">Viktoria, Benedikt, Erhard, Felix, Florian, Linus, Lothar, Mark, Steffi, Caro</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> - für die Persönlichkeiten-Avatarbilder</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; font-family:'Nimbus Sans L';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> - für die Avatarbilder der Kategorie "Verschiedenes"</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; font-family:'Nimbus Sans L';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> - für verschiedene unter der GPL lizenzierte Klänge</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; font-family:'Nimbus Sans L';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> - für die selbst aufgenommenen Chip-Klänge</p></body></html> @@ -902,7 +941,7 @@ p, li { white-space: pre-wrap; } You should not kick yourself from this game! - Sie sollten sich nicht selbst des Spieles verweisen ;)! + Sie sollten sich nicht selbst des Spiels verweisen! @@ -2303,7 +2342,7 @@ p, li { white-space: pre-wrap; } Reverse order of F-Keys (F1 - F4) - F-Tasten-Reihenfolge umkehren (F1 - F3) {1 ?} {4)?} + F-Tasten-Reihenfolge umkehren (F1 - F4) @@ -2445,7 +2484,7 @@ Bitte wählen Sie ein gültiges Verzeichnis! Norwegian - + Norsk (Norwegisch)