mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-30 19:34:31 -04:00
add file button to general message; add extra file sending from chat dialog; Add a link when sending a file; Add a link for downloading in the reciever chat dialog; Little gui improvement
Merge branch 'extraFile' git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e34173759e
commit
8e6f082025
8 changed files with 441 additions and 269 deletions
|
@ -482,6 +482,7 @@ void SubFileItem::updateItem()
|
|||
}
|
||||
|
||||
uint32_t repeat = 0;
|
||||
|
||||
switch (mMode)
|
||||
{
|
||||
case SFI_STATE_ERROR:
|
||||
|
@ -505,6 +506,7 @@ void SubFileItem::updateItem()
|
|||
|
||||
case SFI_STATE_LOCAL:
|
||||
repeat = 0;
|
||||
emit fileFinished(this);
|
||||
break;
|
||||
|
||||
case SFI_STATE_UPLOAD:
|
||||
|
@ -644,4 +646,6 @@ void SubFileItem::save()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
uint32_t SubFileItem::getState() {
|
||||
return mMode;
|
||||
}
|
||||
|
|
|
@ -63,6 +63,7 @@ public:
|
|||
|
||||
bool done();
|
||||
bool ready();
|
||||
uint32_t getState();
|
||||
|
||||
public slots:
|
||||
void download();
|
||||
|
@ -93,6 +94,10 @@ private:
|
|||
|
||||
/* for display purposes */
|
||||
float amountDone;
|
||||
|
||||
signals:
|
||||
void fileFinished(SubFileItem * subFileItem) const ;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue