Author: tgoettlicher Date: Fri Dec 4 17:19:41 2009 New Revision: 59970 URL: http://svn.opensuse.org/viewcvs/yast?rev=59970&view=rev Log: - Enabled multiple packages (fate# 305311) - V 2.18.19 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h trunk/qt-pkg/src/YQPkgVersionsView.cc trunk/qt-pkg/src/YQPkgVersionsView.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=59970&r1... ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Dec 4 17:19:41 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "18") +SET(VERSION_PATCH "19") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chang... ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Dec 4 17:19:41 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 4 16:59:59 CET 2009 - tgoettlicher@suse.de + +- Enabled multiple packages (fate# 305311) +- V 2.18.19 + +------------------------------------------------------------------- Tue Dec 1 10:13:02 CET 2009 - tgoettlicher@suse.de - fixed bnc #549868: Mnemonic clash in Software Management Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPackageKitGroupsF... ============================================================================== --- trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc Fri Dec 4 17:19:41 2009 @@ -72,6 +72,7 @@ case YPKG_GROUP_SUGGESTED: return _( "Suggested Packages" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended Packages"); case YPKG_GROUP_ORPHANED: return _( "Orphaned Packages" ); + case YPKG_GROUP_MULTIVERSION: return _( "Multiversion Packages" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums } @@ -118,6 +119,7 @@ case YPKG_GROUP_SUGGESTED: return( "package_edutainment_languages" ); case YPKG_GROUP_RECOMMENDED: return( "package_edutainment_languages" ); case YPKG_GROUP_ORPHANED: return( "package_edutainment_languages" ); + case YPKG_GROUP_MULTIVERSION: return( "package_edutainment_languages" ); case YPKG_GROUP_ALL: return( "package_main" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums @@ -219,6 +221,8 @@ _groupsMap[ YPKG_GROUP_RECOMMENDED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_RECOMMENDED ); _groupsMap[ YPKG_GROUP_SUGGESTED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_SUGGESTED ); _groupsMap[ YPKG_GROUP_ORPHANED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_ORPHANED ); + if ( ! zypp::sat::Pool::instance().multiversionEmpty() ) + _groupsMap[ YPKG_GROUP_MULTIVERSION] = new YQPkgPackageKitGroup( this, YPKG_GROUP_MULTIVERSION ); } } @@ -352,6 +356,13 @@ emit filterMatch( selectable, pkg ); return true; } + if ( selectedGroup() == YPKG_GROUP_MULTIVERSION && + selectable->multiversionInstall() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + return false; } Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPackageKitGroupsF... ============================================================================== --- trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h (original) +++ trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h Fri Dec 4 17:19:41 2009 @@ -71,6 +71,7 @@ YPKG_GROUP_SUGGESTED, YPKG_GROUP_RECOMMENDED, YPKG_GROUP_ORPHANED, + YPKG_GROUP_MULTIVERSION, YPKG_GROUP_ALL, } YPkgGroupEnum; Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?r... ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Fri Dec 4 17:19:41 2009 @@ -75,7 +75,6 @@ void YQPkgVersionsView::slotRefreshDetails( ) { - yuiMilestone() << "slotRefreshDetails" << endl; emit multiversionSelectionChanged( ); } @@ -405,7 +404,9 @@ void YQPkgMultiVersion::slotIconClicked() { // prevent checkmark, we draw the status icons ourselves + bool oldBlock = blockSignals( true ); setChecked( false ); + blockSignals( oldBlock ); cycleStatus(); } @@ -423,17 +424,17 @@ break; case S_Protected: - newStatus = _selectable->hasCandidateObj() ? + newStatus = _selectable->identicalAvailable( _zyppPoolItem ) ? S_KeepInstalled: S_NoInst; break; case S_Taboo: - newStatus = _selectable->hasInstalledObj() ? + newStatus = _selectable->identicalInstalled( _zyppPoolItem ) ? S_KeepInstalled : S_NoInst; break; case S_KeepInstalled: - newStatus = _selectable->hasCandidateObj() ? + newStatus = _selectable->identicalAvailable( _zyppPoolItem ) ? S_Update : S_Del; break; @@ -451,7 +452,7 @@ break; case S_NoInst: - if ( _selectable->hasCandidateObj() ) + if ( _selectable->identicalAvailable( _zyppPoolItem ) ) { newStatus = S_Install; } @@ -469,7 +470,10 @@ break; } + setStatus( newStatus ); + yuiMilestone() << "oldStatus:" << oldStatus << endl; + yuiMilestone() << "newStatus:" << newStatus << endl; } @@ -479,6 +483,7 @@ _selectable->setPickStatus( _zyppPoolItem, newStatus ); emit statusChanged(); + update(); } Modified: trunk/qt-pkg/src/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.h?re... ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.h (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.h Fri Dec 4 17:19:41 2009 @@ -202,7 +202,11 @@ protected: + /** + * Cycle the package status to the next valid value. + **/ void cycleStatus(); + void setStatus( ZyppStatus newStatus ); QPixmap statusIcon( ZyppStatus status ); @@ -215,6 +219,7 @@ protected slots: void slotIconClicked(); + signals: void statusChanged(); 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=5... ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Fri Dec 4 17:19:41 2009 @@ -11,9 +11,9 @@ BuildRequires: yast2-devtools >= 2.16.3 Requires: yast2-qt >= 2.17.13 BuildRequires: yast2-qt-devel >= 2.17.13 -BuildRequires: libzypp-devel >= 6.26.0 +BuildRequires: libzypp-devel >= 6.26.3 BuildRequires: yast2-libyui-devel >= 2.17.14 -Requires: libzypp >= 6.26.0 +Requires: libzypp >= 6.26.3 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