Hello community,
here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory
checked in at 2018-02-24 16:35:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt-pkg"
Sat Feb 24 16:35:42 2018 rev:33 rq:578717 version:2.45.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes
2017-08-12 20:04:15.492917753 +0200
+++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new/libyui-qt-pkg.changes
2018-02-24 16:35:43.785330946 +0100
@@ -1,0 +2,6 @@
+Wed Feb 21 13:54:46 UTC 2018 - le...@protonmail.com
+
+- Contribution by LelCP: Add support for icon themes (boo#1081517)
+- 2.45.15
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-pkg-2.45.14.tar.bz2
New:
----
libyui-qt-pkg-2.45.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.tOBh2N/_old 2018-02-24 16:35:44.433307624 +0100
+++ /var/tmp/diff_new_pack.tOBh2N/_new 2018-02-24 16:35:44.437307480 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt-pkg-doc
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define so_version 8
Name: %{parent}-doc
-Version: 2.45.14
+Version: 2.45.15
Release: 0
Source: %{parent}-%{version}.tar.bz2
++++++ libyui-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.tOBh2N/_old 2018-02-24 16:35:44.461306616 +0100
+++ /var/tmp/diff_new_pack.tOBh2N/_new 2018-02-24 16:35:44.461306616 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt-pkg
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libyui-qt-pkg
-Version: 2.45.14
+Version: 2.45.15
Release: 0
Source: %{name}-%{version}.tar.bz2
++++++ libyui-qt-pkg-2.45.14.tar.bz2 -> libyui-qt-pkg-2.45.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.45.14/VERSION.cmake
new/libyui-qt-pkg-2.45.15/VERSION.cmake
--- old/libyui-qt-pkg-2.45.14/VERSION.cmake 2017-08-08 12:39:18.220942109
+0200
+++ new/libyui-qt-pkg-2.45.15/VERSION.cmake 2018-02-21 15:15:07.000000000
+0100
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "45" )
-SET( VERSION_PATCH "14" )
+SET( VERSION_PATCH "15" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.45.14/package/libyui-qt-pkg-doc.spec
new/libyui-qt-pkg-2.45.15/package/libyui-qt-pkg-doc.spec
--- old/libyui-qt-pkg-2.45.14/package/libyui-qt-pkg-doc.spec 2017-08-08
12:39:18.220942109 +0200
+++ new/libyui-qt-pkg-2.45.15/package/libyui-qt-pkg-doc.spec 2018-02-21
15:15:07.000000000 +0100
@@ -20,7 +20,7 @@
%define so_version 8
Name: %{parent}-doc
-Version: 2.45.14
+Version: 2.45.15
Release: 0
Source: %{parent}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.45.14/package/libyui-qt-pkg.changes
new/libyui-qt-pkg-2.45.15/package/libyui-qt-pkg.changes
--- old/libyui-qt-pkg-2.45.14/package/libyui-qt-pkg.changes 2017-08-08
12:39:18.220942109 +0200
+++ new/libyui-qt-pkg-2.45.15/package/libyui-qt-pkg.changes 2018-02-21
15:15:07.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Feb 21 13:54:46 UTC 2018 - le...@protonmail.com
+
+- Contribution by LelCP: Add support for icon themes (boo#1081517)
+- 2.45.15
+
+-------------------------------------------------------------------
Tue Aug 8 08:51:50 UTC 2017 - mvid...@suse.com
- Adjusted to increased so version of the base library (bsc#1052217)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.45.14/package/libyui-qt-pkg.spec
new/libyui-qt-pkg-2.45.15/package/libyui-qt-pkg.spec
--- old/libyui-qt-pkg-2.45.14/package/libyui-qt-pkg.spec 2017-08-08
12:39:18.220942109 +0200
+++ new/libyui-qt-pkg-2.45.15/package/libyui-qt-pkg.spec 2018-02-21
15:15:07.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt-pkg
-Version: 2.45.14
+Version: 2.45.15
Release: 0
Source: %{name}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-qt-pkg-2.45.14/src/YQPkgPackageKitGroupsFilterView.cc
new/libyui-qt-pkg-2.45.15/src/YQPkgPackageKitGroupsFilterView.cc
--- old/libyui-qt-pkg-2.45.14/src/YQPkgPackageKitGroupsFilterView.cc
2017-08-08 12:39:18.232942109 +0200
+++ new/libyui-qt-pkg-2.45.15/src/YQPkgPackageKitGroupsFilterView.cc
2018-02-21 15:15:07.000000000 +0100
@@ -430,8 +430,16 @@
setFont(0,f);
string iconName = groupIcon( group );
+ QString icon = QString::fromStdString(iconName);
+ if ( QIcon::hasThemeIcon(icon) )
+ {
+ setIcon( 0, QIcon::fromTheme(icon) );
+ }
+ else
+ {
+ setIcon( 0, QIcon( QString( YQPackageSelector::iconPath( iconName, 32
).c_str() ) ) );
+ }
setText( 0, translatedText( group ) );
- setIcon( 0, QIcon( QString( YQPackageSelector::iconPath( iconName, 32
).c_str() ) ) );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.45.14/src/YQPkgPatternList.cc
new/libyui-qt-pkg-2.45.15/src/YQPkgPatternList.cc
--- old/libyui-qt-pkg-2.45.14/src/YQPkgPatternList.cc 2017-08-08
12:39:18.232942109 +0200
+++ new/libyui-qt-pkg-2.45.15/src/YQPkgPatternList.cc 2018-02-21
15:15:07.000000000 +0100
@@ -472,10 +472,19 @@
icon.empty() )
icon = "pattern-generic";
- std::string iconpath = YQPackageSelector::iconPath(icon, 32);
+
//std::cout << icon << " | "<< iconpath << std::endl;
-
+ QString iconName = QString::fromStdString(icon);
+ if ( QIcon::hasThemeIcon(iconName) )
+ {
+ setIcon( _patternList->iconCol(), QIcon::fromTheme(iconName) );
+ }
+ else
+ {
+ std::string iconpath = YQPackageSelector::iconPath(icon, 32);
setIcon(_patternList->iconCol(), QIcon(QString(iconpath.c_str())));
+ }
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-pkg-2.45.14/src/YQPkgRepoList.cc
new/libyui-qt-pkg-2.45.15/src/YQPkgRepoList.cc
--- old/libyui-qt-pkg-2.45.14/src/YQPkgRepoList.cc 2017-08-08
12:39:18.236942109 +0200
+++ new/libyui-qt-pkg-2.45.15/src/YQPkgRepoList.cc 2018-02-21
15:15:07.000000000 +0100
@@ -269,8 +269,12 @@
if ( repo.isSystemRepo() )
iconName = "yast-host";
-
- setIcon( 0, QIcon(
iconPath.sprintf("/usr/share/icons/hicolor/48x48/apps/%s.png",
iconName.toUtf8().data()) ));
+ if ( QIcon::hasThemeIcon(iconName) )
+ {
+ setIcon( 0, QIcon::fromTheme(iconName) );
+ }
+ else
+ setIcon( 0, QIcon(
iconPath.sprintf("/usr/share/icons/hicolor/48x48/apps/%s.png",
iconName.toUtf8().data()) ));
}
