Author: tgoettlicher Date: Wed Oct 1 14:22:30 2008 New Revision: 51741 URL: http://svn.opensuse.org/viewcvs/yast?rev=51741&view=rev Log: Fixed bnc #418279: export list to text file fails Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc 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 Wed Oct 1 14:22:30 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 1 13:59:45 CEST 2008 - tgoettlicher@suse.de + +- Fixed bnc #418279: export list to text file fails + +------------------------------------------------------------------- Fri Sep 26 16:53:35 CEST 2008 - kmachalkova@suse.cz - Fixed crash in Languages filter: redefined sort function for Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=51741... ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Wed Oct 1 14:22:30 2008 @@ -428,51 +428,51 @@ // wrong, so the formatting will be broken. QString header; - header.sprintf( "# %-18s %-30s | %10s | %-16s | %-16s\n\n", + header.sprintf( "# %-18s %-30s | %-40s | %-25s | %10s\n\n", (const char *) _( "Status" ).toUtf8(), (const char *) _( "Package" ).toUtf8(), - (const char *) _( "Size" ).toUtf8(), - (const char *) _( "Avail. Ver." ).toUtf8(), - (const char *) _( "Inst. Ver." ).toUtf8() + (const char *) _( "Summary" ).toUtf8(), + (const char *) _( "Installed (Available)" ).toUtf8(), + (const char *) _( "Size" ).toUtf8() ); file.write(header.toUtf8()); - // // Write all items - // -#if FIXME - const QTreeWidgetItem * item = firstChild(); - - while ( item ) + QTreeWidgetItemIterator it((QTreeWidget*) this); + while (*it) { - const YQPkgListItem * pkg = dynamic_cast<const YQPkgListItem *> (item); - - if ( pkg ) - { - QString candVersion = pkg->text( versionCol() ); - QString instVersion = pkg->text( instVersionCol() ); + const QTreeWidgetItem* item(*it); + const YQPkgListItem * pkg = dynamic_cast<const YQPkgListItem *> (item); - if ( candVersion.isEmpty() ) candVersion = "---"; - if ( instVersion.isEmpty() ) instVersion = "---"; + if ( pkg ) + { + QString version = pkg->text(versionStatusCol()); + if ( version.isEmpty() ) version = "---"; + + QString summary = pkg->text(summaryCol()); + if ( summary.isEmpty() ) summary = "---"; + if ( summary.size() > 40 ) + { + summary.truncate(40-3); + summary += "..."; + } - QString status = "[" + statusText( pkg->status() ) + "]"; + QString status = "[" + statusText( pkg->status() ) + "]"; QString format; - format.sprintf("%-20s %-30s | %10s | %-16s | %-16s\n", - (const char *) status.toUtf8(), - (const char *) pkg->text( nameCol() ), - (const char *) pkg->text( sizeCol() ), - (const char *) candVersion, - (const char *) instVersion + format.sprintf("%-20s %-30s | %-40s | %-25s | %10s\n", + (const char*) status.toUtf8(), + (const char*) pkg->text( nameCol() ).toUtf8(), + (const char*) summary.toUtf8(), + (const char*) version.toUtf8(), + (const char*) pkg->text( sizeCol() ).toUtf8() ); file.write(format.toUtf8()); } - - item = item->nextSibling(); + ++it; } -#endif // Clean up if ( file.isOpen() ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org