Hello community,

here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory 
checked in at 2011-11-18 15:48:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-qt-pkg (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-qt-pkg", Maintainer is "tgoettlic...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-qt-pkg/yast2-qt-pkg.changes        
2011-11-07 14:37:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new/yast2-qt-pkg.changes   
2011-11-18 15:48:29.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Nov 17 16:48:34 CET 2011 - tgoettlic...@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 - tgoettlic...@suse.de
+
+- Fixed untranslated rpm package groups (bnc #722325) 
+- Version: 2.21.15
+
+-------------------------------------------------------------------

Old:
----
  yast2-qt-pkg-2.21.14.tar.bz2

New:
----
  yast2-qt-pkg-2.21.16.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.k5BByq/_old  2011-11-18 15:48:31.000000000 +0100
+++ /var/tmp/diff_new_pack.k5BByq/_new  2011-11-18 15:48:31.000000000 +0100
@@ -18,11 +18,11 @@
 
 
 Name:           yast2-qt-pkg
-Version:        2.21.14
+Version:        2.21.16
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-qt-pkg-2.21.14.tar.bz2
+Source0:        yast2-qt-pkg-2.21.16.tar.bz2
 Group:          System/YaST
 License:        GPL-2.0 or later
 BuildRequires:  docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel 
libxcrypt-devel

++++++ yast2-qt-pkg-2.21.14.tar.bz2 -> yast2-qt-pkg-2.21.16.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.14/VERSION.cmake 
new/yast2-qt-pkg-2.21.16/VERSION.cmake
--- old/yast2-qt-pkg-2.21.14/VERSION.cmake      2011-11-07 09:20:51.000000000 
+0100
+++ new/yast2-qt-pkg-2.21.16/VERSION.cmake      2011-11-17 16:49:47.000000000 
+0100
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "14")
+SET(VERSION_PATCH "16")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.14/package/yast2-qt-pkg.changes 
new/yast2-qt-pkg-2.21.16/package/yast2-qt-pkg.changes
--- old/yast2-qt-pkg-2.21.14/package/yast2-qt-pkg.changes       2011-11-07 
09:20:51.000000000 +0100
+++ new/yast2-qt-pkg-2.21.16/package/yast2-qt-pkg.changes       2011-11-17 
16:49:47.000000000 +0100
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Thu Nov 17 16:48:34 CET 2011 - tgoettlic...@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 - tgoettlic...@suse.de
+
+- Fixed untranslated rpm package groups (bnc #722325) 
+- Version: 2.21.15
+
+-------------------------------------------------------------------
 Fri Nov  4 14:31:32 CET 2011 - tgoettlic...@suse.de
 
 - Changed default for "Ignore recommended packages for already installed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-qt-pkg-2.21.14/src/YQPkgDescriptionView.cc 
new/yast2-qt-pkg-2.21.16/src/YQPkgDescriptionView.cc
--- old/yast2-qt-pkg-2.21.14/src/YQPkgDescriptionView.cc        2011-11-07 
09:20:51.000000000 +0100
+++ new/yast2-qt-pkg-2.21.16/src/YQPkgDescriptionView.cc        2011-11-17 
16:49:47.000000000 +0100
@@ -222,7 +222,7 @@
 QString
 YQPkgDescriptionView::applicationIconList( const list<string> & fileList ) 
const
 {
-    QString html;
+    QString html = "";
     QMap<QString, QString> 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( "<img src=\"" ) + findDesktopIcon ( 
desktopEntries["Icon"] ) + 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( "<img src=\"" ) + desktopIcon + 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>";
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-qt-pkg-2.21.14/src/YQPkgRpmGroupTagsFilterView.cc 
new/yast2-qt-pkg-2.21.16/src/YQPkgRpmGroupTagsFilterView.cc
--- old/yast2-qt-pkg-2.21.14/src/YQPkgRpmGroupTagsFilterView.cc 2011-11-07 
09:20:51.000000000 +0100
+++ new/yast2-qt-pkg-2.21.16/src/YQPkgRpmGroupTagsFilterView.cc 2011-11-17 
16:49:47.000000000 +0100
@@ -80,6 +80,7 @@
     {
        _rpmGroupsTree = new YRpmGroupsTree();
        Q_CHECK_PTR( _rpmGroupsTree );
+       _rpmGroupsTree->setTextdomain("qt-pkg");
 
        fillRpmGroupsTree();
     }

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to