Hello community,
here is the log from the commit of package yast2-control-center for
openSUSE:Factory checked in at 2018-02-24 16:35:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
and /work/SRC/openSUSE:Factory/.yast2-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center"
Sat Feb 24 16:35:47 2018 rev:69 rq:578807 version:4.0.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes
2018-02-16 21:41:19.982313462 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-control-center.new/yast2-control-center.changes
2018-02-24 16:35:50.045105640 +0100
@@ -1,0 +2,6 @@
+Wed Feb 21 16:30:37 UTC 2018 - [email protected]
+
+- Fixes to way icons are displayed (boo#1081517)
+- 4.0.1
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-4.0.0.tar.bz2
New:
----
yast2-control-center-4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.ba6FKx/_old 2018-02-24 16:35:51.749044310 +0100
+++ /var/tmp/diff_new_pack.ba6FKx/_new 2018-02-24 16:35:51.753044166 +0100
@@ -17,7 +17,7 @@
Name: yast2-control-center
-Version: 4.0.0
+Version: 4.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-control-center-4.0.0.tar.bz2 -> yast2-control-center-4.0.1.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.0.0/package/yast2-control-center.changes
new/yast2-control-center-4.0.1/package/yast2-control-center.changes
--- old/yast2-control-center-4.0.0/package/yast2-control-center.changes
2018-02-15 13:32:20.000000000 +0100
+++ new/yast2-control-center-4.0.1/package/yast2-control-center.changes
2018-02-21 18:18:06.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Feb 21 16:30:37 UTC 2018 - [email protected]
+
+- Fixes to way icons are displayed (boo#1081517)
+- 4.0.1
+
+-------------------------------------------------------------------
Mon Nov 13 12:44:08 UTC 2017 - [email protected]
- Do not included unused RPC headers (boo#1081118).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.0.0/package/yast2-control-center.spec
new/yast2-control-center-4.0.1/package/yast2-control-center.spec
--- old/yast2-control-center-4.0.0/package/yast2-control-center.spec
2018-02-15 13:32:20.000000000 +0100
+++ new/yast2-control-center-4.0.1/package/yast2-control-center.spec
2018-02-21 18:18:06.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-control-center
-Version: 4.0.0
+Version: 4.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.0.0/src/yqdesktopfilesmodel.cpp
new/yast2-control-center-4.0.1/src/yqdesktopfilesmodel.cpp
--- old/yast2-control-center-4.0.0/src/yqdesktopfilesmodel.cpp 2018-02-15
13:32:20.000000000 +0100
+++ new/yast2-control-center-4.0.1/src/yqdesktopfilesmodel.cpp 2018-02-21
18:18:06.000000000 +0100
@@ -278,20 +278,26 @@
QVariant YQDesktopFilesModel::findIcon( QString &icon ) const
{
- QRegExp extension( "\\.(png|jpg)$", Qt::CaseInsensitive );
- if ( icon.indexOf( extension ) < 0 ) // no .png or .jpg extension?
- icon += ".png"; // assume .png
- QStringListIterator it(d->icon_dirs);
- while (it.hasNext())
+ if ( QIcon::hasThemeIcon(icon) )
{
- QString icondir(it.next());
- if ( QFile::exists(icondir + "/" + icon) )
+ return QIcon::fromTheme(icon);
+ }
+ else
+ {
+ QRegExp extension( "\\.(png|jpg|svg)$", Qt::CaseInsensitive );
+ if ( icon.indexOf( extension ) < 0 ) // no .png or .jpg extension?
+ icon += ".png"; // assume .png
+ QStringListIterator it(d->icon_dirs);
+ while (it.hasNext())
{
- return QIcon(icondir + "/" + icon);
+ QString icondir(it.next());
+ if ( QFile::exists(icondir + "/" + icon) )
+ {
+ return QIcon(icondir + "/" + icon);
+ }
}
}
return QVariant();
-
}
void YQDesktopFilesModel::sort( int, Qt::SortOrder order )
