mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-28 01:53:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename signal from folderProgress to itemProgress.

Browse source
This commit is contained in:
Klaas Freitag 2013-07-23 12:23:20 +02:00
parent 47f151c594
commit 85d810d2cf
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mirall/progressdispatcher.cpp
View file

@ -15,6 +15,7 @@
#include <QObject> #include <QObject>
#include <QMetaType> #include <QMetaType>
#include <QDebug>
namespace Mirall { namespace Mirall {
@ -27,28 +28,28 @@ QString Progress::asString( Kind kind )
switch(kind) { switch(kind) {
case Download: case Download:
re = QObject::tr("Download"); re = QObject::tr("downloading");
break; break;
case Upload: case Upload:
re = QObject::tr("Upload"); re = QObject::tr("uploading");
break; break;
case Context: case Context:
re = QObject::tr("Context"); re = QObject::tr("Context");
break; break;
case Inactive: case Inactive:
re = QObject::tr("Inactive"); re = QObject::tr("inactive");
break; break;
case StartDownload: case StartDownload:
re = QObject::tr("Start download"); re = QObject::tr("downloading");
break; break;
case StartUpload: case StartUpload:
re = QObject::tr("Start upload"); re = QObject::tr("uploading");
break; break;
case EndDownload: case EndDownload:
re = QObject::tr("End download"); re = QObject::tr("downloading");
break; break;
case EndUpload: case EndUpload:
re = QObject::tr("End upload"); re = QObject::tr("uploading");
break; break;
default: default:
re = QObject::tr("What do I know?"); re = QObject::tr("What do I know?");
@ -74,10 +75,9 @@ ProgressDispatcher::~ProgressDispatcher()
} }
void ProgressDispatcher::setFolderProgress( Progress::Kind kind, const QString& alias, const QString& file, long p1, long p2) void ProgressDispatcher::setFolderProgress( Progress::Kind kind, const QString& folder, const QString& file, long p1, long p2)
{ {
emit itemProgress( kind, folder, file, p1, p2 );
emit folderProgress( kind, alias, file, p1, p2 );
} }
void ProgressDispatcher::setOverallProgress( const QString& folder, const QString& file, int fileNo, int fileCnt, void ProgressDispatcher::setOverallProgress( const QString& folder, const QString& file, int fileNo, int fileCnt,

4
src/mirall/progressdispatcher.h
View file

@ -48,11 +48,11 @@ public:
~ProgressDispatcher(); ~ProgressDispatcher();
public: public:
void setFolderProgress( Progress::Kind, const QString&, const QString&, long, long ); void setFolderProgress(Progress::Kind, const QString&, const QString&, long, long );
void setOverallProgress(const QString&, const QString&, int, int, qlonglong, qlonglong); void setOverallProgress(const QString&, const QString&, int, int, qlonglong, qlonglong);
signals: signals:
void folderProgress( Progress::Kind, const QString&, const QString&, long, long ); void itemProgress( Progress::Kind, const QString&, const QString&, long, long );
void overallProgress(const QString&, const QString&, int, int, qlonglong, qlonglong ); void overallProgress(const QString&, const QString&, int, int, qlonglong, qlonglong );
public slots: public slots:

2
src/mirall/settingsdialog.cpp
View file

@ -70,7 +70,7 @@ SettingsDialog::SettingsDialog(Application *app, QWidget *parent) :
connect( _accountSettings, SIGNAL(openFolderAlias(const QString&)), connect( _accountSettings, SIGNAL(openFolderAlias(const QString&)),
app, SLOT(slotFolderOpenAction(QString))); app, SLOT(slotFolderOpenAction(QString)));
connect( ProgressDispatcher::instance(), SIGNAL(folderProgress(Progress::Kind, QString,QString,long,long)), connect( ProgressDispatcher::instance(), SIGNAL(itemProgress(Progress::Kind, QString,QString,long,long)),
_accountSettings, SLOT(slotSetProgress(Progress::Kind, QString,QString,long,long))); _accountSettings, SLOT(slotSetProgress(Progress::Kind, QString,QString,long,long)));
connect( ProgressDispatcher::instance(), SIGNAL(overallProgress(QString,QString, int,int,qlonglong,qlonglong)), connect( ProgressDispatcher::instance(), SIGNAL(overallProgress(QString,QString, int,int,qlonglong,qlonglong)),
_accountSettings, SLOT(slotSetOverallProgress( const QString&, const QString&, int, int, qlonglong , qlonglong ))); _accountSettings, SLOT(slotSetOverallProgress( const QString&, const QString&, int, int, qlonglong , qlonglong )));