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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Tushar Garg 2023-04-09 18:21:59 +05:30
commit c390af5844
13 changed files with 24 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/FileTransfer/TransferUserNotify.cpp
View file

@ -27,8 +27,6 @@ TransferUserNotify::TransferUserNotify(QObject *parent) :
UserNotify(parent)
{
newTransferCount = 0;
// connect(NotifyQt::getInstance(), SIGNAL(downloadCompleteCountChanged(int)), this, SLOT(downloadCountChanged(int)));
}
bool TransferUserNotify::hasSetting(QString *name, QString *group)

14
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View file

@ -1111,16 +1111,20 @@ void TransfersDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> eve
if(!fe)
return;
FileInfo nfo ;
if(!rsFiles->FileDetails(fe->mHash, RS_FILE_HINTS_DOWNLOAD, nfo))
return ;
switch (fe->mFileTransferEventCode)
{
case RsFileTransferEventCode::DOWNLOAD_COMPLETE:
{
FileInfo nfo ;
if(!rsFiles->FileDetails(fe->mHash, RS_FILE_HINTS_DOWNLOAD, nfo))
break;
SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
if (Settings->getNotifyFlags() & RS_POPUP_DOWNLOAD)
NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
}
[[fallthrough]];
case RsFileTransferEventCode::COMPLETED_FILES_REMOVED:
getUserNotify()->updateIcon();