From 4fa6faf608fec8746c7bb41df47f5d6ee49cef00 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 3 Sep 2013 13:13:11 +0200 Subject: [PATCH] Hide quota and display explanation if no quota info is available. --- src/mirall/accountsettings.cpp | 26 +++++++++++++++++--------- src/mirall/accountsettings.ui | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index bce12fc6dd..cb642271a7 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -671,15 +671,23 @@ void AccountSettings::slotHideProgress() void AccountSettings::slotUpdateQuota(qint64 total, qint64 used) { - ui->quotaProgressBar->setEnabled(true); - // workaround the label only accepting ints (which may be only 32 bit wide) - ui->quotaProgressBar->setMaximum(100); - int qVal = qRound(used/(double)total * 100); - if( qVal > 100 ) qVal = 100; - ui->quotaProgressBar->setValue(qVal); - QString usedStr = Utility::octetsToString(used); - QString totalStr = Utility::octetsToString(total); - ui->quotaLabel->setText(tr("%1 of %2 in use.").arg(usedStr, totalStr)); + if( total > 0 ) { + ui->quotaProgressBar->setVisible(true); + ui->quotaInfoLabel->setVisible(true); + ui->quotaProgressBar->setEnabled(true); + // workaround the label only accepting ints (which may be only 32 bit wide) + ui->quotaProgressBar->setMaximum(100); + int qVal = qRound(used/(double)total * 100); + if( qVal > 100 ) qVal = 100; + ui->quotaProgressBar->setValue(qVal); + QString usedStr = Utility::octetsToString(used); + QString totalStr = Utility::octetsToString(total); + ui->quotaLabel->setText(tr("%1 of %2 in use.").arg(usedStr, totalStr)); + } else { + ui->quotaProgressBar->setVisible(false); + ui->quotaInfoLabel->setVisible(false); + ui->quotaLabel->setText(tr("Currently there is no storage usage information available.")); + } } void AccountSettings::slotIgnoreFilesEditor() diff --git a/src/mirall/accountsettings.ui b/src/mirall/accountsettings.ui index f8eafda2d8..c6068877c9 100644 --- a/src/mirall/accountsettings.ui +++ b/src/mirall/accountsettings.ui @@ -131,7 +131,7 @@ - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.