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

Channels

Browse source 
- removed settings button 
 - deals with hashing of its own files
 
 subfileitem
 
 - absolved from file hashing responsibility 
 - added play button functionality(taken from transfer dialog, thanks)
 
 blog
  
  - removed file attachments feature (only for blogging ), will add pic support later
  
 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-05-08 16:21:57 +00:00
parent e1c4992680
commit c5e8669ec0
12 changed files with 97 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

43
retroshare-gui/src/gui/channels/CreateChannelMsg.cpp
View file

@ -250,7 +250,7 @@ void CreateChannelMsg::addAttachment(std::string hash, std::string fname, uint64
/* add widget in for new destination */
uint32_t flags = SFI_TYPE_ATTACH;
uint32_t flags = SFI_TYPE_CHANNEL;
if (local)
{
flags |= SFI_STATE_LOCAL;
@ -262,7 +262,7 @@ void CreateChannelMsg::addAttachment(std::string hash, std::string fname, uint64
return;
}
SubFileItem *file = new SubFileItem(hash, fname, size, flags, srcId);
SubFileItem *file = new SubFileItem(hash, fname, "", size, flags, srcId); // destroyed when fileFrame (this subfileitem) is destroyed
mAttachments.push_back(file);
QLayout *layout = fileFrame->layout();
@ -300,15 +300,17 @@ void CreateChannelMsg::addAttachment(std::string path)
std::cerr << "CreateChannelMsg::addAttachment()";
std::cerr << std::endl;
/* add to ExtraList here,
* use default TIMEOUT of 30 days (time to fetch it).
*/
//uint32_t period = 30 * 24 * 60 * 60;
//uint32_t flags = 0;
//rsFiles->ExtraFileHash(localpath, period, flags);
/* add widget in for new destination */
SubFileItem *file = new SubFileItem(path);
uint32_t flags = SFI_TYPE_CHANNEL | SFI_STATE_EXTRA;
// channels creates copy of file into channels directory and shares this
FileInfo fInfo;
rsChannels->channelExtraFileHash(path, mChannelId, fInfo);
// file is not innitial
SubFileItem *file = new SubFileItem(fInfo.hash, fInfo.fname, fInfo.path, fInfo.size,
flags, mChannelId); // destroyed when fileFrame (this subfileitem) is destroyed
mAttachments.push_back(file);
QLayout *layout = fileFrame->layout();
@ -335,9 +337,12 @@ void CreateChannelMsg::checkAttachmentReady()
{
if (!(*fit)->ready())
{
/*
/* ensure file is hashed or file will be hashed, thus
* recognized by librs but not correctly by gui (can't
* formally remove it)
*/
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
break;
@ -349,6 +354,7 @@ void CreateChannelMsg::checkAttachmentReady()
if (fit == mAttachments.end())
{
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(true);
}
/* repeat... */
@ -359,8 +365,16 @@ void CreateChannelMsg::checkAttachmentReady()
void CreateChannelMsg::cancelMsg()
{
std::cerr << "CreateChannelMsg::cancelMsg()";
std::cerr << "CreateChannelMsg::cancelMsg() :"
<< "Deleting EXTRA attachments" << std::endl;
std::cerr << std::endl;
std::list<SubFileItem* >::const_iterator it;
for(it = mAttachments.begin(); it != mAttachments.end(); it++)
rsChannels->channelExtraFileRemove((*it)->FileHash(), mChannelId);
close();
return;
}
@ -410,13 +424,14 @@ void CreateChannelMsg::sendMsg()
files.push_back(fi);
/* commence downloads - if we don't have the file */
if (!(*fit)->done())
{
if ((*fit)->ready())
{
(*fit)->download();
}
// Skips unhashed files.
// Skips unhashed files.
}
}
}
@ -435,7 +450,7 @@ void CreateChannelMsg::sendMessage(std::wstring subject, std::wstring msg, std::
tr("Please add a Subject"),
QMessageBox::Ok, QMessageBox::Ok);
return; //Don't add a empty Subject!!
return; //Don't add an empty Subject!!
}
else