Author: tgoettlicher Date: Thu Mar 12 17:57:19 2009 New Revision: 56102 URL: http://svn.opensuse.org/viewcvs/yast?rev=56102&view=rev Log: Fixed confusing system verification mode (bnc #285482) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPackageSelector.h trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=56102&r1=56101&r2=56102&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Mar 12 17:57:19 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=56102&r1=56101&r2=56102&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Mar 12 17:57:19 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 12 17:52:29 CET 2009 - tgoettlicher@suse.de + +- Fixed confusing system verification mode (bnc #285482) +- V 2.18.5 + +------------------------------------------------------------------- Mon Mar 9 16:09:29 CET 2009 - tgoettlicher@suse.de - Fixed "Unsupported Packages" confirmation when removing unsupported packages (bnc #475186) Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=56102&r1=56101&r2=56102&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Mar 12 17:57:19 2009 @@ -753,6 +753,12 @@ _excludeDebugInfoPkgs->enable( false ); + _verifySystemModeAction = _optionsMenu->addAction( _( "&System Verification Mode" ), + this, SLOT( pkgVerifySytemModeChanged( bool ) ) ); + _verifySystemModeAction->setCheckable(true); + _verifySystemModeAction->setChecked( zypp::getZYpp()->resolver()->systemVerification() ); + + // // Extras menu // @@ -764,7 +770,6 @@ _extrasMenu->addAction( _( "Show &Products" ), this, SLOT( showProducts() ) ); _extrasMenu->addAction( _( "Show P&ackage Changes" ), this, SLOT( showAutoPkgList() ), Qt::CTRL + Qt::Key_A ); - _extrasMenu->addAction( _( "&Verify System" ), this, SLOT( verifySystem() ) ); _extrasMenu->addSeparator(); @@ -1388,6 +1393,13 @@ void +YQPackageSelector::pkgVerifySytemModeChanged( bool on ) +{ + zypp::getZYpp()->resolver()->setSystemVerification( on ); +} + + +void YQPackageSelector::installSubPkgs( const QString & suffix ) { // Find all matching packages and put them into a QMap Modified: trunk/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.h?rev=56102&r1=56101&r2=56102&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.h (original) +++ trunk/qt-pkg/src/YQPackageSelector.h Thu Mar 12 17:57:19 2009 @@ -126,6 +126,12 @@ void pkgExcludeDebugChanged( bool on ); void pkgExcludeDevelChanged( bool on ); + + /* + * Enable or disable verify system mode of the solver + */ + void pkgVerifySytemModeChanged( bool on ); + /** * Display (generic) online help. **/ @@ -325,6 +331,7 @@ QAction *_showDevelAction; QAction *_showDebugAction; + QAction *_verifySystemModeAction; YQPkgObjList::ExcludeRule * _excludeDevelPkgs; YQPkgObjList::ExcludeRule * _excludeDebugInfoPkgs; Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=56102&r1=56101&r2=56102&view=diff ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Thu Mar 12 17:57:19 2009 @@ -9,9 +9,9 @@ BuildRequires: yast2-devtools >= 2.16.3 Requires: yast2-qt >= 2.17.13 BuildRequires: yast2-qt-devel >= 2.17.13 -BuildRequires: libzypp-devel >= 4.7.0 +BuildRequires: libzypp-devel >= 6.2.2 BuildRequires: yast2-libyui-devel >= 2.17.14 -Requires: libzypp >= 4.7.0 +Requires: libzypp >= 6.2.2 Requires: yast2-libyui >= 2.17.14 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org