Hello community,
here is the log from the commit of package yast2-control-center for
openSUSE:Factory checked in at 2019-03-06 19:02:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
and /work/SRC/openSUSE:Factory/.yast2-control-center.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center"
Wed Mar 6 19:02:23 2019 rev:77 rq:681398 version:4.1.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes
2019-02-15 09:54:11.115783045 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-control-center.new.28833/yast2-control-center.changes
2019-03-06 19:02:25.649090342 +0100
@@ -1,0 +2,6 @@
+Thu Feb 28 16:04:39 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Introduce very effective fallback for icons (boo#1127245)
+- 4.1.7
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-4.1.6.tar.bz2
New:
----
yast2-control-center-4.1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.YVQAsk/_old 2019-03-06 19:02:26.249090180 +0100
+++ /var/tmp/diff_new_pack.YVQAsk/_new 2019-03-06 19:02:26.249090180 +0100
@@ -17,7 +17,7 @@
Name: yast2-control-center
-Version: 4.1.6
+Version: 4.1.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-control-center-4.1.6.tar.bz2 -> yast2-control-center-4.1.7.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.6/package/yast2-control-center.changes
new/yast2-control-center-4.1.7/package/yast2-control-center.changes
--- old/yast2-control-center-4.1.6/package/yast2-control-center.changes
2019-02-14 14:12:22.000000000 +0100
+++ new/yast2-control-center-4.1.7/package/yast2-control-center.changes
2019-03-04 13:35:13.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Feb 28 16:04:39 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Introduce very effective fallback for icons (boo#1127245)
+- 4.1.7
+
+-------------------------------------------------------------------
Thu Feb 14 10:42:58 UTC 2019 - Stasiek Michalski <[email protected]>
- Fix icon display to new libyui-qt function (boo#1125424)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.6/package/yast2-control-center.spec
new/yast2-control-center-4.1.7/package/yast2-control-center.spec
--- old/yast2-control-center-4.1.6/package/yast2-control-center.spec
2019-02-14 14:12:22.000000000 +0100
+++ new/yast2-control-center-4.1.7/package/yast2-control-center.spec
2019-03-04 13:35:13.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-control-center
-Version: 4.1.6
+Version: 4.1.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.6/src/models_test.cpp
new/yast2-control-center-4.1.7/src/models_test.cpp
--- old/yast2-control-center-4.1.6/src/models_test.cpp 2019-02-14
14:12:22.000000000 +0100
+++ new/yast2-control-center-4.1.7/src/models_test.cpp 2019-03-04
13:35:13.000000000 +0100
@@ -32,7 +32,6 @@
QApplication app(argc, argv);
QListView window;
YQDesktopFilesModel model(&window);
- model.addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps");
model.addDesktopFilesPath("/usr/share/applications/YaST2/groups");
window.setModel(&model);
@@ -40,8 +39,6 @@
//QListView window2;
//YQDesktopFilesModel model2("/usr/share/applications/YaST2", &window2);
- //model2.addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps");
- //model2.addIconPath("/usr/share/icons/hicolor/32x32/apps");
//window2.setModel(&model2);
//window2.show();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.6/src/yqdesktopfilesmodel.cpp
new/yast2-control-center-4.1.7/src/yqdesktopfilesmodel.cpp
--- old/yast2-control-center-4.1.6/src/yqdesktopfilesmodel.cpp 2019-02-14
14:12:22.000000000 +0100
+++ new/yast2-control-center-4.1.7/src/yqdesktopfilesmodel.cpp 2019-03-04
13:35:13.000000000 +0100
@@ -81,11 +81,6 @@
readDesktopFiles();
}
-void YQDesktopFilesModel::addIconPath( const QString &dir )
-{
- d->icon_dirs << dir;
-}
-
void YQDesktopFilesModel::slotDesktopFilesDirectoryChanged( const QString
&path )
{
//emit dataChanged();
@@ -278,6 +273,11 @@
QVariant YQDesktopFilesModel::findIcon( QString &icon ) const
{
+ // qt5ct doesn't set a default theme
+ if ( QIcon::themeName().isEmpty() )
+ {
+ QIcon::setThemeName( "hicolor" );
+ }
return QIcon::fromTheme(icon);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.6/src/yqdesktopfilesmodel.h
new/yast2-control-center-4.1.7/src/yqdesktopfilesmodel.h
--- old/yast2-control-center-4.1.6/src/yqdesktopfilesmodel.h 2019-02-14
14:12:22.000000000 +0100
+++ new/yast2-control-center-4.1.7/src/yqdesktopfilesmodel.h 2019-03-04
13:35:13.000000000 +0100
@@ -71,11 +71,6 @@
* Add a directory where Desktop files will be searched
*/
void addDesktopFilesPath( const QString & dir );
-
- /**
- * Add a directory where to look for icons
- */
- void addIconPath( const QString &dir );
// reimplemented methods from QAbstractItemModel
@@ -123,8 +118,6 @@
// directories to read
QStringList desktop_dirs;
- QStringList icon_dirs;
-
// list of .desktop files read from disk
QStringList desktop_files;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.6/src/yqmodulegroupsmodel.cpp
new/yast2-control-center-4.1.7/src/yqmodulegroupsmodel.cpp
--- old/yast2-control-center-4.1.6/src/yqmodulegroupsmodel.cpp 2019-02-14
14:12:22.000000000 +0100
+++ new/yast2-control-center-4.1.7/src/yqmodulegroupsmodel.cpp 2019-03-04
13:35:13.000000000 +0100
@@ -30,8 +30,6 @@
#include "yqmodulegroupsmodel.h"
-#define DEFAULT_GROUP_ICON "yast-default-group.png"
-
bool paircmp( QPair<int, QString> p1, QPair<int, QString> p2)
{
if ( p1.first != p2.first )
@@ -48,8 +46,6 @@
QString alt_dir = QString( getenv( "YAST2_DESKTOP_DIR") );
addDesktopFilesPath( alt_dir.isEmpty() ? default_dir : alt_dir +
"/groups/");
- addIconPath( ICON_DIR );
- addIconPath( FALLBACK_ICON_DIR );
reindex();
//addPersonalStuff();
}
@@ -157,14 +153,7 @@
else if ( role == Qt::DecorationRole )
{
QVariant icon = YQDesktopFilesModel::data( index, role );
- QString fallback_icon = "yast-default-group";
-
- if ( icon.isValid() )
- return icon;
- else
- {
- return findIcon( fallback_icon );
- }
+ return icon;
}
else
return YQDesktopFilesModel::data(index, role);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.6/src/yqmodulesmodel.cpp
new/yast2-control-center-4.1.7/src/yqmodulesmodel.cpp
--- old/yast2-control-center-4.1.6/src/yqmodulesmodel.cpp 2019-02-14
14:12:22.000000000 +0100
+++ new/yast2-control-center-4.1.7/src/yqmodulesmodel.cpp 2019-03-04
13:35:13.000000000 +0100
@@ -65,8 +65,6 @@
QString alt_dir = QString( getenv( "YAST2_DESKTOP_DIR") );
addDesktopFilesPath( alt_dir.isEmpty() ? default_dir : alt_dir );
- addIconPath( ICON_DIR );
- addIconPath( FALLBACK_ICON_DIR );
removeEmptyGroups();
}
