diff --git a/src/gui/qt/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui index dda8d8a5..055dae77 100755 --- a/src/gui/qt/aboutpokerth.ui +++ b/src/gui/qt/aboutpokerth.ui @@ -6,8 +6,8 @@ 0 0 - 530 - 440 + 615 + 324 @@ -22,6 +22,9 @@ + + true + 0 @@ -44,7 +47,7 @@ 20 - 211 + 100 @@ -99,22 +102,9 @@ p, li { white-space: pre-wrap; } 6 - - - - Qt::Vertical - - - - 20 - 81 - - - - - - + + <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; text-decoration:none;"> @@ -136,11 +126,30 @@ 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;"> Erhard List (<a href="mailto:dunkanx@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">dunkanx@pokerth.net</span></a>)</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - MacOS package</p></body></html> - - true - - - true + + + + + + + Thanks to + + + + 9 + + + 6 + + + + + <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; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Following flickr.com users for avatar image sources:</span> </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Chales Johnson, Eli Hodapp, Hans Dekker, Indigo Goat, Jerry Daykin, Presty, The Marmot, William Holtkamp, _cr_, dps, ellievanhoutte, jarrodtrainique, joeltelling, loufi, riccardodivirgilio, rileyroxx, said&amp;done, scottfeldstein</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p></body></html> @@ -159,6 +168,9 @@ p, li { white-space: pre-wrap; } + + true + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp index 394366aa..8be8f468 100755 --- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp +++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp @@ -25,4 +25,11 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent) setupUi(this); + QPalette myPalette = textBrowser->palette(); + QColor myColor = myPalette.color(QPalette::Window); + myPalette.setColor(QPalette::Base, myColor); + textBrowser->setPalette(myPalette); + textBrowser_2->setPalette(myPalette); + textBrowser_3->setPalette(myPalette); + } diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index 0242bb4f..21d3e560 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -6172,11 +6172,6 @@ - - MyRightTabWidget - QTabWidget -
myrighttabwidget.h
- MyLeftTabWidget QTabWidget @@ -6187,6 +6182,11 @@ QLabel
mysetlabel.h
 + + MyRightTabWidget + QTabWidget +
myrighttabwidget.h
+ spinBox_set diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc index 62cb73d4..006e811e 100755 --- a/src/gui/qt/resources.qrc +++ b/src/gui/qt/resources.qrc @@ -1,9 +1,4 @@ - - resources/translations/pokerth_de.qm - resources/translations/pokerth_nl.qm - resources/translations/pokerth_fr.qm - resources/graphics/actions/action_allin.png resources/graphics/actions/action_bet.png @@ -12,7 +7,29 @@ resources/graphics/actions/action_fold.png resources/graphics/actions/action_raise.png resources/graphics/actions/action_set.png - resources/graphics/actions/action_winner.png + resources/graphics/actions/action_winner.png + + + resources/avatar/Chales_Johnson.png + resources/avatar/Eli_Hodapp.png + resources/avatar/Eli_Hodapp1.png + resources/avatar/Hans_Dekker.png + resources/avatar/Indigo_Goat.png + resources/avatar/Jerry_Daykin.png + resources/avatar/Presty.png + resources/avatar/The_Marmot.png + resources/avatar/William_Holtkamp.png + resources/avatar/cr.png + resources/avatar/dps.png + resources/avatar/ellievanhoutte.png + resources/avatar/jarrodtrainique.png + resources/avatar/joeltelling.png + resources/avatar/loufi.png + resources/avatar/riccardodivirgilio.png + resources/avatar/riccardodivirgilio1.png + resources/avatar/rileyroxx.png + resources/avatar/saidanddone.png + resources/avatar/scottfeldstein.png resources/graphics/cards/0.png @@ -70,13 +87,8 @@ resources/graphics/cards/flipside.png + resources/data/flopValues resources/data/preflopValues - resources/data/flopValues - - - resources/sounds/dealtwocards.wav - resources/sounds/call.wav - resources/sounds/raise.wav resources/fonts/VeraBd.ttf @@ -86,13 +98,13 @@ resources/graphics/1px.png + resources/graphics/bigblindPuck.png resources/graphics/fileopen16.png resources/graphics/handRanking_release.png - resources/graphics/toolboxFrameBG.png - resources/graphics/logoChip3D.png - resources/graphics/windowicon.png - resources/graphics/smallblindPuck.png - resources/graphics/bigblindPuck.png + resources/graphics/logoChip3D.png + resources/graphics/smallblindPuck.png + resources/graphics/toolboxFrameBG.png + resources/graphics/windowicon.png resources/guiv2/cardholder_03.png @@ -110,4 +122,14 @@ resources/guiv2/playeraction_07.png resources/guiv2/table.png + + resources/sounds/call.wav + resources/sounds/dealtwocards.wav + resources/sounds/raise.wav + + + resources/translations/pokerth_de.qm + resources/translations/pokerth_fr.qm + resources/translations/pokerth_nl.qm + diff --git a/src/gui/qt/resources/avatar/Chales_Johnson.png b/src/gui/qt/resources/avatar/Chales_Johnson.png new file mode 100644 index 00000000..734826b0 Binary files /dev/null and b/src/gui/qt/resources/avatar/Chales_Johnson.png differ diff --git a/src/gui/qt/resources/avatar/Eli_Hodapp.png b/src/gui/qt/resources/avatar/Eli_Hodapp.png new file mode 100644 index 00000000..7033156d Binary files /dev/null and b/src/gui/qt/resources/avatar/Eli_Hodapp.png differ diff --git a/src/gui/qt/resources/avatar/Eli_Hodapp1.png b/src/gui/qt/resources/avatar/Eli_Hodapp1.png new file mode 100644 index 00000000..bf4b7f58 Binary files /dev/null and b/src/gui/qt/resources/avatar/Eli_Hodapp1.png differ diff --git a/src/gui/qt/resources/avatar/Hans_Dekker.png b/src/gui/qt/resources/avatar/Hans_Dekker.png new file mode 100644 index 00000000..4a1c50fa Binary files /dev/null and b/src/gui/qt/resources/avatar/Hans_Dekker.png differ diff --git a/src/gui/qt/resources/avatar/Indigo_Goat.png b/src/gui/qt/resources/avatar/Indigo_Goat.png new file mode 100644 index 00000000..a6d5a972 Binary files /dev/null and b/src/gui/qt/resources/avatar/Indigo_Goat.png differ diff --git a/src/gui/qt/resources/avatar/Jerry_Daykin.png b/src/gui/qt/resources/avatar/Jerry_Daykin.png new file mode 100644 index 00000000..d138d63d Binary files /dev/null and b/src/gui/qt/resources/avatar/Jerry_Daykin.png differ diff --git a/src/gui/qt/resources/avatar/Presty.png b/src/gui/qt/resources/avatar/Presty.png new file mode 100644 index 00000000..a02e6d41 Binary files /dev/null and b/src/gui/qt/resources/avatar/Presty.png differ diff --git a/src/gui/qt/resources/avatar/The_Marmot.png b/src/gui/qt/resources/avatar/The_Marmot.png new file mode 100644 index 00000000..b2f24d7d Binary files /dev/null and b/src/gui/qt/resources/avatar/The_Marmot.png differ diff --git a/src/gui/qt/resources/avatar/William_Holtkamp.png b/src/gui/qt/resources/avatar/William_Holtkamp.png new file mode 100644 index 00000000..001b2410 Binary files /dev/null and b/src/gui/qt/resources/avatar/William_Holtkamp.png differ diff --git a/src/gui/qt/resources/avatar/cr.png b/src/gui/qt/resources/avatar/cr.png new file mode 100644 index 00000000..ee2e34df Binary files /dev/null and b/src/gui/qt/resources/avatar/cr.png differ diff --git a/src/gui/qt/resources/avatar/dps.png b/src/gui/qt/resources/avatar/dps.png new file mode 100644 index 00000000..92af03c8 Binary files /dev/null and b/src/gui/qt/resources/avatar/dps.png differ diff --git a/src/gui/qt/resources/avatar/ellievanhoutte.png b/src/gui/qt/resources/avatar/ellievanhoutte.png new file mode 100644 index 00000000..ea51b087 Binary files /dev/null and b/src/gui/qt/resources/avatar/ellievanhoutte.png differ diff --git a/src/gui/qt/resources/avatar/jarrodtrainique.png b/src/gui/qt/resources/avatar/jarrodtrainique.png new file mode 100644 index 00000000..99035271 Binary files /dev/null and b/src/gui/qt/resources/avatar/jarrodtrainique.png differ diff --git a/src/gui/qt/resources/avatar/joeltelling.png b/src/gui/qt/resources/avatar/joeltelling.png new file mode 100644 index 00000000..ee1922d8 Binary files /dev/null and b/src/gui/qt/resources/avatar/joeltelling.png differ diff --git a/src/gui/qt/resources/avatar/loufi.png b/src/gui/qt/resources/avatar/loufi.png new file mode 100644 index 00000000..04245585 Binary files /dev/null and b/src/gui/qt/resources/avatar/loufi.png differ diff --git a/src/gui/qt/resources/avatar/riccardodivirgilio.png b/src/gui/qt/resources/avatar/riccardodivirgilio.png new file mode 100644 index 00000000..562a6c17 Binary files /dev/null and b/src/gui/qt/resources/avatar/riccardodivirgilio.png differ diff --git a/src/gui/qt/resources/avatar/riccardodivirgilio1.png b/src/gui/qt/resources/avatar/riccardodivirgilio1.png new file mode 100644 index 00000000..97356399 Binary files /dev/null and b/src/gui/qt/resources/avatar/riccardodivirgilio1.png differ diff --git a/src/gui/qt/resources/avatar/rileyroxx.png b/src/gui/qt/resources/avatar/rileyroxx.png new file mode 100644 index 00000000..afabcb8b Binary files /dev/null and b/src/gui/qt/resources/avatar/rileyroxx.png differ diff --git a/src/gui/qt/resources/avatar/saidanddone.png b/src/gui/qt/resources/avatar/saidanddone.png new file mode 100644 index 00000000..bad44e1d Binary files /dev/null and b/src/gui/qt/resources/avatar/saidanddone.png differ diff --git a/src/gui/qt/resources/avatar/scottfeldstein.png b/src/gui/qt/resources/avatar/scottfeldstein.png new file mode 100644 index 00000000..2074b73b Binary files /dev/null and b/src/gui/qt/resources/avatar/scottfeldstein.png differ diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp index 2b55c2a2..15452197 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp @@ -50,36 +50,38 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c) // myItem->setText("PokerTH"); // listWidget->addItem(myItem); // }; + + QStringList avatarList; + avatarList << ":avatar/resources/avatar/Chales_Johnson.png"; + avatarList << ":avatar/resources/avatar/Eli_Hodapp.png"; + avatarList << ":avatar/resources/avatar/Eli_Hodapp1.png"; + avatarList << ":avatar/resources/avatar/Hans_Dekker.png"; + avatarList << ":avatar/resources/avatar/Indigo_Goat.png"; + avatarList << ":avatar/resources/avatar/Jerry_Daykin.png"; + avatarList << ":avatar/resources/avatar/Presty.png"; + avatarList << ":avatar/resources/avatar/The_Marmot.png"; + avatarList << ":avatar/resources/avatar/William_Holtkamp.png"; + avatarList << ":avatar/resources/avatar/cr.png"; + avatarList << ":avatar/resources/avatar/dps.png"; + avatarList << ":avatar/resources/avatar/ellievanhoutte.png"; + avatarList << ":avatar/resources/avatar/jarrodtrainique.png"; + avatarList << ":avatar/resources/avatar/joeltelling.png"; + avatarList << ":avatar/resources/avatar/loufi.png"; + avatarList << ":avatar/resources/avatar/riccardodivirgilio.png"; + avatarList << ":avatar/resources/avatar/riccardodivirgilio1.png"; + avatarList << ":avatar/resources/avatar/rileyroxx.png"; + avatarList << ":avatar/resources/avatar/saidanddone.png"; + avatarList << ":avatar/resources/avatar/scottfeldstein.png"; + + int i; + for (i=0; i<20; i++) { + MyAvatarListItem *myItem = new MyAvatarListItem(listWidget); - myItem->setIcon(QIcon(QPixmap(":/guiv2/resources/guiv2/genereticAvatar.png").scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation))); - myItem->setMyLink(":/guiv2/resources/guiv2/genereticAvatar.png"); - myItem->setText("Avatar 1"); + myItem->setIcon(QIcon(QPixmap(avatarList.at(i)).scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation))); + myItem->setMyLink(avatarList.at(i)); + myItem->setText(QString("No. ")+QString::number(i+1,10)); listWidget->addItem(myItem); - - MyAvatarListItem *myItem1 = new MyAvatarListItem(listWidget); - myItem1->setIcon(QIcon(QPixmap(":/guiv2/resources/guiv2/dealerPuck.png").scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation))); - myItem1->setMyLink(":/guiv2/resources/guiv2/dealerPuck.png"); - myItem1->setText("Avatar 2"); - listWidget->addItem(myItem1); - - MyAvatarListItem *myItem2 = new MyAvatarListItem(listWidget); - myItem2->setIcon(QIcon(QPixmap(":/guiv2/resources/guiv2/playeraction_03.png").scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation))); - myItem2->setMyLink(":/guiv2/resources/guiv2/playeraction_03.png"); - myItem2->setText("Avatar 3"); - listWidget->addItem(myItem2); - - MyAvatarListItem *myItem3 = new MyAvatarListItem(listWidget); - myItem3->setIcon(QIcon(QPixmap(":/guiv2/resources/guiv2/playeraction_05.png").scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation))); - myItem3->setMyLink(":/guiv2/resources/guiv2/playeraction_05.png"); - myItem3->setText("Avatar 4"); - listWidget->addItem(myItem3); - - MyAvatarListItem *myItem4 = new MyAvatarListItem(listWidget); - myItem4->setIcon(QIcon(QPixmap(":/guiv2/resources/guiv2/playeraction_07.png").scaled(50,50,Qt::IgnoreAspectRatio,Qt::SmoothTransformation))); - myItem4->setMyLink(":/guiv2/resources/guiv2/playeraction_07.png"); - myItem4->setText("Avatar 5"); - listWidget->addItem(myItem4); - + } connect(groupBox, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBox1(bool))); connect(groupBox_2, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBox2(bool)));