Author: dmacvicar Date: Wed May 11 15:57:41 2011 New Revision: 63964 URL: http://svn.opensuse.org/viewcvs/yast?rev=63964&view=rev Log: fix crash with languages and add missing implementation of a method Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc?rev=63964&r1=63963&r2=63964&view=diff ============================================================================== --- branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc (original) +++ branches/tmp/dmacvicar/zc10/qt/src/YQPkgLangList.cc Wed May 11 15:57:41 2011 @@ -104,22 +104,22 @@ zypp::sat::LocaleSupport myLocale( lang ); for_( it, myLocale.selectableBegin(), myLocale.selectableEnd() ) - { + { ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); if ( zyppPkg ) { if ( (*it)->installedSize() > 0 ) ++installed; ++total; - + emit filterMatch( *it, zyppPkg ); } } //selection()->setInstalledPackages(installed); //selection()->setTotalPackages(total); - + //selection()->setText( _summaryCol, QString().sprintf("%s (%d/%d)", zyppPattern->summary().c_str(), installed, total)); - + } emit filterFinished(); } @@ -142,6 +142,19 @@ return dynamic_cast<YQPkgLangListItem *> (item); } +void +YQPkgLangList::updateActions( YQPkgObjListItem * item) +{ + actionSetCurrentInstall->setEnabled( true ); + actionSetCurrentDontInstall->setEnabled( true ); + actionSetCurrentTaboo->setEnabled( true ); + actionSetCurrentProtected->setEnabled( false ); + + actionSetCurrentKeepInstalled->setEnabled( false ); + actionSetCurrentDelete->setEnabled( false ); + actionSetCurrentUpdate->setEnabled( false ); +} + YQPkgLangListItem::YQPkgLangListItem( YQPkgLangList * langList, const zypp::Locale & lang ) : YQPkgObjListItem( langList ) @@ -195,7 +208,7 @@ YQPkgLangListItem::setStatus( ZyppStatus newStatus, bool sendSignals ) { ZyppStatus oldStatus = status(); - + switch ( newStatus ) { case S_Install: Modified: branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc?rev=63964&r1=63963&r2=63964&view=diff ============================================================================== --- branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc (original) +++ branches/tmp/dmacvicar/zc10/qt/src/YQPkgObjList.cc Wed May 11 15:57:41 2011 @@ -23,7 +23,6 @@ #include <qpixmap.h> #include <qheader.h> #include <qpopupmenu.h> -#include <qaction.h> #include "utf8.h" @@ -1185,9 +1184,9 @@ // but whose dependencies are broken (no longer satisfied) return _( "Dependencies broken" ); } - + // don't use "else if" here, it might be the same colum as another one! - + if ( col == satisfiedIconCol() ) { if ( isSatisfied() ) Modified: branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h?rev=63964&r1=63963&r2=63964&view=diff ============================================================================== --- branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h (original) +++ branches/tmp/dmacvicar/zc10/qt/src/include/YQPkgObjList.h Wed May 11 15:57:41 2011 @@ -23,13 +23,14 @@ #define YQPkgObjList_h #include <qpixmap.h> +#include <qaction.h> + #include <QY2ListView.h> #include "YQZypp.h" #include <zypp/Edition.h> #include <y2util/FSize.h> class YQPkgObjListItem; -class QAction; class QPopupMenu; using std::string; @@ -404,7 +405,7 @@ * Returns 'true' if this selectable's status is set by a selection * (rather than by the user or by the dependency solver). **/ - bool bySelection() const; + virtual bool bySelection() const; /** * Set the (binary RPM) package status. @@ -520,9 +521,9 @@ **/ virtual QString toolTip( int column ); - + // Handle Debug isBroken and isSatisfied flags - + bool debugIsBroken() const { return _debugIsBroken; } bool debugIsSatisfied() const { return _debugIsSatisfied; } void setDebugIsBroken ( bool val = true ) { _debugIsBroken = val; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org