Author: kmachalkova Date: Thu Oct 23 18:41:20 2008 New Revision: 52485 URL: http://svn.opensuse.org/viewcvs/yast?rev=52485&view=rev Log: Make calculating disk usage diff a function Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=52485&r1=52484&r2=52485&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Thu Oct 23 18:41:20 2008 @@ -1346,37 +1346,19 @@ // void NCPackageSelector::showDiskSpace() { - zypp::ZYpp::Ptr z = zypp::getZYpp(); - zypp::DiskUsageCounter::MountPointSet du = z->diskUsage (); - zypp::DiskUsageCounter::MountPointSet::iterator - b = du.begin (), - e = du.end (), - it; - if (b == e) - { - // retry after detecting from the target - z->setPartitions(zypp::DiskUsageCounter::detectMountPoints ()); - du = z->diskUsage(); - b = du.begin (); - e = du.end (); - } - - zypp::ByteCount diff = 0; - for (it = b; it != e; ++it) - { - diff += (it->pkg_size - it->used_size) * 1024; - } - - // show pkg_diff, i.e. total difference of disk space (can be negative in installed system - // if packages are deleted) - if ( diskspaceLabel ) - { - diskspaceLabel->setText( diff.asString() ); - } + // check whether required diskspace enters the warning range if ( diskspacePopup ) + { diskspacePopup->checkDiskSpaceRange( ); + // show pkg_diff, i.e. total difference of disk space (can be negative in installed system + // if packages are deleted) + if ( diskspaceLabel ) + { + diskspaceLabel->setText( diskspacePopup->calculateDiff().asString() ); + } + } } Modified: trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc?rev=52485&r1=52484&r2=52485&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc Thu Oct 23 18:41:20 2008 @@ -380,8 +380,34 @@ fillPartitionTable(); popupWin->doit(); YDialog::deleteTopmostDialog(); -} +} + +zypp::ByteCount NCPkgDiskspace::calculateDiff() +{ + zypp::ZYpp::Ptr z = zypp::getZYpp(); + zypp::DiskUsageCounter::MountPointSet du = z->diskUsage (); + zypp::DiskUsageCounter::MountPointSet::iterator + b = du.begin (), + e = du.end (), + it; + if (b == e) + { + // retry after detecting from the target + z->setPartitions(zypp::DiskUsageCounter::detectMountPoints ()); + du = z->diskUsage(); + b = du.begin (); + e = du.end (); + } + zypp::ByteCount diff = 0; + for (it = b; it != e; ++it) + { + diff += (it->pkg_size - it->used_size) * 1024; + } + + yuiMilestone() << diff.asString() << endl; + return diff; +} ////////////////////////////////////////////////////////////////// // Modified: trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h?rev=52485&r1=52484&r2=52485&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h Thu Oct 23 18:41:20 2008 @@ -212,6 +212,8 @@ void showInfoPopup( string headline ); void checkRemainingDiskSpace( const ZyppPartitionDu & partition ); + + zypp::ByteCount calculateDiff(); }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org