[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-36-g861e8ea
Pino Toscano
pino-guest at alioth.debian.org
Sat Apr 4 15:57:22 UTC 2009
The following commit has been merged in the master branch:
commit 861e8ea2c7693237011d28605151539179a7f520
Merge: fd50799c56437c4dfdc4ea2fb21bf0f016c3f6e7 25e0ba2dfa323ae97ea411a75d101867fc74ce7c
Author: Pino Toscano <pino at kde.org>
Date: Sat Apr 4 17:56:39 2009 +0200
Merge branch 'master' of ssh://pino-guest@git.debian.org/git/pkg-kde/kaboom
diff --combined choicepage.cpp
index deb4e08,a59d459..77c10e5
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@@ -18,6 -18,7 +18,7 @@@
*/
#include "choicepage.h"
#include "diroperations/diroperations.h"
+ #include "diroperations/recursivedirjob.h"
#include "richradiobutton.h"
#include "diroperations/progresswidget.h"
#include "kaboomsettings.h"
@@@ -250,12 -251,14 +251,14 @@@ void ChoicePage::checkSpaceForBackup(
quint64 dirsize = -1;
quint64 freespace = DirOperations::freeDirSpace(QDir::homePath());
- try {
- dirsize = DirOperations::calculateDirSize(
- KaboomSettings::instance().kdehomeDir().canonicalPath(),
- d->progresswidget
- );
- } catch (const DirOperations::Exception&) {}
+ {
+ RecursiveDirJob *job = RecursiveDirJob::calculateDirSize(
+ KaboomSettings::instance().kdehomeDir().canonicalPath()
+ );
+ job->synchronousRun(d->progresswidget);
+ dirsize = qvariant_cast<quint64>(job->result());
+ delete job;
+ }
if(dirsize > freespace)
{
@@@ -266,12 -269,12 +269,12 @@@
tr("<p><i>The current KDE 3 settings and data directory takes up %1</i></p>")
.arg(DirOperations::bytesToString(dirsize))
);
- d->freespace->setToolTip(tr("%1 of disk space currently used").arg((partsize-freespace)*100/freespace));
+ d->freespace->setToolTip(tr("%1% of disk space currently used").arg((partsize-freespace)*100/partsize));
showSpaceWidget(SpaceLack);
}
else
{
- d->kdehomeSize->setText(tr("Backup needs <strong>%1 MiB</strong> of free disk space").arg(dirsize / 1024 / 1024));
+ d->kdehomeSize->setText(tr("Backup needs <strong>%1</strong> of free disk space").arg(DirOperations::bytesToString(dirsize)));
d->backup->setEnabled(true);
d->backup->setChecked(true);
showSpaceWidget(SpaceOk);
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list