Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 09:41:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modified the Id Gui to use new async call interface.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-06-07 17:11:57 +00:00
parent d29f158a66
commit bf4c250e51
4 changed files with 211 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

448
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -46,6 +46,11 @@
#define RSID_REQ_IDLIST 1
#define RSID_REQ_IDDETAILS 2
#define RSID_REQ_IDLISTDATA 3
#define RSID_REQ_IDEDIT 4
/** Constructor */ /** Constructor */
IdDialog::IdDialog(QWidget *parent) IdDialog::IdDialog(QWidget *parent)
: MainPage(parent) : MainPage(parent)
@ -71,14 +76,14 @@ IdDialog::IdDialog(QWidget *parent)
timer->start(1000); timer->start(1000);
rsIdentity->generateDummyData(); rsIdentity->generateDummyData();
mWaitingForRequest = false;
} }
void IdDialog::ListTypeToggled(bool checked) void IdDialog::ListTypeToggled(bool checked)
{ {
if (checked) if (checked)
{ {
insertIdList(); requestIdList();
} }
} }
@ -90,6 +95,18 @@ void IdDialog::updateSelection()
QTreeWidgetItem *item = ui.treeWidget_IdList->currentItem(); QTreeWidgetItem *item = ui.treeWidget_IdList->currentItem();
if (!item) if (!item)
{
blankSelection();
}
else
{
std::string id = item->text(RSID_COL_KEYID).toStdString();
requestIdDetails(id);
}
}
void IdDialog::blankSelection()
{ {
/* blank it all - and fix buttons */ /* blank it all - and fix buttons */
ui.lineEdit_Nickname->setText(""); ui.lineEdit_Nickname->setText("");
@ -104,11 +121,26 @@ void IdDialog::updateSelection()
ui.pushButton_EditId->setEnabled(false); ui.pushButton_EditId->setEnabled(false);
ui.pushButton_NewId->setEnabled(true); ui.pushButton_NewId->setEnabled(true);
} }
else
void IdDialog::requestIdDetails(std::string &id)
{
uint32_t token;
std::list<std::string> ids;
ids.push_back(id);
rsIdentity->requestIdentities(token, ids);
lockForRequest(token, RSID_REQ_IDDETAILS);
}
void IdDialog::insertIdDetails(uint32_t token)
{ {
/* get details from libretroshare */ /* get details from libretroshare */
RsIdData data; RsIdData data;
if (!rsIdentity->getIdentity(item->text(RSID_COL_KEYID).toStdString(), data)) if (!rsIdentity->getIdentity(token, data))
{ {
ui.lineEdit_KeyId->setText("ERROR GETTING KEY!"); ui.lineEdit_KeyId->setText("ERROR GETTING KEY!");
return; return;
@ -161,46 +193,6 @@ void IdDialog::updateSelection()
ui.pushButton_EditId->setEnabled(false); ui.pushButton_EditId->setEnabled(false);
} }
} }
}
#if 0
void IdDialog::notifySelection(PulseItem *item, int ptype)
{
std::cerr << "IdDialog::notifySelection() from : " << ptype << " " << item;
std::cerr << std::endl;
notifyPulseSelection(item);
switch(ptype)
{
default:
case PHOTO_ITEM_TYPE_ALBUM:
notifyAlbumSelection(item);
break;
case PHOTO_ITEM_TYPE_PHOTO:
notifyPhotoSelection(item);
break;
}
}
void IdDialog::notifyPulseSelection(PulseItem *item)
{
std::cerr << "IdDialog::notifyPulseSelection() from : " << item;
std::cerr << std::endl;
if (mPulseSelected)
{
std::cerr << "IdDialog::notifyPulseSelection() unselecting old one : " << mPulseSelected;
std::cerr << std::endl;
mPulseSelected->setSelected(false);
}
mPulseSelected = item;
}
#endif
void IdDialog::checkUpdate() void IdDialog::checkUpdate()
{ {
@ -208,16 +200,16 @@ void IdDialog::checkUpdate()
if (!rsIdentity) if (!rsIdentity)
return; return;
checkForRequest();
if (rsIdentity->updated()) if (rsIdentity->updated())
{ {
insertIdList(); requestIdList();
} }
return; return;
} }
/*************** New Photo Dialog ***************/
void IdDialog::OpenOrShowAddDialog() void IdDialog::OpenOrShowAddDialog()
{ {
if (!mEditDialog) if (!mEditDialog)
@ -251,97 +243,58 @@ void IdDialog::OpenOrShowEditDialog()
} }
std::string keyId = item->text(RSID_COL_KEYID).toStdString(); std::string keyId = item->text(RSID_COL_KEYID).toStdString();
mEditDialog->setupExistingId(keyId); requestIdEdit(keyId);
}
void IdDialog::requestIdEdit(std::string &id)
{
uint32_t token;
std::list<std::string> ids;
ids.push_back(id);
rsIdentity->requestIdentities(token, ids);
lockForRequest(token, RSID_REQ_IDEDIT);
}
void IdDialog::showIdEdit(uint32_t token)
{
if (mEditDialog)
{
mEditDialog->setupExistingId(token);
mEditDialog->show(); mEditDialog->show();
} }
bool IdDialog::matchesAlbumFilter(const RsPhotoAlbum &album)
{
return true;
}
double IdDialog::AlbumScore(const RsPhotoAlbum &album)
{
return 1;
}
bool IdDialog::matchesPhotoFilter(const RsPhotoPhoto &photo)
{
return true;
}
double IdDialog::PhotoScore(const RsPhotoPhoto &photo)
{
return 1;
}
bool IdDialog::FilterNSortAlbums(const std::list<std::string> &albumIds, std::list<std::string> &filteredAlbumIds, int count)
{
#if 0
std::multimap<double, std::string> sortedAlbums;
std::multimap<double, std::string>::iterator sit;
std::list<std::string>::const_iterator it;
for(it = albumIds.begin(); it != albumIds.end(); it++)
{
RsPhotoAlbum album;
rsPhoto->getAlbum(*it, album);
if (matchesAlbumFilter(album))
{
double score = AlbumScore(album);
sortedAlbums.insert(std::make_pair(score, *it));
}
}
int i;
for (sit = sortedAlbums.begin(), i = 0; (sit != sortedAlbums.end()) && (i < count); sit++, i++)
{
filteredAlbumIds.push_back(sit->second);
}
#endif
return true;
}
bool IdDialog::FilterNSortPhotos(const std::list<std::string> &photoIds, std::list<std::string> &filteredPhotoIds, int count)
{
#if 0
std::multimap<double, std::string> sortedPhotos;
std::multimap<double, std::string>::iterator sit;
std::list<std::string>::const_iterator it;
int i = 0;
for(it = photoIds.begin(); it != photoIds.end(); it++, i++)
{
RsPhotoPhoto photo;
rsPhoto->getPhoto(*it, photo);
if (matchesPhotoFilter(photo))
{
double score = i; //PhotoScore(album);
sortedPhotos.insert(std::make_pair(score, *it));
}
}
for (sit = sortedPhotos.begin(), i = 0; (sit != sortedPhotos.end()) && (i < count); sit++, i++)
{
filteredPhotoIds.push_back(sit->second);
}
#endif
return true;
} }
void IdDialog::insertIdList() void IdDialog::requestIdList()
{
uint32_t token;
rsIdentity->requestIdentityList(token);
lockForRequest(token, RSID_REQ_IDLIST);
}
void IdDialog::requestIdData(std::list<std::string> &ids)
{
uint32_t token;
rsIdentity->requestIdentities(token, ids);
lockForRequest(token, RSID_REQ_IDLISTDATA);
}
void IdDialog::insertIdList(uint32_t token)
{ {
QTreeWidget *tree = ui.treeWidget_IdList; QTreeWidget *tree = ui.treeWidget_IdList;
@ -356,15 +309,13 @@ void IdDialog::insertIdList()
bool acceptFriends = ui.radioButton_ListFriends->isChecked(); bool acceptFriends = ui.radioButton_ListFriends->isChecked();
bool acceptOthers = ui.radioButton_ListOthers->isChecked(); bool acceptOthers = ui.radioButton_ListOthers->isChecked();
rsIdentity->getIdentityList(ids); //rsIdentity->getIdentityList(ids);
for(it = ids.begin(); it != ids.end(); it++) //for(it = ids.begin(); it != ids.end(); it++)
{ //{
RsIdData data; RsIdData data;
if (!rsIdentity->getIdentity(*it, data)) while(rsIdentity->getIdentity(token, data))
{ {
continue;
}
/* do filtering */ /* do filtering */
bool ok = false; bool ok = false;
@ -430,202 +381,99 @@ void IdDialog::insertIdList()
void IdDialog::lockForRequest(uint32_t token, uint32_t reqtype)
void IdDialog::insertPhotosForSelectedAlbum()
{ {
#if 0
std::cerr << "IdDialog::insertPhotosForSelectedAlbum()";
std::cerr << std::endl;
clearPhotos(); /* store token for later results retrival */
if (mWaitingForRequest)
std::list<std::string> albumIds;
if (mAlbumSelected)
{ {
albumIds.push_back(mAlbumSelected->mDetails.mAlbumId); std::cerr << "IdDialog::lockForRequest() LOCKED ALREADY - BIG ERROR";
std::cerr << "IdDialog::insertPhotosForSelectedAlbum() AlbumId: " << mAlbumSelected->mDetails.mAlbumId;
std::cerr << std::endl; std::cerr << std::endl;
} }
insertPhotosForAlbum(albumIds); mWaitingForRequest = true;
#endif mRequestToken = token;
} mRequestType = reqtype;
std::cerr << "IdDialog::lockForRequest() Token: " << token << " ReqType: " << reqtype;
void IdDialog::addAlbum(const std::string &id)
{
#if 0
RsPhotoAlbum album;
rsPhoto->getAlbum(id, album);
RsPhotoThumbnail thumbnail;
rsPhoto->getAlbumThumbnail(id, thumbnail);
std::cerr << " IdDialog::addAlbum() AlbumId: " << album.mAlbumId << std::endl;
PulseItem *item = new PulseItem(this, album, thumbnail);
QLayout *alayout = ui.scrollAreaWidgetContents->layout();
alayout->addWidget(item);
#endif
}
void IdDialog::clearAlbums()
{
#if 0
std::cerr << "IdDialog::clearAlbums()" << std::endl;
std::list<PulseItem *> photoItems;
std::list<PulseItem *>::iterator pit;
QLayout *alayout = ui.scrollAreaWidgetContents->layout();
int count = alayout->count();
for(int i = 0; i < count; i++)
{
QLayoutItem *litem = alayout->itemAt(i);
if (!litem)
{
std::cerr << "IdDialog::clearAlbums() missing litem";
std::cerr << std::endl;
continue;
}
PulseItem *item = dynamic_cast<PulseItem *>(litem->widget());
if (item)
{
std::cerr << "IdDialog::clearAlbums() item: " << item;
std::cerr << std::endl; std::cerr << std::endl;
photoItems.push_back(item);
} }
else
void IdDialog::checkForRequest()
{ {
std::cerr << "IdDialog::clearAlbums() Found Child, which is not a PulseItem???";
if (mWaitingForRequest)
{
/* check token */
if (4 == rsIdentity->requestStatus(mRequestToken))
loadRequest();
}
}
void IdDialog::loadRequest()
{
if (!mWaitingForRequest)
{
std::cerr << "IdDialog::loadRequest() NOT LOCKED - BIG ERROR";
std::cerr << std::endl; std::cerr << std::endl;
} }
}
for(pit = photoItems.begin(); pit != photoItems.end(); pit++) /* unlock gui */
{ mWaitingForRequest = false;
PulseItem *item = *pit;
alayout->removeWidget(item);
delete item;
}
mAlbumSelected = NULL;
#endif
}
void IdDialog::clearPhotos()
{
#if 0
std::cerr << "IdDialog::clearPhotos()" << std::endl;
std::list<PulseItem *> photoItems; switch (mRequestType)
std::list<PulseItem *>::iterator pit;
QLayout *alayout = ui.scrollAreaWidgetContents_2->layout();
int count = alayout->count();
for(int i = 0; i < count; i++)
{ {
QLayoutItem *litem = alayout->itemAt(i); case RSID_REQ_IDLIST:
if (!litem)
{ {
std::cerr << "IdDialog::clearPhotos() missing litem"; std::cerr << "IdDialog::loadRequest() RSID_REQ_IDLIST";
std::cerr << std::endl; std::cerr << std::endl;
continue;
}
PulseItem *item = dynamic_cast<PulseItem *>(litem->widget());
if (item)
{
std::cerr << "IdDialog::clearPhotos() item: " << item;
std::cerr << std::endl;
photoItems.push_back(item);
}
else
{
std::cerr << "IdDialog::clearPhotos() Found Child, which is not a PulseItem???";
std::cerr << std::endl;
}
}
for(pit = photoItems.begin(); pit != photoItems.end(); pit++)
{
PulseItem *item = *pit;
alayout->removeWidget(item);
delete item;
}
mPhotoSelected = NULL;
#endif
}
void IdDialog::insertPhotosForAlbum(const std::list<std::string> &albumIds)
{
#if 0
/* clear it all */
clearPhotos();
//ui.photoLayout->clear();
/* create a list of albums */
std::list<std::string> ids; std::list<std::string> ids;
std::list<std::string> photoIds; rsIdentity->getIdentityList(mRequestToken, ids);
std::list<std::string> filteredPhotoIds;
std::list<std::string>::const_iterator it;
for(it = albumIds.begin(); it != albumIds.end(); it++) /* request data - straight away */
{
rsPhoto->getPhotoList(*it, photoIds); requestIdData(ids);
} }
break;
/* Filter Albums */ /* Sort Albums */ case RSID_REQ_IDLISTDATA:
#define MAX_PHOTOS 50
int count = MAX_PHOTOS;
FilterNSortPhotos(photoIds, filteredPhotoIds, MAX_PHOTOS);
for(it = filteredPhotoIds.begin(); it != filteredPhotoIds.end(); it++)
{ {
addPhoto(*it); std::cerr << "IdDialog::loadRequest() RSID_REQ_IDLISTDATA";
}
#endif
}
void IdDialog::addPhoto(const std::string &id)
{
#if 0
RsPhotoPhoto photo;
rsPhoto->getPhoto(id,photo);
RsPhotoThumbnail thumbnail;
rsPhoto->getPhotoThumbnail(id, thumbnail);
std::cerr << "IdDialog::addPhoto() AlbumId: " << photo.mAlbumId;
std::cerr << " PhotoId: " << photo.mId;
std::cerr << std::endl; std::cerr << std::endl;
insertIdList(mRequestToken);
PulseItem *item = new PulseItem(this, photo, thumbnail);
QLayout *alayout = ui.scrollAreaWidgetContents_2->layout();
alayout->addWidget(item);
#endif
} }
break;
#if 0 case RSID_REQ_IDDETAILS:
void IdDialog::deletePulseItem(PulseItem *item, uint32_t type)
{ {
std::cerr << "IdDialog::loadRequest() RSID_REQ_IDDETAILS";
std::cerr << std::endl;
insertIdDetails(mRequestToken);
}
break;
case RSID_REQ_IDEDIT:
{
std::cerr << "IdDialog::loadRequest() RSID_REQ_IDEDIT";
std::cerr << std::endl;
showIdEdit(mRequestToken);
}
break;
return; default:
break;
}
} }
#endif

36
retroshare-gui/src/gui/Identity/IdDialog.h
View File

@ -53,34 +53,26 @@ private slots:
private: private:
void insertIdList(); void blankSelection();
void requestIdDetails(std::string &id);
void insertIdDetails(uint32_t token);
/* TODO: These functions must be filled in for proper filtering to work void requestIdList();
* and tied to the GUI input void requestIdData(std::list<std::string> &ids);
*/ void insertIdList(uint32_t token);
bool matchesAlbumFilter(const RsPhotoAlbum &album); void requestIdEdit(std::string &id);
double AlbumScore(const RsPhotoAlbum &album); void showIdEdit(uint32_t token);
bool matchesPhotoFilter(const RsPhotoPhoto &photo);
double PhotoScore(const RsPhotoPhoto &photo);
/* Grunt work of setting up the GUI */ void lockForRequest(uint32_t token, uint32_t reqtype);
void checkForRequest();
bool FilterNSortAlbums(const std::list<std::string> &albumIds, std::list<std::string> &filteredAlbumIds, int count); void loadRequest();
bool FilterNSortPhotos(const std::list<std::string> &photoIds, std::list<std::string> &filteredPhotoIds, int count);
void insertAlbums();
void insertPhotosForAlbum(const std::list<std::string> &albumIds);
void insertPhotosForSelectedAlbum();
void addAlbum(const std::string &id);
void addPhoto(const std::string &id);
void clearAlbums();
void clearPhotos();
IdEditDialog *mEditDialog; IdEditDialog *mEditDialog;
//PulseItem *mPulseSelected; bool mWaitingForRequest;
uint32_t mRequestToken;
uint32_t mRequestType;
/* UI - from Designer */ /* UI - from Designer */
Ui::IdDialog ui; Ui::IdDialog ui;

5
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -98,15 +98,16 @@ void IdEditDialog::updateIdType(bool pseudo)
} }
void IdEditDialog::setupExistingId(std::string keyId) void IdEditDialog::setupExistingId(uint32_t token)
{ {
ui.checkBox_NewId->setChecked(false); ui.checkBox_NewId->setChecked(false);
ui.checkBox_NewId->setEnabled(false); ui.checkBox_NewId->setEnabled(false);
ui.radioButton_GpgId->setEnabled(false); ui.radioButton_GpgId->setEnabled(false);
ui.radioButton_Pseudo->setEnabled(false); ui.radioButton_Pseudo->setEnabled(false);
/* get details from libretroshare */
RsIdData data; RsIdData data;
if (!rsIdentity->getIdentity(keyId, data)) if (!rsIdentity->getIdentity(token, data))
{ {
ui.lineEdit_KeyId->setText("ERROR KEYID INVALID"); ui.lineEdit_KeyId->setText("ERROR KEYID INVALID");
ui.lineEdit_Nickname->setText(""); ui.lineEdit_Nickname->setText("");

4
retroshare-gui/src/gui/Identity/IdEditDialog.h
View File

@ -26,6 +26,8 @@
#include "ui_IdEditDialog.h" #include "ui_IdEditDialog.h"
#include <inttypes.h>
class IdEditDialog : public QWidget class IdEditDialog : public QWidget
{ {
Q_OBJECT Q_OBJECT
@ -34,7 +36,7 @@ public:
IdEditDialog(QWidget *parent = 0); IdEditDialog(QWidget *parent = 0);
void setupNewId(bool pseudo); void setupNewId(bool pseudo);
void setupExistingId(std::string keyId); void setupExistingId(uint32_t token);
private slots: private slots: