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

Merge branch 'master' into extra1

Browse source
This commit is contained in:
Pooh 2020-09-05 09:59:49 +03:00 • committed by GitHub
commit 22337c050a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
116 changed files with 1269 additions and 1115 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
#pragma once
#include "RsAutoUpdatePage.h"
#include <retroshare-gui/RsAutoUpdatePage.h>
#include "ui_BannedFilesDialog.h"
class BannedFilesDialog: public QDialog

3
retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.h
View file

@ -24,7 +24,8 @@
#include <QWidget>
#include <QPainter>
#include <QBitmap>
#include "RsAutoUpdatePage.h"
#include <retroshare-gui/RsAutoUpdatePage.h>
#include <retroshare/rstypes.h>
struct FileChunksInfo ;

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

@ -23,7 +23,7 @@
#include <retroshare/rstypes.h>
#include "ui_SearchDialog.h"
#include "mainpage.h"
#include <retroshare-gui/mainpage.h>
class AdvancedSearchDialog;
class RSTreeWidgetItemCompareRole;

1361
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
View file

File diff suppressed because it is too large Load diff

6
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h
View file

@ -23,7 +23,7 @@
#include "ui_SharedFilesDialog.h"
#include "RsAutoUpdatePage.h"
#include <retroshare-gui/RsAutoUpdatePage.h>
#include "gui/RetroShareLink.h"
#include "util/RsProtectedTimer.h"
@ -38,10 +38,10 @@ class SharedFilesDialog : public RsAutoUpdatePage
public:
/** Default Constructor */
SharedFilesDialog(RetroshareDirModel *tree_model,RetroshareDirModel *flat_model,QWidget *parent = 0);
SharedFilesDialog(bool remote_mode,QWidget *parent = 0);
/** Default Destructor */
~SharedFilesDialog() {}
~SharedFilesDialog() ;
virtual void hideEvent(QHideEvent *) ;
virtual void showEvent(QShowEvent *) ;

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

@ -25,7 +25,7 @@
#include <retroshare/rstypes.h>
#include <retroshare/rsevents.h>
#include "RsAutoUpdatePage.h"
#include <retroshare-gui/RsAutoUpdatePage.h>
#include "ui_TransfersDialog.h"