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

Seperated the systray estimation text to a seperate action, fixed an integer rounding bug

Browse source
This commit is contained in:
Eran 2014-04-29 02:31:27 +03:00
parent cd22a1846f
commit a892b79dba
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mirall/owncloudgui.cpp
View file

@ -286,6 +286,7 @@ void ownCloudGui::setupContextMenu()
_contextMenu->addAction(_actionQuota);
_contextMenu->addSeparator();
_contextMenu->addAction(_actionStatus);
_contextMenu->addAction(_actionEstimate);
_contextMenu->addMenu(_recentActionsMenu);
_contextMenu->addSeparator();
}
@ -352,6 +353,8 @@ void ownCloudGui::setupActions()
_actionQuota->setEnabled( false );
_actionStatus = new QAction(tr("Unknown status"), this);
_actionStatus->setEnabled( false );
_actionEstimate = new QAction(tr("Calculating ETA ..."), this);
_actionEstimate->setEnabled( false );
_actionSettings = new QAction(tr("Settings..."), this);
_actionRecent = new QAction(tr("Details..."), this);
_actionRecent->setEnabled( true );
@ -408,11 +411,13 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info
QString s1 = Utility::octetsToString( completedSize );
QString s2 = Utility::octetsToString( progress._totalSize );
_actionStatus->setText( tr("Syncing %1 of %2 (%3 of %4) \nETA : %5 , %6/s")
.arg(currentFile).arg(progress._totalFileCount).arg(s1, s2)
.arg( Utility::timeConversion(progress.totalEstimate().getEtaEstimate()),
_actionStatus->setText( tr("Syncing %1 of %2 (%3 of %4)")
.arg(currentFile).arg(progress._totalFileCount).arg(s1, s2));
_actionEstimate->setVisible(true);
_actionEstimate->setText( tr("ETA : %5 , %6/s").arg( Utility::timeConversion(progress.totalEstimate().getEtaEstimate()),
Utility::octetsToString(progress.totalEstimate().getEstimatedBandwidth())) );
_actionRecent->setIcon( QIcon() ); // Fixme: Set a "in-progress"-item eventually.
if (!progress._lastCompletedItem.isEmpty()) {
@ -453,6 +458,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const Progress::Info
void ownCloudGui::slotDisplayIdle()
{
_actionStatus->setText(tr("Up to date"));
_actionEstimate->setVisible(false);
}
void ownCloudGui::slotShowGuiMessage(const QString &title, const QString &message)

1
src/mirall/owncloudgui.h
View file

@ -92,6 +92,7 @@ private:
QAction *_actionSettings;
QAction *_actionQuota;
QAction *_actionStatus;
QAction *_actionEstimate;
QAction *_actionRecent;
QAction *_actionHelp;
QAction *_actionQuit;

5
src/mirall/progressdispatcher.h
View file

@ -69,11 +69,12 @@ namespace Progress
void updateTime(quint64 completed, quint64 total) {
if(total != 0 && completed != 0) {
quint64 elapsedTime = QDateTime::currentMSecsSinceEpoch() - this->_startedTime ;
// (elapsedTime-1) to avoid float "rounding" issue (ie. 0.99999999999999999999....)
_agvEtaMSecs = _agvEtaMSecs - (_agvEtaMSecs / AVG_DIVIDER) + ( ((total / completed) * elapsedTime) - (elapsedTime-1) );
// (elapsedTime-1) is an hack to avoid float "rounding" issue (ie. 0.99999999999999999999....)
_agvEtaMSecs = _agvEtaMSecs + (((static_cast<float>(total) / completed) * elapsedTime) - (elapsedTime-1)) - this->getEtaEstimate();
_effectivProgressPerSec = ( total - completed ) / (1+this->getEtaEstimate()/1000);
}
}
/**
* Get the eta estimate in milliseconds
* @return quint64 the estimate amount of milliseconds to end the process.