Author: gs Date: Thu Oct 23 14:52:28 2008 New Revision: 52459 URL: http://svn.opensuse.org/viewcvs/yast?rev=52459&view=rev Log: allow to set disk space in test mode (to be able to test the disk space warning popup) Modified: trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h trunk/ncurses-pkg/src/NCPkgTable.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.h?rev=52459&r1=52458&r2=52459&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Thu Oct 23 14:52:28 2008 @@ -275,6 +275,8 @@ bool isAutoCheck() { return autoCheck; } + bool isTestMode() { return testMode; } + void AutoCheck( bool check) { autoCheck = check; } /** Modified: trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc?rev=52459&r1=52458&r2=52459&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDiskspace.cc Thu Oct 23 14:52:28 2008 @@ -54,7 +54,7 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupDiskspace::NCPkgPopupDiskspace +// METHOD NAME : NCPkgDiskspace::NCPkgDiskspace // METHOD TYPE : Constructor // // DESCRIPTION : @@ -75,7 +75,7 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupDiskspace::~NCPkgPopupDiskspace +// METHOD NAME : NCPkgDiskspace::~NCPkgDiskspace // METHOD TYPE : Destructor // // DESCRIPTION : @@ -87,7 +87,7 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupDiskspace::fillPartitionTable +// METHOD NAME : NCPkgDiskspace::fillPartitionTable // METHOD TYPE : void // // DESCRIPTION : @@ -141,10 +141,11 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupDiskspace::checkDiskSpace +// METHOD NAME : NCPkgDiskspace::checkDiskSpace // METHOD TYPE : string // -// DESCRIPTION : +// DESCRIPTION : called to check disk space before installation +// (after OK button is pressed) // string NCPkgDiskspace::checkDiskSpace() { @@ -167,6 +168,9 @@ for (it = b; it != e; ++it) { + if (it->readonly) + continue; + zypp::ByteCount pkg_available = (it->total_size - it->pkg_size) * 1024; if ( pkg_available < 0 ) { @@ -186,6 +190,15 @@ return text; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPkgDiskspace::checkRemainingDiskSpace +// METHOD TYPE : void +// +// DESCRIPTION : check whether remaining disk space enters +// warning or error range +// void NCPkgDiskspace::checkRemainingDiskSpace( const ZyppPartitionDu & partition ) { FSize usedSize ( partition.pkg_size, FSize::K ); @@ -227,27 +240,20 @@ if ( free < OVERFLOW_MB_PROXIMITY ) overflowWarning.enterProximity(); -#ifdef TEST - yuiMilestone() << "Overflow: " << "_inRange: " << (overflowWarning._inRange?"true":"false") << endl; - yuiMilestone() << "Overflow: " << "_isClose: " << (overflowWarning._isClose?"true":"false") << endl; - yuiMilestone() << "Overflow: " << "_hasBeenClose: " << (overflowWarning._hasBeenClose?"true":"false") << endl; - yuiMilestone() << "Overflow: " << "_warningPosted: " << (overflowWarning._warningPosted?"true":"false") << endl; - - yuiMilestone() << "RunningOut: " << "_inRange: " << (runningOutWarning._inRange?"true":"false") << endl; - yuiMilestone() << "RunningOut: " << "_isClose: " << (runningOutWarning._isClose?"true":"false") << endl; - yuiMilestone() << "RunningOut: " << "_hasBeenClose: " << (runningOutWarning._hasBeenClose?"true":"false") << endl; - yuiMilestone() << "RunningOut: " << "_warningPosted: " << (runningOutWarning._warningPosted?"true":"false") << endl; -#endif } /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupDiskspace::setDiskSpace +// METHOD NAME : NCPkgDiskspace::setDiskSpace // METHOD TYPE : void // -// DESCRIPTION : for testing only; called from PackageSelector -// if running in testMode +// DESCRIPTION : For testing only; called from NCPkgTable if the PackageSelector +// running in testMode +// TESTDESCRIPTION: Call `PackageSelector with `opt(`testMode) (ycp example). +// With focus on the package list press '+' or '-' to +// increase/decrease used diskspace (see y2log). +// Use the 'Actions' menu to select/delete a package. // void NCPkgDiskspace::setDiskSpace( wint_t ch ) { @@ -275,16 +281,21 @@ percent = 0; partitionDu.pkg_size = partitionDu.total_size * percent / 100; + + FSize newSize ( partitionDu.pkg_size, FSize::K ); + + yuiMilestone() << "Used size (MB): " << newSize / FSize::MB << endl; + yuiMilestone() << "Total size (MB): " << totalSize / FSize::MB << endl; } } /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupDiskspace::checkDiskSpaceRange +// METHOD NAME : NCPkgDiskspace::checkDiskSpaceRange // METHOD TYPE : void // -// DESCRIPTION : +// DESCRIPTION : calls checkRemaingDiskspace for every partition // void NCPkgDiskspace::checkDiskSpaceRange( ) { @@ -330,6 +341,14 @@ if ( runningOutWarning.leavingProximity() ) runningOutWarning.clearHistory(); + if ( testmode ) + { + yuiMilestone() << "Running out Warning:" << endl; + runningOutWarning.logSettings(); + + yuiMilestone() << "Overflow Warning:" << endl; + overflowWarning.logSettings(); + } } string NCPkgDiskspace::usedPercent( FSize used, FSize total ) @@ -348,7 +367,7 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupDiskspace::showInfoPopup +// METHOD NAME : NCPkgDiskspace::showInfoPopup // METHOD TYPE : void // // DESCRIPTION : @@ -361,9 +380,15 @@ fillPartitionTable(); popupWin->doit(); YDialog::deleteTopmostDialog(); - } +} +////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPkgPopupDiskspace::NCPkgPopupDiskspace +// METHOD TYPE : Constructor +// NCPkgPopupDiskspace::NCPkgPopupDiskspace( const wpos at, string headline ) : NCPopup( at, false ) , partitions( 0 ) @@ -373,10 +398,24 @@ createLayout( headline ); } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPkgPopupDiskspace::~NCPkgPopupDiskspace +// METHOD TYPE : Destructor +// NCPkgPopupDiskspace::~NCPkgPopupDiskspace() { } +////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPkgPopupDiskspace::createLyout +// METHOD TYPE : void +// +// DESCRIPTION : create layout (partition table) +// void NCPkgPopupDiskspace::createLayout( string headline ) { // the vertical split is the (only) child of the dialog @@ -548,4 +587,12 @@ return _inRange && ! _warningPosted; } +void +NCPkgWarningRangeNotifier::logSettings() const +{ + yuiMilestone() << "in range: " << (_inRange?"true":"false") << endl; + yuiMilestone() << "is close: " << (_isClose?"true":"false") << endl; + yuiMilestone() << "has been close: " << (_hasBeenClose?"true":"false") << endl; + yuiMilestone() << "warning posted: " << (_warningPosted?"true":"false") << endl; +} Modified: trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h?rev=52459&r1=52458&r2=52459&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h Thu Oct 23 14:52:28 2008 @@ -111,6 +111,11 @@ **/ bool leavingProximity() const; + /* + * Log settings to y2log + */ + void logSettings() const; + /** * Clear the current values, i.e. prepare for a new round of checks **/ Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?rev=52459&r1=52458&r2=52459&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Thu Oct 23 14:52:28 2008 @@ -24,7 +24,7 @@ #include "NCPopupInfo.h" #include "NCPkgStrings.h" #include "NCi18n.h" - +#include "NCPkgPopupDiskspace.h" #include "NCPackageSelector.h" #include #include "NCZypp.h" @@ -792,6 +792,13 @@ // call handleInput of NCPad handleInput( key ); + + if ( packager->isTestMode() ) + { + if ( packager->diskSpacePopup() ) + packager->diskSpacePopup()->setDiskSpace( key ); + return ret; + } switch ( key ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org