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

Improvements to make more complete Feed System Demo.

Browse source 
* Major Work on SubFileItem to display possible attachment/file states.
 * Added Download / Save buttons to SubFileItem.
 * Enabled Correct Name / Transfer state display in SubFileItem.
 * Disabled 'Local' Checks temporarily in SubFileItem.  (for demo)
 * Disabled 'Remote' Drops temporarily in GeneralMsgDialog. (for demo)
 * Added File Details to TransferFeed.
 * Add 'Online' List to PeersFeed.
 * extended Msg Attachments to handle local/remote, and check for attachment errors.
 * enabled Attachment removal.
 * Updated RS Interface files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@637 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-07-06 16:03:16 +00:00
parent 9629c6923c
commit 2ba752fbfb
13 changed files with 664 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

79
retroshare-gui/src/gui/GeneralMsgDialog.cpp
View file

@ -36,7 +36,7 @@
/** Constructor */
GeneralMsgDialog::GeneralMsgDialog(QWidget *parent, uint32_t type)
: QDialog (parent)
: QDialog (parent), mCheckAttachment(true)
{
/* Invoke the Qt Designer generated object setup routine */
setupUi(this);
@ -234,12 +234,12 @@ void GeneralMsgDialog::parseRsFileListAttachments(std::string attachList)
std::cerr << "Item Ok" << std::endl;
if (source == "Local")
{
addAttachment(hash, fname, size);
addAttachment(hash, fname, size, true, "");
}
else
{
// TEMP NOT ALLOWED UNTIL FT WORKING.
//addAttachment(hash, fname, size);
addAttachment(hash, fname, size, false, source);
}
}
@ -252,21 +252,38 @@ void GeneralMsgDialog::parseRsFileListAttachments(std::string attachList)
}
void GeneralMsgDialog::addAttachment(std::string hash, std::string fname, uint64_t size)
void GeneralMsgDialog::addAttachment(std::string hash, std::string fname, uint64_t size, bool local, std::string srcId)
{
/* add a SubFileItem to the attachment section */
std::cerr << "GeneralMsgDialog::addAttachment()";
std::cerr << std::endl;
/* add widget in for new destination */
SubFileItem *file = new SubFileItem(hash, fname, size);
uint32_t flags = SFI_TYPE_ATTACH;
if (local)
{
flags |= SFI_STATE_LOCAL;
}
else
{
flags |= SFI_STATE_REMOTE;
// TMP REMOVED REMOTE ADD FOR DEMONSTRATOR
return;
}
SubFileItem *file = new SubFileItem(hash, fname, size, flags, srcId);
mAttachments.push_back(file);
QLayout *layout = fileFrame->layout();
layout->addWidget(file);
return;
if (mCheckAttachment)
{
checkAttachmentReady();
}
return;
}
@ -277,16 +294,54 @@ void GeneralMsgDialog::addAttachment(std::string path)
std::cerr << std::endl;
/* add widget in for new destination */
SubFileItem *file = new SubFileItem("unknownHash", path, 12000);
SubFileItem *file = new SubFileItem(path);
mAttachments.push_back(file);
QLayout *layout = fileFrame->layout();
layout->addWidget(file);
if (mCheckAttachment)
{
checkAttachmentReady();
}
return;
}
void GeneralMsgDialog::checkAttachmentReady()
{
std::list<SubFileItem *>::iterator fit;
mCheckAttachment = false;
for(fit = mAttachments.begin(); fit != mAttachments.end(); fit++)
{
if (!(*fit)->isHidden())
{
if (!(*fit)->ready())
{
/*
*/
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
break;
return;
}
}
}
if (fit == mAttachments.end())
{
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
}
/* repeat... */
int msec_rate = 1000;
QTimer::singleShot( msec_rate, this, SLOT(checkAttachmentReady(void)));
}
void GeneralMsgDialog::cancelMsg()
{
@ -475,6 +530,16 @@ void GeneralMsgDialog::sendMsg()
fi.size = (*fit)->FileSize();
files.push_back(fi);
/* commence downloads - if we don't have the file */
if (!(*fit)->done())
{
if ((*fit)->ready())
{
(*fit)->download();
}
// Skips unhashed files.
}
}
}