Author: gs Date: Thu Nov 5 12:06:40 2009 New Revision: 59323 URL: http://svn.opensuse.org/viewcvs/yast?rev=59323&view=rev Log: Start with correct filter view on option `repoMode and `summaryMode (bnc #548437) Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.cc branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.h branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterMain.h Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurse... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/VERSION Thu Nov 5 12:06:40 2009 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurse... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes Thu Nov 5 12:06:40 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 5 11:53:50 CET 2009 - gs@suse.de + +- Start with correct filter view on option `repoMode (repositories) + and `summaryMode (installation summary) (bnc #548437) +- 2.17.14 + +------------------------------------------------------------------- Tue Jan 20 18:00:41 CET 2009 - kmachalkova@suse.cz - Fixed weird behaviour of left/right arrow keys (bnc#467586) Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurse... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.cc Thu Nov 5 12:06:40 2009 @@ -135,6 +135,9 @@ testMode = (modeFlags & YPkg_TestMode ) ? true : false ; + repoMode = ( modeFlags & YPkg_RepoMode ) ? true : false; + + summaryMode = ( modeFlags & YPkg_SummaryMode ) ? true : false; } bool NCPackageSelector::checkNow( bool *ok ) @@ -1676,6 +1679,19 @@ break; } + // if started with `repoMode or `summaryMode replace filter accordingly + if ( repoMode ) + { + replaceFilter ( NCPackageSelector::Repositories ); + if ( filterMain) + filterMain->setReposSelected(); + } + else if ( summaryMode ) + { + replaceFilter ( NCPackageSelector::Summary ); + if ( filterMain ) + filterMain->setSummarySelected(); + } return true; Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurse... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPackageSelector.h Thu Nov 5 12:06:40 2009 @@ -118,7 +118,9 @@ bool youMode; // YOU bool updateMode; // Update bool testMode; // testing - bool repoMgrEnabled; + bool repoMgrEnabled; // Manage repositories (add menu button "Configuration") + bool repoMode; // Start with "Repositories" filter view + bool summaryMode; // Start with "Summary" filter view bool autoCheck; YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages Modified: branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterMain.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurse... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterMain.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterMain.h Thu Nov 5 12:06:40 2009 @@ -51,6 +51,8 @@ bool handleEvent( ); + void setSummarySelected() { selectItem(inst_summary); } + void setReposSelected() { selectItem(repositories); } }; #endif -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org