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

Browse Source
This commit is contained in:
doitux
2007-10-29 21:45:37 +00:00
parent ded7ca7daf
commit f13311c9e6
10 changed files with 335 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/translations/pokerth_de.qm
BIN
View File
Binary file not shown.
src/gui/qt/aboutpokerth.ui
+2 -2
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle" >
<string>About PokerTH 0.6</string>
<string>About PokerTH 0.6-beta</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
@@ -51,7 +51,7 @@
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:12pt; font-weight:600;">PokerTH 0.6&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:12pt; font-weight:600;">PokerTH 0.6-beta&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
src/gui/qt/mainwindow.ui
+260 -34
View File
@@ -22,7 +22,7 @@
</size>
</property>
<property name="windowTitle" >
<string>PokerTH 0.6 - The Open-Source Texas Holdem Engine</string>
<string>PokerTH 0.6-beta - The Open-Source Texas Holdem Engine</string>
</property>
<widget class="QWidget" name="centralwidget" >
<layout class="QGridLayout" >
@@ -193,6 +193,32 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card2a" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card2b" >
<property name="geometry" >
<rect>
<x>39</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_Avatar2" >
<property name="geometry" >
@@ -392,6 +418,32 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card3a" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card3b" >
<property name="geometry" >
<rect>
<x>39</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_Avatar3" >
<property name="geometry" >
@@ -498,6 +550,32 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card4a" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card4b" >
<property name="geometry" >
<rect>
<x>39</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QFrame" name="frame_9" >
<property name="geometry" >
@@ -790,6 +868,32 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card5a" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card5b" >
<property name="geometry" >
<rect>
<x>39</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_Avatar5" >
<property name="geometry" >
@@ -1038,6 +1142,32 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card1a" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card1b" >
<property name="geometry" >
<rect>
<x>39</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_Avatar1" >
<property name="geometry" >
@@ -1384,6 +1514,71 @@
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard0" >
<property name="geometry" >
<rect>
<x>6</x>
<y>64</y>
<width>79</width>
<height>114</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard1" >
<property name="geometry" >
<rect>
<x>95</x>
<y>64</y>
<width>79</width>
<height>114</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard2" >
<property name="geometry" >
<rect>
<x>184</x>
<y>64</y>
<width>79</width>
<height>114</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard3" >
<property name="geometry" >
<rect>
<x>280</x>
<y>64</y>
<width>79</width>
<height>114</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard4" >
<property name="geometry" >
<rect>
<x>376</x>
<y>64</y>
<width>79</width>
<height>114</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
</item>
<item>
@@ -1557,6 +1752,32 @@
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card6a" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card6b" >
<property name="geometry" >
<rect>
<x>39</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_Avatar6" >
<property name="geometry" >
@@ -2271,6 +2492,12 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::NoTicks</enum>
</property>
<property name="tickInterval" >
<number>10</number>
</property>
</widget>
</item>
</layout>
@@ -2426,6 +2653,32 @@
<set>Qt::NoTextInteraction</set>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card0a" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_card0b" >
<property name="geometry" >
<rect>
<x>39</x>
<y>0</y>
<width>80</width>
<height>111</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
</item>
<item row="2" column="1" >
@@ -3106,6 +3359,11 @@
<extends>QLabel</extends>
<header>mystatuslabel.h</header>
</customwidget>
<customwidget>
<class>MyCardsPixmapLabel</class>
<extends>QLabel</extends>
<header>mycardspixmaplabel.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>spinBox_set</tabstop>
@@ -3123,42 +3381,10 @@
<y>624</y>
</hint>
<hint type="destinationlabel" >
<x>808</x>
<x>800</x>
<y>638</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_bet</sender>
<signal>valueChanged(int)</signal>
<receiver>spinBox_set</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
<x>585</x>
<y>509</y>
</hint>
<hint type="destinationlabel" >
<x>579</x>
<y>479</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinBox_set</sender>
<signal>valueChanged(int)</signal>
<receiver>horizontalSlider_bet</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
<x>621</x>
<y>479</y>
</hint>
<hint type="destinationlabel" >
<x>621</x>
<y>509</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/gui/qt/mainwindow/log/log.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ Log::Log(mainWindowImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), m
stream << "</head>\n";
stream << "<body style=\"font-size:smaller\">\n";
stream << "<img src='logo.png'>\n";
stream << "<h3><b>Log-File for PokerTH 0.6 Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"</b></h3>\n";
stream << "<h3><b>Log-File for PokerTH 0.6-beta Session started on "+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"</b></h3>\n";
myLogFile->close();
//Zu alte Dateien löschen!!!
src/gui/qt/mainwindow/mainwindowimpl.cpp
+18 -118
View File
@@ -53,6 +53,8 @@
#include <net/socket_msg.h>
#include "math.h"
#define FORMATLEFT(X) "<p align='center'>(X)"
#define FORMATRIGHT(X) "(X)</p>"
@@ -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));
}
src/gui/qt/mainwindow/mainwindowimpl.h
+1 -24
View File
@@ -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;
src/gui/qt/mainwindow/mycardspixmaplabel.cpp
+4 -4
View File
@@ -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);
}
src/gui/qt/mainwindow/mycardspixmaplabel.h
+1 -1
View File
@@ -17,7 +17,7 @@
#include <QtGui>
#include <QtCore>
#include "mainwindowimpl.h"
class mainWindowImpl;
class MyCardsPixmapLabel : public QLabel
{
src/gui/qt/mainwindow/startsplash/startsplash.cpp
+1 -1
View File
@@ -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);
}
ts/pokerth_de.ts
+47 -8
View File
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="1.1" language="de">
<defaultcodec></defaultcodec>
<context>
<name>Chat</name>
<message>
<location filename="../src/gui/qt/mainwindow/chat/chat.cpp" line="53"/>
<source>You cannot kick yourself!</source>
<translation type="unfinished"></translation>
<translation>Sie können sich nicht selbst entfernen!</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>Sie können keinen Spieler entfernen - Sie sind kein Spieladministrator!</translation>
</message>
</context>
<context>
@@ -381,7 +382,26 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - gui graphics design, webdesign&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; Erhard List (&lt;a href=&quot;mailto:dunkanx@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;dunkanx@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - MacOS package&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Projektwebseite: &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; &lt;a href=&quot;http://www.pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot;-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:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;IRC: &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; #pokerth (irc.freenode.net)&lt;/p&gt;
&lt;p style=&quot;-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:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Autoren: &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; Felix Hammer (&lt;a href=&quot;mailto:doitux@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;doitux@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - Grundidee, Programm-Architektur, grafische Benutzeroberfläche, Linux-Paket&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; Florian Thauer (&lt;a href=&quot;mailto:floty@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;floty@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - Grundidee, Programm-Architektur, Engine-Entwicklung&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; Lothar May (&lt;a href=&quot;mailto:lotodore@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;lotodore@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - Netzwerk-Entwicklung, Windows-Paket&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; Oskar Lindqvist (&lt;a href=&quot;mailto:tranberry@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;tranberry@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - Grafikdesign für die grafische Benutzeroberfläche, Webdesign&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; Erhard List (&lt;a href=&quot;mailto:dunkanx@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;dunkanx@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - MacOS-Paket&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/qt/aboutpokerth.ui" line="211"/>
@@ -389,7 +409,10 @@ p, li { white-space: pre-wrap; }
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;!!!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)!!!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;Mirko Albrecht - deutsch&lt;br /&gt;Felix Hammer - deutsch&lt;br /&gt;Bernd Arnold - deutsch&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../src/gui/qt/aboutpokerth.ui" line="249"/>
@@ -410,7 +433,23 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot;-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:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;doc_dos&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - for self recorded chip sounds&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;a href=&quot;http://commons.wikimedia.org/wiki/Main_Page&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;Wikimedia Commons&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;; font-weight:600;&quot;&gt; - &lt;span style=&quot; font-weight:400;&quot;&gt;für verschiedene beliebte Avatar-Bildquellen&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Viktoria, Benedikt, Erhard, Felix, Florian, Linus, Lothar, Mark, Steffi, Caro&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - für die Persönlichkeiten-Avatarbilder&lt;/p&gt;
&lt;p style=&quot;-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:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;ZeiZei&lt;/span&gt; &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - für die Avatarbilder der Kategorie &quot;Verschiedenes&quot;&lt;/p&gt;
&lt;p style=&quot;-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:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;a href=&quot;http://kde-look.org/&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;http://kde-look.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - für verschiedene unter der GPL lizenzierte Klänge&lt;/p&gt;
&lt;p style=&quot;-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:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;doc_dos&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Nimbus Sans L&apos;;&quot;&gt; - für die selbst aufgenommenen Chip-Klänge&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
</context>
<context>
@@ -902,7 +941,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="593"/>
<source>You should not kick yourself from this game!</source>
<translation>Sie sollten sich nicht selbst des Spieles verweisen ;)!</translation>
<translation>Sie sollten sich nicht selbst des Spiels verweisen!</translation>
</message>
<message>
<location filename="../src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp" line="293"/>
@@ -2303,7 +2342,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">F-Tasten-Reihenfolge umkehren (F1 - F3) {1 ?} {4)?}</translation>
<translation>F-Tasten-Reihenfolge umkehren (F1 - F4)</translation>
</message>
</context>
<context>
@@ -2445,7 +2484,7 @@ Bitte wählen Sie ein gültiges Verzeichnis!</translation>
<message>
<location filename="../src/gui/qt/settingsdialog/settingsdialogimpl.cpp" line="50"/>
<source>Norwegian</source>
<translation type="unfinished"></translation>
<translation>Norsk (Norwegisch)</translation>
</message>
</context>
<context>