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

left toolbox

Browse Source
This commit is contained in:
doitux
2007-02-20 00:05:09 +00:00
parent 6e7f6dfdbe
commit 2e6cf7cddf
10 changed files with 1189 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+5 -2
View File
@@ -34,7 +34,7 @@ using namespace std;
ConfigFile::ConfigFile()
{
// !!!! Revisionsnummer der Configdefaults !!!!!
configRev = 5;
configRev = 6;
// Pfad und Dateinamen setzen
#ifdef _WIN32
@@ -137,9 +137,12 @@ void ConfigFile::createDefaultConfig() {
TiXmlElement * confElement10 = new TiXmlElement( "Opponent4Name" );
config->LinkEndChild( confElement10 );
confElement10->SetAttribute("value", "Player 4");
TiXmlElement * confElement11 = new TiXmlElement( "ShowToolBox" );
TiXmlElement * confElement11 = new TiXmlElement( "ShowLeftToolBox" );
config->LinkEndChild( confElement11 );
confElement11->SetAttribute("value", 1);
TiXmlElement * confElement22 = new TiXmlElement( "ShowRightToolBox" );
config->LinkEndChild( confElement22 );
confElement22->SetAttribute("value", 1);
TiXmlElement * confElement13 = new TiXmlElement( "ShowIntro" );
config->LinkEndChild( confElement13 );
confElement13->SetAttribute("value", 1);
src/gui/qt/deck.qrc
+1
View File
@@ -63,6 +63,7 @@
<file>graphics/1px.png</file>
<file>graphics/dealerbutton.png</file>
<file>graphics/fileopen16.png</file>
<file>graphics/handRanking_release.png</file>
<file>graphics/logo-140-100.png</file>
</qresource>
</RCC>
src/gui/qt/graphics/handRanking_release.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 132 KiB

src/gui/qt/mainwindow.ui
+1028 -865
View File
File diff suppressed because it is too large Load Diff
src/gui/qt/mainwindow/mainwindowimpl.cpp
+87 -27
View File
@@ -102,111 +102,123 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
tmpFont.setBold(TRUE);
textLabel_handLabel->setFont(tmpFont);
//Logos
label_logoleft = new QLabel;
label_logoleft->setPixmap(QPixmap(QString::fromUtf8(":/graphics/graphics/logo-140-100.png")));
label_logoleft->hide();
vboxLayout->addWidget(label_logoleft);
label_logoright = new QLabel;
label_logoright->setPixmap(QPixmap(QString::fromUtf8(":/graphics/graphics/logo-140-100.png")));
label_logoright->setAlignment(Qt::AlignRight);
label_logoright->hide();
vboxLayout3->addWidget(label_logoright);
//pixmapCardsLabel erstellen und ins Layout einfügen!
pixmapLabel_cardBoard0 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard0"));
pixmapLabel_cardBoard0->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard0->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard0->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard0, 0, 0, 1, 1);
gridLayout37->addWidget(pixmapLabel_cardBoard0, 0, 0, 1, 1);
pixmapLabel_cardBoard1 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard1->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard1"));
pixmapLabel_cardBoard1->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard1->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard1->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard1, 0, 1, 1, 1);
gridLayout37->addWidget(pixmapLabel_cardBoard1, 0, 1, 1, 1);
pixmapLabel_cardBoard2 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard2->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard2"));
pixmapLabel_cardBoard2->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard2->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard2->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard2, 0, 2, 1, 1);
gridLayout37->addWidget(pixmapLabel_cardBoard2, 0, 2, 1, 1);
pixmapLabel_cardBoard3 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard3->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard3"));
pixmapLabel_cardBoard3->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard3->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard3->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard3, 0, 3, 1, 1);
gridLayout37->addWidget(pixmapLabel_cardBoard3, 0, 3, 1, 1);
pixmapLabel_cardBoard4 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard4->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard4"));
pixmapLabel_cardBoard4->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard4->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard4->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard4, 0, 4, 1, 1);
gridLayout37->addWidget(pixmapLabel_cardBoard4, 0, 4, 1, 1);
pixmapLabel_card0a = new MyCardsPixmapLabel(frame5);
pixmapLabel_card0a->setObjectName(QString::fromUtf8("pixmapLabel_card0a"));
pixmapLabel_card0a->setMinimumSize(QSize(80, 112));
pixmapLabel_card0a->setMaximumSize(QSize(80, 112));
pixmapLabel_card0a->setScaledContents(true);
gridLayout2->addWidget(pixmapLabel_card0a, 0, 0, 1, 1);
gridLayout4->addWidget(pixmapLabel_card0a, 0, 0, 1, 1);
pixmapLabel_card0b = new MyCardsPixmapLabel(frame5);
pixmapLabel_card0b->setObjectName(QString::fromUtf8("pixmapLabel_card0b"));
pixmapLabel_card0b->setMinimumSize(QSize(80, 112));
pixmapLabel_card0b->setMaximumSize(QSize(80, 112));
pixmapLabel_card0b->setScaledContents(true);
gridLayout2->addWidget(pixmapLabel_card0b, 0, 1, 1, 1);
gridLayout4->addWidget(pixmapLabel_card0b, 0, 1, 1, 1);
pixmapLabel_card1a = new MyCardsPixmapLabel(frame8_2_2_2_5);
pixmapLabel_card1a->setObjectName(QString::fromUtf8("pixmapLabel_card1a"));
pixmapLabel_card1a->setMinimumSize(QSize(57, 80));
pixmapLabel_card1a->setMaximumSize(QSize(57, 80));
pixmapLabel_card1a->setScaledContents(true);
gridLayout18->addWidget(pixmapLabel_card1a, 0, 0, 1, 1);
gridLayout13->addWidget(pixmapLabel_card1a, 0, 0, 1, 1);
pixmapLabel_card1b = new MyCardsPixmapLabel(frame8_2_2_2_5);
pixmapLabel_card1b->setObjectName(QString::fromUtf8("pixmapLabel_card1b"));
pixmapLabel_card1b->setMinimumSize(QSize(57, 80));
pixmapLabel_card1b->setMaximumSize(QSize(57, 80));
pixmapLabel_card1b->setScaledContents(true);
gridLayout18->addWidget(pixmapLabel_card1b, 0, 1, 1, 1);
gridLayout13->addWidget(pixmapLabel_card1b, 0, 1, 1, 1);
pixmapLabel_card2a = new MyCardsPixmapLabel(frame8_2_2_2_4);
pixmapLabel_card2a->setObjectName(QString::fromUtf8("pixmapLabel_card2a"));
pixmapLabel_card2a->setMinimumSize(QSize(57, 80));
pixmapLabel_card2a->setMaximumSize(QSize(57, 80));
pixmapLabel_card2a->setScaledContents(true);
gridLayout24->addWidget(pixmapLabel_card2a, 0, 0, 1, 1);
gridLayout19->addWidget(pixmapLabel_card2a, 0, 0, 1, 1);
pixmapLabel_card2b = new MyCardsPixmapLabel(frame8_2_2_2_4);
pixmapLabel_card2b->setObjectName(QString::fromUtf8("pixmapLabel_card2b"));
pixmapLabel_card2b->setMinimumSize(QSize(57, 80));
pixmapLabel_card2b->setMaximumSize(QSize(57, 80));
pixmapLabel_card2b->setScaledContents(true);
gridLayout24->addWidget(pixmapLabel_card2b, 0, 1, 1, 1);
gridLayout19->addWidget(pixmapLabel_card2b, 0, 1, 1, 1);
pixmapLabel_card3a = new MyCardsPixmapLabel(frame8_2_2_2_6);
pixmapLabel_card3a->setObjectName(QString::fromUtf8("pixmapLabel_card3a"));
pixmapLabel_card3a->setMinimumSize(QSize(57, 80));
pixmapLabel_card3a->setMaximumSize(QSize(57, 80));
pixmapLabel_card3a->setScaledContents(true);
gridLayout30->addWidget(pixmapLabel_card3a, 0, 0, 1, 1);
gridLayout25->addWidget(pixmapLabel_card3a, 0, 0, 1, 1);
pixmapLabel_card3b = new MyCardsPixmapLabel(frame8_2_2_2_6);
pixmapLabel_card3b->setObjectName(QString::fromUtf8("pixmapLabel_card3b"));
pixmapLabel_card3b->setMinimumSize(QSize(57, 80));
pixmapLabel_card3b->setMaximumSize(QSize(57, 80));
pixmapLabel_card3b->setScaledContents(true);
gridLayout30->addWidget(pixmapLabel_card3b, 0, 1, 1, 1);
gridLayout25->addWidget(pixmapLabel_card3b, 0, 1, 1, 1);
pixmapLabel_card4a = new MyCardsPixmapLabel(frame8_2_2_2_7);
pixmapLabel_card4a->setObjectName(QString::fromUtf8("pixmapLabel_card4a"));
pixmapLabel_card4a->setMinimumSize(QSize(57, 80));
pixmapLabel_card4a->setMaximumSize(QSize(57, 80));
pixmapLabel_card4a->setScaledContents(true);
gridLayout36->addWidget(pixmapLabel_card4a, 0, 0, 1, 1);
gridLayout31->addWidget(pixmapLabel_card4a, 0, 0, 1, 1);
pixmapLabel_card4b = new MyCardsPixmapLabel(frame8_2_2_2_7);
pixmapLabel_card4b->setObjectName(QString::fromUtf8("pixmapLabel_card4b"));
pixmapLabel_card4b->setMinimumSize(QSize(57, 80));
pixmapLabel_card4b->setMaximumSize(QSize(57, 80));
pixmapLabel_card4b->setScaledContents(true);
gridLayout36->addWidget(pixmapLabel_card4b, 0, 1, 1, 1);
gridLayout31->addWidget(pixmapLabel_card4b, 0, 1, 1, 1);
// pixmapLabel_card4b->setPixmap(QPixmap(":/cards/graphics/cards/33.png"), FALSE);
@@ -223,11 +235,19 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
flipHolecardsAllInAlreadyDone = FALSE;
//Toolbox verstecken?
if (!myConfig->readConfigInt("ShowToolBox")) { groupBox_tools->hide(); }
//Toolboxen verstecken?
if (!myConfig->readConfigInt("ShowRightToolBox")) {
groupBox_right_tools->hide();
label_logoright->show();
}
if (!myConfig->readConfigInt("ShowLeftToolBox")) {
groupBox_left_tools->hide();
label_logoleft->show();
}
//Intro abspielen?
if (myConfig->readConfigInt("ShowIntro")) {
label_logo->hide();
// label_logo->hide();
QTimer::singleShot(100, this, SLOT( paintStartSplash() )); }
@@ -494,7 +514,9 @@ void mainWindowImpl::callNewGameDialog() {
QPalette tempPalette = groupBox_board->palette();
tempPalette.setColor(QPalette::Window, active);
groupBox_board->setPalette(tempPalette);
groupBox_tools->setDisabled(FALSE);
groupBox_right_tools->setDisabled(FALSE);
groupBox_left_tools->setDisabled(FALSE);
//positioning Slider
horizontalSlider_speed->setValue(guiGameSpeed);
@@ -529,7 +551,8 @@ void mainWindowImpl::callNewGameDialog() {
QPalette tempPalette = groupBox_board->palette();
tempPalette.setColor(QPalette::Window, active);
groupBox_board->setPalette(tempPalette);
groupBox_tools->setDisabled(FALSE);
groupBox_right_tools->setDisabled(FALSE);
groupBox_left_tools->setDisabled(FALSE);
//positioning Slider
@@ -584,8 +607,25 @@ void mainWindowImpl::callSettingsDialog() {
if (v->getSettingsCorrect()) {
//Toolbox verstecken?
if (!myConfig->readConfigInt("ShowToolBox")) { groupBox_tools->hide(); }
else { groupBox_tools->show(); }
if (myConfig->readConfigInt("ShowLeftToolBox")) {
label_logoleft->hide();
groupBox_left_tools->show();
}
else {
groupBox_left_tools->hide();
label_logoleft->show();
}
if (myConfig->readConfigInt("ShowRightToolBox")) {
label_logoright->hide();
groupBox_right_tools->show();
}
else {
groupBox_right_tools->hide();
label_logoright->show();
}
//Falls Spielernamen geändert wurden --> neu zeichnen --> erst beim nächsten Neustart neu ausgelesen
if (v->getPlayerNickIsChanged() && actualGame) {
@@ -1900,8 +1940,9 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
bool ctrlPressed = FALSE;
if (event->key() == 16777220) { if(spinBox_set->hasFocus()) pushButton_set->click(); } //ENTER
if (event->key() == 16777265) { switchToolBox(); } //F2
if (event->key() == 16777220) { if(spinBox_set->hasFocus()) pushButton_set->click(); } //ENTER
if (event->key() == 16777265) { switchLeftToolBox(); } //F2
if (event->key() == 16777266) { switchRightToolBox(); } //F3
if (event->key() == 16777249) {
pushButton_break->click();
ctrlPressed = TRUE;
@@ -1916,10 +1957,29 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
}
void mainWindowImpl::switchToolBox() {
void mainWindowImpl::switchLeftToolBox() {
if (groupBox_tools->isHidden()) { groupBox_tools->show(); }
else { groupBox_tools->hide(); }
if (groupBox_left_tools->isHidden()) {
label_logoleft->hide();
groupBox_left_tools->show();
}
else {
groupBox_left_tools->hide();
label_logoleft->show();
}
}
void mainWindowImpl::switchRightToolBox() {
if (groupBox_right_tools->isHidden()) {
label_logoright->hide();
groupBox_right_tools->show();
}
else {
groupBox_right_tools->hide();
label_logoright->show();
}
}
src/gui/qt/mainwindow/mainwindowimpl.h
+6 -1
View File
@@ -169,7 +169,8 @@ public slots:
void breakButtonClicked();
void keyPressEvent ( QKeyEvent * event );
void switchToolBox();
void switchLeftToolBox();
void switchRightToolBox();
void paintStartSplash();
@@ -182,6 +183,10 @@ private:
Log *myLog;
ConfigFile *myConfig;
//Logo
QLabel *label_logoleft;
QLabel *label_logoright;
//MyPixmapCardsLabel
MyCardsPixmapLabel *pixmapLabel_cardBoard0;
MyCardsPixmapLabel *pixmapLabel_cardBoard1;
src/gui/qt/mainwindow/startsplash/startsplash.cpp
+1 -1
View File
@@ -250,7 +250,7 @@ void StartSplash::paintEvent(QPaintEvent * event) {
if(frameNo >= 245) {
this->hide();
myW->label_logo->show();
// myW->label_logo->show();
}
src/gui/qt/settingsdialog.ui
+56 -49
View File
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>571</width>
<height>353</height>
<width>581</width>
<height>387</height>
</rect>
</property>
<property name="windowTitle" >
@@ -19,6 +19,13 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QStackedWidget" name="stackedWidget" >
<property name="currentIndex" >
@@ -177,34 +184,28 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="3" column="0" >
<widget class="QCheckBox" name="checkBox_showToolbox" >
<item row="2" column="0" >
<widget class="QCheckBox" name="checkBox_showIntro" >
<property name="text" >
<string>Show Toolbox (F2 to switch on/off)</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_13" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Interface</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="Line" name="line_5" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<string>Show Intro on Startup</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QCheckBox" name="checkBox_showRightToolbox" >
<property name="text" >
<string>Show right Toolbox (F3 to switch on/off)</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QCheckBox" name="checkBox_showLeftToolbox" >
<property name="text" >
<string>Show left Toolbox (F2 to switch on/off)</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QCheckBox" name="checkBox_showFadeOutCardsAnimation" >
<property name="text" >
<string>Show Fade-Out Animation for Non-Winning Cards</string>
@@ -212,6 +213,13 @@
</widget>
</item>
<item row="6" column="0" >
<widget class="QCheckBox" name="checkBox_showFlipCardsAnimation" >
<property name="text" >
<string>Show Flip-Card Animation</string>
</property>
</widget>
</item>
<item row="7" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Flipside of Cards</string>
@@ -305,14 +313,7 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="checkBox_showIntro" >
<property name="text" >
<string>Show Intro on Startup</string>
</property>
</widget>
</item>
<item row="7" column="0" >
<item row="8" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -325,10 +326,23 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
<item row="5" column="0" >
<widget class="QCheckBox" name="checkBox_showFlipCardsAnimation" >
<item row="1" column="0" >
<widget class="Line" name="line_5" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_13" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Show Flip-Card Animation</string>
<string>Interface</string>
</property>
</widget>
</item>
@@ -560,16 +574,6 @@ p, li { white-space: pre-wrap; }
</widget>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QListWidget" name="listWidget" >
<property name="maximumSize" >
@@ -600,11 +604,14 @@ p, li { white-space: pre-wrap; }
</item>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="Line" name="line" >
<item row="2" column="0" colspan="2" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
@@ -619,7 +626,7 @@ p, li { white-space: pre-wrap; }
<tabstop>checkBox_pauseBetweenHands</tabstop>
<tabstop>checkBox_showGameSettingsDialogOnNewGame</tabstop>
<tabstop>checkBox_showIntro</tabstop>
<tabstop>checkBox_showToolbox</tabstop>
<tabstop>checkBox_showRightToolbox</tabstop>
<tabstop>checkBox_showFadeOutCardsAnimation</tabstop>
<tabstop>checkBox_showFlipCardsAnimation</tabstop>
<tabstop>radioButton_flipsideTux</tabstop>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+4 -2
View File
@@ -50,7 +50,8 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent)
checkBox_showGameSettingsDialogOnNewGame->setChecked(myConfig.readConfigInt("ShowGameSettingsDialogOnNewGame"));
//Interface
checkBox_showToolbox->setChecked(myConfig.readConfigInt("ShowToolBox"));
checkBox_showLeftToolbox->setChecked(myConfig.readConfigInt("ShowLeftToolBox"));
checkBox_showRightToolbox->setChecked(myConfig.readConfigInt("ShowRightToolBox"));
checkBox_showIntro->setChecked(myConfig.readConfigInt("ShowIntro"));
checkBox_showFadeOutCardsAnimation->setChecked(myConfig.readConfigInt("ShowFadeOutCardsAnimation"));
checkBox_showFlipCardsAnimation->setChecked(myConfig.readConfigInt("ShowFlipCardsAnimation"));
@@ -103,7 +104,8 @@ void settingsDialogImpl::isAccepted() {
myConfig.writeConfigInt("ShowGameSettingsDialogOnNewGame", checkBox_showGameSettingsDialogOnNewGame->isChecked());
// Interface
myConfig.writeConfigInt("ShowToolBox", checkBox_showToolbox->isChecked());
myConfig.writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked());
myConfig.writeConfigInt("ShowRightToolBox", checkBox_showRightToolbox->isChecked());
myConfig.writeConfigInt("ShowIntro", checkBox_showIntro->isChecked());
myConfig.writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked());
myConfig.writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked());