[yast-commit] r66866 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgDescriptionView.cc

Author: tgoettlicher Date: Thu Nov 17 16:49:24 2011 New Revision: 66866 URL: http://svn.opensuse.org/viewcvs/yast?rev=66866&view=rev Log: - Fixed bnc#722617: Yast2 package manager does not show icons of some packages (2.21.16) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgDescriptionView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=66866&r1=66865&r2=66866&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Nov 17 16:49:24 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "15") +SET(VERSION_PATCH "16") 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=66866&r1=66865&r2=66866&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Nov 17 16:49:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 17 16:48:34 CET 2011 - tgoettlicher@suse.de + +- Fixed bnc#722617: Yast2 package manager does not show icons of some packages +- Version: 2.21.16 + +------------------------------------------------------------------- Tue Nov 8 14:43:20 CET 2011 - tgoettlicher@suse.de - Fixed untranslated rpm package groups (bnc #722325) Modified: trunk/qt-pkg/src/YQPkgDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDescriptionView.cc?rev=66866&r1=66865&r2=66866&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgDescriptionView.cc (original) +++ trunk/qt-pkg/src/YQPkgDescriptionView.cc Thu Nov 17 16:49:24 2011 @@ -222,7 +222,7 @@ QString YQPkgDescriptionView::applicationIconList( const list<string> & fileList ) const { - QString html; + QString html = ""; QMap desktopEntries; QStringList desktopFiles = findDesktopFiles( fileList ); @@ -231,21 +231,30 @@ return QString(); // headline for a list of application icons that belong to a selected package - html += _("This package contains: "); - html += "<table border='0'>"; for ( int i = 0; i < desktopFiles.size(); ++i ) { desktopEntries = readDesktopFile( desktopFiles[i] ); - html += "<tr><td valign='middle' align='center'>"; - html += QString( "" ); - html += "</td><td valign='middle' align='left'>"; - html += "<b>" + desktopEntries["Name"] + "</b>"; - html += "</td></tr>"; + QString desktopIcon = findDesktopIcon ( desktopEntries["Icon"] ); + + if ( ! desktopIcon.isEmpty() ) + { + html += "<tr><td valign='middle' align='center'>"; + html += QString( "" ); + html += "</td><td valign='middle' align='left'>"; + html += "<b>" + desktopEntries["Name"] + "</b>"; + html += "</td></tr>"; + } } - html += "</table>"; + if ( ! html.isEmpty() ) + { + html = _("This package contains: ") + + "<table border='0'>" + + html + + "</table>"; + } return "<p>" + html + "</p>"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org