diff --git a/pokerth.pro b/pokerth.pro index acea65ce..a02ecc53 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -112,7 +112,7 @@ win32 { } !win32 { DEPENDPATH += src/net/linux/ - LIBS += -lboost_thread-mt + LIBS += -lboost_thread-mt_static } CONFIG += qt release diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index cb6cda06..a1c0fc57 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -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); diff --git a/src/gui/qt/deck.qrc b/src/gui/qt/deck.qrc index d5d49037..34551e05 100755 --- a/src/gui/qt/deck.qrc +++ b/src/gui/qt/deck.qrc @@ -63,6 +63,7 @@ graphics/1px.png graphics/dealerbutton.png graphics/fileopen16.png + graphics/handRanking_release.png graphics/logo-140-100.png diff --git a/src/gui/qt/graphics/handRanking_release.png b/src/gui/qt/graphics/handRanking_release.png new file mode 100644 index 00000000..30e11fc9 Binary files /dev/null and b/src/gui/qt/graphics/handRanking_release.png differ diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index a984b2b1..53744227 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -536,13 +536,10 @@ Qt::Vertical - - QSizePolicy::MinimumExpanding - 20 - 110 + 20 @@ -553,33 +550,199 @@ Qt::Horizontal - QSizePolicy::MinimumExpanding + QSizePolicy::Fixed - 140 + 211 0 - + + + false + - 140 - 100 + 211 + 190 - 140 - 100 + 211 + 190 - - :/graphics/graphics/logo-140-100.png + + + + + + + 255 + 255 + 255 + + + + + + + 86 + 170 + 86 + + + + + + + + + 255 + 255 + 255 + + + + + + + 86 + 170 + 86 + + + + + + + + + 86 + 170 + 86 + + + + + + + 86 + 170 + 86 + + + + + + + true + + + + 6 + + + 3 + + + + + + + + + + 255 + 255 + 255 + + + + + + + 86 + 170 + 86 + + + + + + + + + 255 + 255 + 255 + + + + + + + 86 + 170 + 86 + + + + + + + + + 86 + 170 + 86 + + + + + + + 86 + 170 + 86 + + + + + + + + 0 + + + + Hands + + + + 5 + + + 0 + + + + + :/graphics/graphics/handRanking_release.png + + + + + + + + @@ -590,11 +753,11 @@ Qt::Horizontal - QSizePolicy::Fixed + QSizePolicy::MinimumExpanding - 87 + 23 40 @@ -1459,11 +1622,11 @@ Qt::Horizontal - QSizePolicy::Fixed + QSizePolicy::MinimumExpanding - 30 + 23 40 @@ -1496,7 +1659,7 @@ Qt::Horizontal - QSizePolicy::MinimumExpanding + QSizePolicy::Fixed @@ -1507,7 +1670,7 @@ - + false @@ -1961,858 +2124,22 @@ - + Qt::Vertical + + QSizePolicy::MinimumExpanding + - 861 + 20 20 - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - 566 - 136 - - - - - 566 - 136 - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 74 - 131 - 83 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 74 - 131 - 83 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 128 - 128 - 128 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 199 - 199 - 199 - - - - - - - 255 - 255 - 255 - - - - - - - 128 - 128 - 128 - - - - - - - 74 - 131 - 83 - - - - - - - 74 - 131 - 83 - - - - - - - 0 - 0 - 0 - - - - - - - 86 - 117 - 148 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - true - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 331 - 102 - - - - - 331 - 102 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 9 - - - 6 - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - 104 - 114 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 4 - - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 0 - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - true - - - - - - - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - true - - - - - - - - - - 0 - - - 4 - - - - - - 0 - 26 - - - - - 16777215 - 26 - - - - Qt::AlignCenter - - - - - - - - 0 - 26 - - - - - 16777215 - 26 - - - - Qt::AlignCenter - - - - - - - - - - - - 0 - - - 6 - - - - - - 95 - 16 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::AlignCenter - - - - - - - - 0 - 22 - - - - - 16777215 - 22 - - - - Qt::AlignCenter - - - - - - - - - - - 95 - 36 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - Qt::AlignCenter - - - - - - - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - @@ -4001,17 +3328,853 @@ - + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + + 566 + 136 + + + + + 566 + 136 + + + + + + + + + 0 + 0 + 0 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + + 0 + 0 + 0 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + + 128 + 128 + 128 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 199 + 199 + 199 + + + + + + + 255 + 255 + 255 + + + + + + + 128 + 128 + 128 + + + + + + + 74 + 131 + 83 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 86 + 117 + 148 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + true + + + + + + + 9 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + + 331 + 102 + + + + + 331 + 102 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 9 + + + 6 + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 0 + + + + + 104 + 114 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 4 + + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 0 + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + true + + + + + + + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + true + + + + + + + + + + 0 + + + 4 + + + + + + 0 + 26 + + + + + 16777215 + 26 + + + + Qt::AlignCenter + + + + + + + + 0 + 26 + + + + + 16777215 + 26 + + + + Qt::AlignCenter + + + + + + + + + + + + 0 + + + 6 + + + + + + 95 + 16 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::AlignCenter + + + + + + + + 0 + 22 + + + + + 16777215 + 22 + + + + Qt::AlignCenter + + + + + + + + + + + 95 + 36 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + Qt::AlignCenter + + + + + + + + + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + Qt::Vertical - - QSizePolicy::MinimumExpanding - - 20 + 861 20 diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 77a6af2e..5b9382a5 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -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(); + } } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 7552bcd9..18263c48 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -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; diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index ac336006..2c67094e 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -250,7 +250,7 @@ void StartSplash::paintEvent(QPaintEvent * event) { if(frameNo >= 245) { this->hide(); - myW->label_logo->show(); +// myW->label_logo->show(); } diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 419577d0..f6027927 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -5,8 +5,8 @@ 0 0 - 571 - 353 + 581 + 387 @@ -19,6 +19,13 @@ 6 + + + + Qt::Horizontal + + + @@ -177,34 +184,28 @@ 6 - - + + - Show Toolbox (F2 to switch on/off) - - - - - - - - 75 - true - - - - Interface - - - - - - - Qt::Horizontal + Show Intro on Startup + + + Show right Toolbox (F3 to switch on/off) + + + + + + + Show left Toolbox (F2 to switch on/off) + + + + Show Fade-Out Animation for Non-Winning Cards @@ -212,6 +213,13 @@ + + + Show Flip-Card Animation + + + + Flipside of Cards @@ -305,14 +313,7 @@ p, li { white-space: pre-wrap; } - - - - Show Intro on Startup - - - - + Qt::Vertical @@ -325,10 +326,23 @@ p, li { white-space: pre-wrap; } - - + + + + Qt::Horizontal + + + + + + + + 75 + true + + - Show Flip-Card Animation + Interface @@ -560,16 +574,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - - @@ -600,11 +604,14 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + @@ -619,7 +626,7 @@ p, li { white-space: pre-wrap; } checkBox_pauseBetweenHands checkBox_showGameSettingsDialogOnNewGame checkBox_showIntro - checkBox_showToolbox + checkBox_showRightToolbox checkBox_showFadeOutCardsAnimation checkBox_showFlipCardsAnimation radioButton_flipsideTux diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 091971e6..a13720f1 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -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());