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

Merge pull request #2106 from csoler/v0.6-BugFixing_2

Browse source 
[WIP] Continue fixing 0.6.6 bugs
This commit is contained in:
csoler 2020-11-15 20:04:20 +01:00 • committed by GitHub
commit 509f89cb59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 1548 additions and 1280 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@
#include "util/misc.h"
#include "util/QtVersion.h"
#include "util/RsFile.h"
#include "util/qtthreadsutils.h"
#include "retroshare/rsdisc.h"
#include "retroshare/rsfiles.h"
@ -1098,12 +1099,11 @@ TransfersDialog::TransfersDialog(QWidget *parent)
registerHelpButton(ui.helpButton,help_str,"TransfersDialog") ;
mEventHandlerId=0;
rsEvents->registerEventsHandler(
[this](std::shared_ptr<const RsEvent> event) { handleEvent(event); },
mEventHandlerId, RsEventType::FILE_TRANSFER );
// Do the GUI events in the GUI thread!
rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }) ;}, mEventHandlerId, RsEventType::FILE_TRANSFER );
}
void TransfersDialog::handleEvent(std::shared_ptr<const RsEvent> event)
void TransfersDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
{
if(event->mType != RsEventType::FILE_TRANSFER) return;
@ -1115,6 +1115,7 @@ void TransfersDialog::handleEvent(std::shared_ptr<const RsEvent> event)
{
case RsFileTransferEventCode::DOWNLOAD_COMPLETE:
case RsFileTransferEventCode::COMPLETED_FILES_REMOVED:
getUserNotify()->updateIcon();
default:
break;

2
retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
View file

@ -260,7 +260,7 @@ private:
bool controlTransferFile(uint32_t flags);
void changePriority(int priority);
void setChunkStrategy(FileChunksInfo::ChunkStrategy s) ;
void handleEvent(std::shared_ptr<const RsEvent> event);
void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
QTreeView *downloadList;