diff --git a/src/gui/generic/serverguiwrapper.cpp b/src/gui/generic/serverguiwrapper.cpp index ba8c7601..8d784707 100644 --- a/src/gui/generic/serverguiwrapper.cpp +++ b/src/gui/generic/serverguiwrapper.cpp @@ -62,6 +62,8 @@ void ServerGuiWrapper::refreshPlayerName() const {} void ServerGuiWrapper::refreshButton() const {} void ServerGuiWrapper::refreshGameLabels(GameState /*state*/) const {} +void ServerGuiWrapper::setPlayerAvatar(int /*myUniqueID*/, const std::string &/*myAvatar*/) const {}; + void ServerGuiWrapper::waitForGuiUpdateDone() const {} void ServerGuiWrapper::dealBeRoCards(int /*myBeRoID*/) {} diff --git a/src/gui/generic/serverguiwrapper.h b/src/gui/generic/serverguiwrapper.h index ae4a0ee9..8e2ac7bf 100644 --- a/src/gui/generic/serverguiwrapper.h +++ b/src/gui/generic/serverguiwrapper.h @@ -46,6 +46,8 @@ public: void refreshButton() const; void refreshGameLabels(GameState state) const; + void setPlayerAvatar(int myUniqueID, const std::string &myAvatar) const; + void waitForGuiUpdateDone() const; void dealBeRoCards(int); diff --git a/src/gui/guiinterface.h b/src/gui/guiinterface.h index ee6162ac..7ac4193c 100644 --- a/src/gui/guiinterface.h +++ b/src/gui/guiinterface.h @@ -51,6 +51,8 @@ public: virtual void refreshPlayerName() const=0; virtual void refreshButton() const =0; virtual void refreshGameLabels(GameState state) const=0; + + virtual void setPlayerAvatar(int myUniqueID, const std::string &myAvatar) const=0; virtual void waitForGuiUpdateDone() const=0; diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 40719e18..ea1fc021 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -406,34 +406,11 @@ void gameLobbyDialogImpl::clearDialog() myPlayerId = 0; hideShowGameDescription(FALSE); -/* - QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_GameList, 0); - item->setData(0, Qt::DisplayRole, "lololol"); - QTreeWidgetItem *item1 = new QTreeWidgetItem(treeWidget_GameList, 0); - item1->setData(0, Qt::DisplayRole, "lololol"); - QTreeWidgetItem *item2 = new QTreeWidgetItem(treeWidget_GameList, 0); - item2->setData(0, Qt::DisplayRole, "lololol"); - QTreeWidgetItem *item3 = new QTreeWidgetItem(treeWidget_GameList, 0); - item3->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item4 = new QTreeWidgetItem(treeWidget_GameList, 0); - item4->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item5 = new QTreeWidgetItem(treeWidget_GameList, 0); - item5->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item6 = new QTreeWidgetItem(treeWidget_GameList, 0); - item6->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item7 = new QTreeWidgetItem(treeWidget_GameList, 0); - item7->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item8 = new QTreeWidgetItem(treeWidget_GameList, 0); - item8->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item9 = new QTreeWidgetItem(treeWidget_GameList, 0); - item9->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item10 = new QTreeWidgetItem(treeWidget_GameList, 0); - item10->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item11 = new QTreeWidgetItem(treeWidget_GameList, 0); - item11->setData(0, Qt::DisplayRole, "lololol"); -QTreeWidgetItem *item12 = new QTreeWidgetItem(treeWidget_GameList, 0); - item12->setData(0, Qt::DisplayRole, "lololol");*/ + label_nickListCounter->setText("| "+tr("players in chat: %1").arg(0)); + label_connectedPlayersCounter->setText(tr("connected players: %1").arg(0)); + label_openGamesCounter->setText("| "+tr("running games: %1").arg(0)); + label_runningGamesCounter->setText("| "+tr("open games: %1").arg(0)); } void gameLobbyDialogImpl::checkPlayerQuantity() { diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index 0bbd9c16..d81e513a 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -58,6 +58,9 @@ void GuiWrapper::refreshPlayerName() const { myW->signalRefreshPlayerName(); } void GuiWrapper::refreshButton() const { myW->signalRefreshButton(); } void GuiWrapper::refreshGameLabels(GameState state) const { myW->signalRefreshGameLabels(state); } +void GuiWrapper::setPlayerAvatar(int myUniqueID, const std::string &myAvatar) const { myW->signalSetPlayerAvatar(myUniqueID, QString::fromUtf8(myAvatar.c_str())); } + + void GuiWrapper::waitForGuiUpdateDone() const { myW->signalGuiUpdateDone(); diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 1bac3397..c6a867f6 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -53,6 +53,8 @@ public: void refreshButton() const; void refreshGameLabels(GameState state) const; + void setPlayerAvatar(int myUniqueID, const std::string &myAvatar) const; + void waitForGuiUpdateDone() const; void dealBeRoCards(int myBeRoID); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index d89da7c0..982d98f9 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -543,6 +543,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) connect(this, SIGNAL(signalRefreshPlayerName()), this, SLOT(refreshPlayerName())); connect(this, SIGNAL(signalRefreshButton()), this, SLOT(refreshButton())); connect(this, SIGNAL(signalRefreshGameLabels(int)), this, SLOT(refreshGameLabels(int))); + connect(this, SIGNAL(signalSetPlayerAvatar(int, QString)), this, SLOT(setPlayerAvatar(int, QString))); connect(this, SIGNAL(signalGuiUpdateDone()), this, SLOT(guiUpdateDone())); @@ -1208,6 +1209,24 @@ void mainWindowImpl::refreshPlayerAvatar() { } +void mainWindowImpl::setPlayerAvatar(int myID, QString myAvatar) { + + if(mySession->getCurrentGame()) { + + boost::shared_ptr tmpPlayer = mySession->getCurrentGame()->getPlayerByUniqueId(myID); + if (tmpPlayer.get()) { + + if(QFile::QFile(myAvatar).exists()) { + playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(myAvatar); + } + else { + playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(QPixmap(myAppDataPath +"gfx/gui/table/default/genereticAvatar.png")); + } + } + } +} + + void mainWindowImpl::refreshAction(int playerID, int playerAction) { QPixmap onePix(myAppDataPath +"gfx/gui/misc/1px.png"); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 4c3d77d6..cde2b248 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -88,6 +88,8 @@ signals: void signalRefreshButton(); void signalRefreshGameLabels(int); + void signalSetPlayerAvatar(int, QString); + void signalGuiUpdateDone(); void signalMeInAction(); @@ -174,6 +176,7 @@ public slots: void refreshGameLabels(int); void refreshButton(); void refreshPlayerAvatar(); + void setPlayerAvatar(int myID, QString myAvatar); void guiUpdateDone(); void waitForGuiUpdateDone();