From baad95427ffa0db5fd7c548f16da5dc93d3b6cda Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 3 Jun 2007 12:54:10 +0000 Subject: [PATCH] avatargallery ... --- pokerth.pro | 2 + src/gui/qt/mainwindow/mainwindowimpl.cpp | 2 +- .../selectavatardialog/myavatarlistitem.cpp | 27 ++++++++++++++ .../selectavatardialog/myavatarlistitem.h | 37 +++++++++++++++++++ .../selectavatardialogimpl.cpp | 26 +++++++++---- .../selectavatardialogimpl.h | 4 +- .../qt/settingsdialog/settingsdialogimpl.cpp | 9 ++++- 7 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp create mode 100644 src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h diff --git a/pokerth.pro b/pokerth.pro index 4a5d3291..011ce180 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -130,6 +130,7 @@ HEADERS += src/game.h \ src/gui/qt/newlocalgamedialog/newgamedialogimpl.h \ src/gui/qt/settingsdialog/settingsdialogimpl.h \ src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h \ + src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \ src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h \ src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.h \ @@ -223,6 +224,7 @@ SOURCES += src/game.cpp \ src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp \ src/gui/qt/settingsdialog/settingsdialogimpl.cpp \ src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp \ + src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \ src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp \ src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp \ diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index ef83b0dd..24744924 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -1924,7 +1924,7 @@ void mainWindowImpl::postRiverRunAnimation3() { // groupBoxArray[i]->setPalette(tempPalette); actionLabelArray[i]->setPixmap(QPixmap(":/actions/resources/graphics/actions/action_winner.png")); - //nicht gewonnene Karten ausblenden + //show winnercards if more than one player is active if ( currentHand->getActivePlayersCounter() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) { int j; diff --git a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp new file mode 100644 index 00000000..095c0204 --- /dev/null +++ b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp @@ -0,0 +1,27 @@ +// +// C++ Implementation: mycardspixmaplabel +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include "myavatarlistitem.h" + + +using namespace std; + +MyAvatarListItem::MyAvatarListItem(QListWidget* parent) + : QListWidgetItem(parent, QListWidgetItem::UserType) +{ + +} + + +MyAvatarListItem::~MyAvatarListItem() +{ +} + diff --git a/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h new file mode 100644 index 00000000..893076c8 --- /dev/null +++ b/src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h @@ -0,0 +1,37 @@ +// +// C++ Interface: mycardspixmaplabel +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#ifndef MYAVATARLISTITEM_H +#define MYAVATARLISTITEM_H + +#include +#include + +#include + +class MyAvatarListItem : public QListWidgetItem +{ +public: + MyAvatarListItem(QListWidget*); + + ~MyAvatarListItem(); + + void setMyLink(QString theValue){ myLink = theValue;} + QString getMyLink() const{ return myLink;} + + + +private: + + QString myLink; +}; + +#endif diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp index cd42e056..6e59bc57 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "selectavatardialogimpl.h" +#include "myavatarlistitem.h" #include "configfile.h" #include @@ -40,13 +41,7 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c) listWidget->setDragEnabled(FALSE); listWidget->setResizeMode(QListView::Adjust); - int i; - for (i=0; i<30; i++) { - QListWidgetItem *myItem = new QListWidgetItem; - myItem->setIcon(QIcon(QPixmap(":/guiv2/resources/guiv2/genereticAvatar.png"))); - listWidget->addItem(myItem); - }; - + QObject::connect(groupBox, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBox1(bool))); QObject::connect(groupBox_2, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBox2(bool))); @@ -54,6 +49,18 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c) void selectAvatarDialogImpl::exec() { + int i; + for (i=0; i<30; i++) { + MyAvatarListItem *myItem = new MyAvatarListItem(listWidget); + myItem->setIcon(QIcon(QPixmap(":/guiv2/resources/guiv2/genereticAvatar.png"))); + myItem->setMyLink(":/guiv2/resources/guiv2/genereticAvatar.png"); + myItem->setText("PokerTH"); + listWidget->addItem(myItem); + }; + + //clear + lineEdit->setText(""); + QDialog::exec(); } @@ -61,3 +68,8 @@ void selectAvatarDialogImpl::toggleGroupBox1(bool toogleState) { if(groupBox->is void selectAvatarDialogImpl::toggleGroupBox2(bool toogleState) { if(groupBox_2->isChecked()) groupBox->setChecked(FALSE); } +QString selectAvatarDialogImpl::getAvatarLink() { + + if(groupBox->isChecked()) return static_cast(listWidget->currentItem())->getMyLink(); + else return lineEdit->text(); +} diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h index 1121e5e9..1ad06e7b 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h @@ -39,13 +39,13 @@ public: public slots: void toggleGroupBox1(bool); void toggleGroupBox2(bool); - + + QString getAvatarLink(); private: ConfigFile* myConfig; - }; #endif diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 50ad6e10..ab6f2f08 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "settingsdialogimpl.h" +#include "myavatarlistitem.h" #include "configfile.h" #include @@ -289,12 +290,18 @@ void settingsDialogImpl::setFlipsidePicFileName() void settingsDialogImpl::setAvatarFile0() { + callSelectAvatarDialog(); + if(mySelectAvatarDialogImpl->result() == QDialog::Accepted ) { + + lineEdit_humanPlayerAvatar->setText(mySelectAvatarDialogImpl->getAvatarLink()); + } +/* QString fileName = QFileDialog::getOpenFileName(this, tr("Select your avatar picture"), QDir::homePath(), tr("Images (*.png)")); if (!fileName.isEmpty()) - lineEdit_humanPlayerAvatar->setText(fileName); + lineEdit_humanPlayerAvatar->setText(fileName);*/ } void settingsDialogImpl::setAvatarFile1() {