mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-09 07:02:41 -04:00
Commit of the new UDP Connection methods and
the rewrite of the retroshare core networking stack. This check-in commits the changes to the GUI code. Changes to use the new rspeers.h interface to the retroshare core. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c7ce92aba2
commit
c4e1d73837
22 changed files with 651 additions and 486 deletions
|
@ -22,12 +22,10 @@
|
|||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
|
||||
//#include "common/vmessagebox.h"
|
||||
//#include "rshare.h"
|
||||
|
||||
#include "GamesDialog.h"
|
||||
#include "rsiface/rsiface.h"
|
||||
#include "rsiface/rsgame.h"
|
||||
#include "rsiface/rspeers.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
@ -269,35 +267,30 @@ void GamesDialog::updateGameDetails()
|
|||
}
|
||||
if (detail.status == "Invite")
|
||||
{
|
||||
/* add all the online peers not listed above */
|
||||
rsiface->lockData(); /* Lock Interface */
|
||||
std::list<std::string> friends;
|
||||
std::list<std::string>::iterator fit;
|
||||
|
||||
rsPeers->getOnlineList(friends);
|
||||
|
||||
std::map<RsCertId,NeighbourInfo>::const_iterator fit;
|
||||
const std::map<RsCertId,NeighbourInfo> &friends =
|
||||
rsiface->getFriendMap();
|
||||
for(fit = friends.begin(); fit != friends.end(); fit++)
|
||||
{
|
||||
if (detail.gamers.end() != detail.gamers.find(fit->first))
|
||||
if (detail.gamers.end() != detail.gamers.find(*fit))
|
||||
{
|
||||
/* already present */
|
||||
continue;
|
||||
}
|
||||
|
||||
if (1)
|
||||
{
|
||||
/* not online */
|
||||
|
||||
}
|
||||
std::string name = rsPeers->getPeerName(*fit);
|
||||
|
||||
/* make a widget per friend */
|
||||
QTreeWidgetItem *item = new QTreeWidgetItem((QTreeWidget*)0);
|
||||
item -> setText(GAME_PEER_PLAYER, QString::fromStdString(fit->second.name));
|
||||
item -> setText(GAME_PEER_PLAYER, QString::fromStdString(name));
|
||||
item -> setText(GAME_PEER_INVITE, "No");
|
||||
item -> setText(GAME_PEER_INTEREST, "?");
|
||||
item -> setText(GAME_PEER_PLAY, "?");
|
||||
item -> setText(GAME_PEER_ID, QString::fromStdString(fit->first));
|
||||
item -> setText(GAME_PEER_ID, QString::fromStdString(*fit));
|
||||
|
||||
if ((oldSelect) && (oldId == fit->first))
|
||||
if ((oldSelect) && (oldId == *fit))
|
||||
{
|
||||
newSelect = item;
|
||||
}
|
||||
|
@ -305,9 +298,6 @@ void GamesDialog::updateGameDetails()
|
|||
/* add to the list */
|
||||
items.append(item);
|
||||
}
|
||||
|
||||
rsiface->unlockData(); /* UnLock Interface */
|
||||
|
||||
}
|
||||
|
||||
detailWidget->clear();
|
||||
|
@ -415,18 +405,14 @@ void GamesDialog::createGame()
|
|||
|
||||
if (addAll)
|
||||
{
|
||||
/* add all the online peers not listed above */
|
||||
rsiface->lockData(); /* Lock Interface */
|
||||
std::list<std::string> friends;
|
||||
std::list<std::string>::iterator fit;
|
||||
|
||||
std::map<RsCertId,NeighbourInfo>::const_iterator fit;
|
||||
const std::map<RsCertId,NeighbourInfo> &friends =
|
||||
rsiface->getFriendMap();
|
||||
rsPeers->getOnlineList(friends);
|
||||
for(fit = friends.begin(); fit != friends.end(); fit++)
|
||||
{
|
||||
rsGameLauncher -> invitePeer(gameId, fit->first);
|
||||
rsGameLauncher -> invitePeer(gameId, *fit);
|
||||
}
|
||||
|
||||
rsiface->unlockData(); /* UnLock Interface */
|
||||
}
|
||||
|
||||
/* call to the GameControl */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue