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

Optimized layout of the SubFileItem.

Browse source 
Show the cancel button only when downloading or when used in CreateChannelMsg.
Hide empty message text.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-07-06 23:46:16 +00:00
parent a0e6bf7b2a
commit c62f642706
8 changed files with 318 additions and 369 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/gui/feeds/SubFileItem.cpp
View file

@ -77,6 +77,7 @@ SubFileItem::SubFileItem(const std::string &hash, const std::string &name, const
mMode = flags & SFI_MASK_STATE;
mType = flags & SFI_MASK_TYPE;
mFlag = flags & SFI_MASK_FLAG;
/**** Enable ****
*****/
@ -208,12 +209,12 @@ void SubFileItem::updateItemStatic()
{
case SFI_STATE_ERROR:
progressBar->setRange(0, 100);
progressBar->setFormat(tr("ERROR"));
progressBar->setFormat(tr("ERROR"));
playButton->setEnabled(false);
downloadButton->setEnabled(false);
cancelButton->setEnabled(false);
progressBar->setValue(0);
filename = "[" + tr("ERROR") + "] " + filename;
@ -227,7 +228,7 @@ void SubFileItem::updateItemStatic()
playButton->setEnabled(false);
downloadButton->setEnabled(false);
cancelButton->setEnabled(false);
cancelButton->setEnabled(false);
progressBar->setValue(0);
filename = "[" + tr("EXTRA") + "] " + filename;
@ -255,7 +256,7 @@ void SubFileItem::updateItemStatic()
case SFI_STATE_LOCAL:
playButton->setEnabled(true);
downloadButton->setEnabled(false);
cancelButton->setEnabled(true);
cancelButton->setEnabled(false);
progressBar->setValue(mFileSize / mDivisor);
filename = "[" + tr("LOCAL") + "] " + filename + " (" + misc::friendlyUnit(mFileSize) + ")";
@ -281,12 +282,15 @@ void SubFileItem::updateItemStatic()
if (mMode == SFI_STATE_LOCAL)
{
saveButton->setEnabled(true);
cancelButton->setEnabled(true); // channel files which are extra files are removed
}
else
{
saveButton->setEnabled(false);
}
if (mFlag & SFI_FLAG_CREATE) {
cancelButton->setEnabled(true); // channel files which are extra files are removed
cancelButton->setToolTip(tr("Remove Attachment"));
}
}
break;
case SFI_TYPE_ATTACH:
@ -294,17 +298,15 @@ void SubFileItem::updateItemStatic()
playButton->hide();
downloadButton->hide();
cancelButton->setEnabled(true);
cancelButton->setToolTip("Remove Attachment");
cancelButton->setToolTip(tr("Remove Attachment"));
}
break;
default:
break;
}
fileLabel->setText(filename);
fileLabel->setToolTip(filename);
}
void SubFileItem::updateItem()
@ -539,7 +541,7 @@ void SubFileItem::cancel()
mMode = SFI_STATE_ERROR;
/* Only occurs - if it is downloading */
if ((mType == SFI_TYPE_ATTACH) || (mType == SFI_TYPE_CHANNEL))
if (((mType == SFI_TYPE_ATTACH) || (mType == SFI_TYPE_CHANNEL)) && (mFlag & SFI_FLAG_CREATE))
{
hide();
rsFiles->ExtraFileRemove(FileHash(), RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_EXTRA);