Hello community,
here is the log from the commit of package libyui-qt for openSUSE:Factory
checked in at 2018-12-31 09:44:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt"
Mon Dec 31 09:44:22 2018 rev:53 rq:659317 version:2.49.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2018-11-02
10:49:39.682289175 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt.new.28833/libyui-qt.changes
2018-12-31 09:44:23.938314412 +0100
@@ -1,0 +2,36 @@
+Tue Dec 18 14:01:56 UTC 2018 - Stefan Hundhammer <shundham...@suse.com>
+
+- YImage: Fall back to compiled-in Qt resources (bsc#1119688)
+- 2.49.13
+
+-------------------------------------------------------------------
+Tue Dec 18 13:48:15 CET 2018 - aschn...@suse.com
+
+- log QIcon::themeName (for bsc#1119688)
+- 2.49.12
+
+-------------------------------------------------------------------
+Wed Dec 5 16:57:32 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Ship only primary icons with module to avoid conflicts (boo#1118521)
+- 2.49.11
+
+-------------------------------------------------------------------
+Mon Nov 19 13:42:59 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Fix YQTree's icon loading function (boo#1116562)
+- Fix padding on the left caused by deprecated dialog icon
+ (boo#1116278)
+
+-------------------------------------------------------------------
+Thu Nov 15 01:42:27 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Destroy sidebar where necessary (boo#1115994)
+
+-------------------------------------------------------------------
+Tue Nov 13 07:59:24 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Use native icon theme methods (boo#1109378)
+- 2.49.8
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-2.49.7.tar.bz2
New:
----
libyui-qt-2.49.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-doc.spec ++++++
--- /var/tmp/diff_new_pack.oI56qA/_old 2018-12-31 09:44:24.398314034 +0100
+++ /var/tmp/diff_new_pack.oI56qA/_new 2018-12-31 09:44:24.398314034 +0100
@@ -20,7 +20,7 @@
%define so_version 9
Name: %{parent}-doc
-Version: 2.49.7
+Version: 2.49.13
Release: 0
Source: %{parent}-%{version}.tar.bz2
++++++ libyui-qt.spec ++++++
--- /var/tmp/diff_new_pack.oI56qA/_old 2018-12-31 09:44:24.414314022 +0100
+++ /var/tmp/diff_new_pack.oI56qA/_new 2018-12-31 09:44:24.418314018 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt
-Version: 2.49.7
+Version: 2.49.13
Release: 0
Source: %{name}-%{version}.tar.bz2
++++++ libyui-qt-2.49.7.tar.bz2 -> libyui-qt-2.49.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/SOURCECONF.cmake
new/libyui-qt-2.49.13/SOURCECONF.cmake
--- old/libyui-qt-2.49.7/SOURCECONF.cmake 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/SOURCECONF.cmake 2018-12-18 15:11:48.000000000
+0100
@@ -1,3 +1,5 @@
+set(CMAKE_AUTORCC ON)
+
SET( ${TARGETLIB}_WRAP_UI
QHelpDialog.ui
QStyleEditor.ui
@@ -64,6 +66,7 @@
YQWizard.cc
YQWizardButton.cc
QY2StyleEditor.cc
+ qt_icons.qrc
)
SET( ${TARGETLIB}_HEADERS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/VERSION.cmake
new/libyui-qt-2.49.13/VERSION.cmake
--- old/libyui-qt-2.49.7/VERSION.cmake 2018-10-16 14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/VERSION.cmake 2018-12-18 15:11:48.000000000 +0100
@@ -1,6 +1,6 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "49")
-SET(VERSION_PATCH "7")
+SET(VERSION_PATCH "13")
SET( VERSION
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
##### This is needed for the libyui-qt core ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/package/libyui-qt-doc.spec
new/libyui-qt-2.49.13/package/libyui-qt-doc.spec
--- old/libyui-qt-2.49.7/package/libyui-qt-doc.spec 2018-10-16
14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/package/libyui-qt-doc.spec 2018-12-18
15:11:48.000000000 +0100
@@ -20,7 +20,7 @@
%define so_version 9
Name: %{parent}-doc
-Version: 2.49.7
+Version: 2.49.13
Release: 0
Source: %{parent}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/package/libyui-qt.changes
new/libyui-qt-2.49.13/package/libyui-qt.changes
--- old/libyui-qt-2.49.7/package/libyui-qt.changes 2018-10-16
14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/package/libyui-qt.changes 2018-12-18
15:11:48.000000000 +0100
@@ -1,4 +1,40 @@
-------------------------------------------------------------------
+Tue Dec 18 14:01:56 UTC 2018 - Stefan Hundhammer <shundham...@suse.com>
+
+- YImage: Fall back to compiled-in Qt resources (bsc#1119688)
+- 2.49.13
+
+-------------------------------------------------------------------
+Tue Dec 18 13:48:15 CET 2018 - aschn...@suse.com
+
+- log QIcon::themeName (for bsc#1119688)
+- 2.49.12
+
+-------------------------------------------------------------------
+Wed Dec 5 16:57:32 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Ship only primary icons with module to avoid conflicts (boo#1118521)
+- 2.49.11
+
+-------------------------------------------------------------------
+Mon Nov 19 13:42:59 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Fix YQTree's icon loading function (boo#1116562)
+- Fix padding on the left caused by deprecated dialog icon
+ (boo#1116278)
+
+-------------------------------------------------------------------
+Thu Nov 15 01:42:27 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Destroy sidebar where necessary (boo#1115994)
+
+-------------------------------------------------------------------
+Tue Nov 13 07:59:24 UTC 2018 - Stasiek Michalski <hel...@mailbox.org>
+
+- Use native icon theme methods (boo#1109378)
+- 2.49.8
+
+-------------------------------------------------------------------
Sat Oct 13 00:36:14 UTC 2018 - Stasiek Michalski <hel...@opensuse.org>
- Fix style disappearing from sidebar (boo#1111720)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/package/libyui-qt.spec
new/libyui-qt-2.49.13/package/libyui-qt.spec
--- old/libyui-qt-2.49.7/package/libyui-qt.spec 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/package/libyui-qt.spec 2018-12-18
15:11:48.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-qt
-Version: 2.49.7
+Version: 2.49.13
Release: 0
Source: %{name}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/QY2HelpDialog.cc
new/libyui-qt-2.49.13/src/QY2HelpDialog.cc
--- old/libyui-qt-2.49.7/src/QY2HelpDialog.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/QY2HelpDialog.cc 2018-12-18 15:11:48.000000000
+0100
@@ -32,9 +32,6 @@
#include "YQUI.h"
#include "QY2Styler.h"
-
-#include "icons/viewmag.xpm"
-
#ifdef TEXTDOMAIN
# undef TEXTDOMAIN
#endif
@@ -50,7 +47,9 @@
_ui = new Ui_QHelpDialog();
_ui->setupUi( this );
_ui->textBrowser->setText( helpText );
- _ui->label->setPixmap ( QPixmap( viewmag ) );
+ Q_INIT_RESOURCE(qt_icons);
+ QIcon icon = QIcon::fromTheme( "edit-find", QIcon( ":/edit-find" ) );
+ _ui->label->setPixmap ( icon.pixmap( QSize( 16, 16 ) ) );
connect( _ui->lineEdit, &pclass(_ui->lineEdit)::textEdited,
this, &pclass(this)::searchStringChanged );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQApplication.cc
new/libyui-qt-2.49.13/src/YQApplication.cc
--- old/libyui-qt-2.49.7/src/YQApplication.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/YQApplication.cc 2018-12-18 15:11:48.000000000
+0100
@@ -76,6 +76,8 @@
{
yuiDebug() << "YQApplication constructor start" << std::endl;
+ yuiMilestone() << "QIcon::themeName = '" << QIcon::themeName() << "'" <<
std::endl;
+
//setIconBasePath( ICONDIR "/icons/22x22/apps/" );
// the above works too, but let's try it the icon-loader way - FaTE #306356
iconLoader()->addIconSearchPath( ICONDIR "/icons/" );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQComboBox.cc
new/libyui-qt-2.49.13/src/YQComboBox.cc
--- old/libyui-qt-2.49.7/src/YQComboBox.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/YQComboBox.cc 2018-12-18 15:11:48.000000000
+0100
@@ -29,7 +29,6 @@
#include <qlabel.h>
#include <qcombobox.h>
#include <qlineedit.h>
-#include <qpixmap.h>
#define YUILogComponent "qt-ui"
#include <yui/YUILog.h>
@@ -122,11 +121,7 @@
if ( item->hasIconName() )
{
- string iconName = iconFullPath( item );
- icon = QIcon( iconName.c_str() );
-
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon \"" << iconName << "\"" <<
std::endl;
+ icon = YQUI::ui()->loadIcon( item->iconName() );
}
if ( icon.isNull() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQContextMenu.cc
new/libyui-qt-2.49.13/src/YQContextMenu.cc
--- old/libyui-qt-2.49.7/src/YQContextMenu.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/YQContextMenu.cc 2018-12-18 15:11:48.000000000
+0100
@@ -87,15 +87,11 @@
for ( YItemIterator it = begin; it != end; ++it )
{
YItem * item = *it;
- QPixmap icon;
+ QIcon icon;
if ( item->hasIconName() )
{
- std::string iconName = iconFullPath( item );
- icon = QPixmap( iconName.c_str() );
-
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon " << iconName << std::endl;
+ icon = YQUI::ui()->loadIcon( item->iconName() );
}
if ( item->hasChildren() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQGenericButton.cc
new/libyui-qt-2.49.13/src/YQGenericButton.cc
--- old/libyui-qt-2.49.7/src/YQGenericButton.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/YQGenericButton.cc 2018-12-18
15:11:48.000000000 +0100
@@ -26,7 +26,6 @@
#include <qpushbutton.h>
#include <qsize.h>
#include <qevent.h>
-#include <qpixmap.h>
#include <qevent.h>
#define YUILogComponent "qt-ui"
#include <yui/YUILog.h>
@@ -128,8 +127,10 @@
}
// Search for the icon - FaTE #306356
- qIconName = fromUTF8( YQUI::yqApp()->iconLoader()->findIcon( iconName ) );
- QPixmap icon( qIconName );
+ // qIconName = fromUTF8( YQUI::yqApp()->iconLoader()->findIcon( iconName
) );
+ // QPixmap icon( qIconName );
+ // Use method from Qt instead
+ QIcon icon = QIcon::fromTheme ( iconName.c_str() );
if ( icon.isNull() )
yuiWarning() << "Can't load icon \"" << qIconName << "\"" << std::endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQImage.cc
new/libyui-qt-2.49.13/src/YQImage.cc
--- old/libyui-qt-2.49.7/src/YQImage.cc 2018-10-16 14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQImage.cc 2018-12-18 15:11:48.000000000
+0100
@@ -34,6 +34,7 @@
#include "utf8.h"
#include "YQImage.h"
+using std::endl;
YQImage::YQImage( YWidget * parent,
@@ -62,50 +63,69 @@
void
YQImage::setImage( const std::string & fileName, bool animated )
{
- YImage::setImage ( fileName, animated );
+ YImage::setImage ( fileName, animated );
- if ( animated )
- {
- QMovie movie ( fromUTF8 ( imageFileName() ) );
-
- if ( movie.isValid() )
- {
- yuiError() << "Couldn't load animation from " << imageFileName() <<
std::endl;
- }
- else
+ if ( animated )
{
- yuiDebug() << "Loading animation from " << imageFileName() << std::endl;
- QLabel::setMovie ( &movie );
- }
- }
- else
- {
- QPixmap pixmap ( fromUTF8 ( imageFileName() ) );
+ QMovie movie ( fromUTF8 ( imageFileName() ) );
- if ( pixmap.isNull() )
- {
- yuiError() << "Couldn't load pixmap from " << imageFileName() <<
std::endl;
+ if ( movie.isValid() )
+ {
+ yuiError() << "Couldn't load animation from " << imageFileName()
<< endl;
+ }
+ else
+ {
+ yuiDebug() << "Loading animation from " << imageFileName() << endl;
+ QLabel::setMovie ( &movie );
+ }
}
else
{
- if ( autoScale() )
- {
- QImage scaledImg = pixmap.toImage();
- scaledImg = scaledImg.scaled ( this->width(), this->height(),
Qt::KeepAspectRatio );
- pixmap = pixmap.fromImage ( scaledImg );
- }
- _pixmapWidth = pixmap.size().width();
- _pixmapHeight = pixmap.size().height();
-
- yuiDebug() << "Loading image from " << imageFileName()
- << " (" << pixmap.size().width() << " x " <<
pixmap.size().height() << ")"
- << std::endl;
+ QPixmap pixmap;
- QLabel::setPixmap ( pixmap );
+ if ( QIcon::hasThemeIcon( imageFileName().c_str() ) ) // try the
desktop theme first
+ {
+ yuiDebug() << "Trying theme icon from " << imageFileName() << endl;
+ QIcon icon = QIcon::fromTheme(imageFileName().c_str());
+ pixmap = icon.pixmap(22);
+ }
+ else // try loading from a plain file
+ {
+ pixmap = QPixmap( fromUTF8 ( imageFileName() ) );
+ }
+ if ( pixmap.isNull() ) // if that failed, try loading from the
compiled-in Qt resource files
+ {
+ QString name = QString( ":/%1.svg" ).arg( fromUTF8 (
imageFileName() ) );
+ yuiDebug() << "Trying built-in Qt resource icon " << name << endl;
+ QIcon icon( name );
+ pixmap = icon.pixmap(22);
+ }
+
+ if ( pixmap.isNull() )
+ {
+ yuiError() << "Couldn't load pixmap from " << imageFileName() <<
endl;
+ }
+ else
+ {
+ if ( autoScale() )
+ {
+ QImage scaledImg = pixmap.toImage();
+ scaledImg = scaledImg.scaled( this->width(), this->height(),
Qt::KeepAspectRatio );
+ pixmap = pixmap.fromImage( scaledImg );
+ }
+ _pixmapWidth = pixmap.size().width();
+ _pixmapHeight = pixmap.size().height();
+
+ yuiDebug() << "Loading image from " << imageFileName()
+ << " (" << pixmap.size().width() << " x " <<
pixmap.size().height() << ")"
+ << endl;
+
+ QLabel::setPixmap ( pixmap );
+ }
}
- }
}
+
void YQImage::setAutoScale( bool newAutoScale )
{
if ( autoScale() == newAutoScale )
@@ -170,7 +190,7 @@
void YQImage::setEnabled( bool enable )
{
- yuiDebug() << "setEnabled: " << enable << std::endl;
+ yuiDebug() << "setEnabled: " << enable << endl;
if (enable)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQImage.h
new/libyui-qt-2.49.13/src/YQImage.h
--- old/libyui-qt-2.49.7/src/YQImage.h 2018-10-16 14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQImage.h 2018-12-18 15:11:48.000000000 +0100
@@ -44,9 +44,9 @@
* 'animated' indicates if 'imageFileName' is an animated image format
* (e.g., MNG).
**/
- YQImage( YWidget * parent,
- const std::string & imageFileName,
- bool animated = false );
+ YQImage( YWidget * parent,
+ const std::string & imageFileName,
+ bool animated = false );
/**
* Destructor.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQMenuButton.cc
new/libyui-qt-2.49.13/src/YQMenuButton.cc
--- old/libyui-qt-2.49.7/src/YQMenuButton.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/YQMenuButton.cc 2018-12-18 15:11:48.000000000
+0100
@@ -103,15 +103,11 @@
for ( YItemIterator it = begin; it != end; ++it )
{
YItem * item = *it;
- QPixmap icon;
+ QIcon icon;
if ( item->hasIconName() )
{
- std::string iconName = iconFullPath( item );
- icon = QPixmap( iconName.c_str() );
-
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon " << iconName << std::endl;
+ icon = YQUI::ui()->loadIcon( item->iconName() );
}
if ( item->hasChildren() )
@@ -121,7 +117,7 @@
if ( icon.isNull() )
subMenu = parentMenu->addMenu( fromUTF8( item->label() ));
else
- subMenu = parentMenu->addMenu( QIcon( icon ), fromUTF8(
item->label() ));
+ subMenu = parentMenu->addMenu( icon, fromUTF8( item->label() ));
connect( subMenu, &pclass(subMenu)::triggered,
this, &pclass(this)::menuEntryActivated );
@@ -139,7 +135,7 @@
if ( icon.isNull() )
act = parentMenu->addAction( fromUTF8( item->label() ) );
else
- act = parentMenu->addAction( QIcon( icon ), fromUTF8(
item->label() ) );
+ act = parentMenu->addAction( icon, fromUTF8( item->label() ) );
_serials[act] = item->index();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQMultiSelectionBox.cc
new/libyui-qt-2.49.13/src/YQMultiSelectionBox.cc
--- old/libyui-qt-2.49.7/src/YQMultiSelectionBox.cc 2018-10-16
14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQMultiSelectionBox.cc 2018-12-18
15:11:48.000000000 +0100
@@ -346,13 +346,9 @@
if ( yItem->hasIconName() )
{
// _table is checked against 0 in the constructor
+ QIcon icon = YQUI::ui()->loadIcon( yItem->iconName() );
- string iconName = parent->iconFullPath( yItem->iconName() );
- QPixmap icon = QPixmap( iconName.c_str() );
-
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon " << iconName << std::endl;
- else
+ if ( !icon.isNull() )
setIcon( 0 /* column */, icon );
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQSelectionBox.cc
new/libyui-qt-2.49.13/src/YQSelectionBox.cc
--- old/libyui-qt-2.49.7/src/YQSelectionBox.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/YQSelectionBox.cc 2018-12-18 15:11:48.000000000
+0100
@@ -26,7 +26,6 @@
#include <QLabel>
#include <QListWidget>
#include <qnamespace.h>
-#include <QPixmap>
#include <QKeyEvent>
#include <QVBoxLayout>
#define YUILogComponent "qt-ui"
@@ -126,15 +125,11 @@
void YQSelectionBox::addItem( YItem * item, bool batchMode )
{
YSelectionBox::addItem( item );
- QPixmap icon;
+ QIcon icon;
if ( item->hasIconName() )
{
- string iconName = iconFullPath( item );
- icon = QPixmap( iconName.c_str() );
-
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon " << iconName << std::endl;
+ icon = icon = YQUI::ui()->loadIcon( item->iconName() );
}
if ( icon.isNull() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQTable.cc
new/libyui-qt-2.49.13/src/YQTable.cc
--- old/libyui-qt-2.49.7/src/YQTable.cc 2018-10-16 14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQTable.cc 2018-12-18 15:11:48.000000000
+0100
@@ -453,20 +453,16 @@
if ( cell->hasIconName() )
{
// _table is checked against 0 in the constructor
+ QIcon icon = icon = YQUI::ui()->loadIcon( cell->iconName() );
- string iconName = _table->iconFullPath( cell->iconName() );
- QPixmap icon = QPixmap( iconName.c_str() );
-
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon " << iconName << std::endl;
- else
+ if ( !icon.isNull() )
setData( column, Qt::DecorationRole, icon );
}
- else // No pixmap name
+ else // No icon name
{
- if ( ! data( column, Qt::DecorationRole ).isNull() ) // Was there a
pixmap before?
+ if ( ! data( column, Qt::DecorationRole ).isNull() ) // Was there an
icon before?
{
- setData( column, Qt::DecorationRole, QPixmap() ); // Set empty
pixmap
+ setData( column, Qt::DecorationRole, QIcon() ); // Set empty icon
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQTimezoneSelector.cc
new/libyui-qt-2.49.13/src/YQTimezoneSelector.cc
--- old/libyui-qt-2.49.7/src/YQTimezoneSelector.cc 2018-10-16
14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQTimezoneSelector.cc 2018-12-18
15:11:48.000000000 +0100
@@ -39,8 +39,7 @@
#include <QMouseEvent>
#include <QDebug>
#include <QToolTip>
-
-#include "icons/zoom-in.xpm"
+#include <QIcon>
class YQTimezoneSelectorPrivate
{
@@ -243,7 +242,10 @@
}
p.drawPixmap( ( width() - d->cachePix.width() ) / 2, ( height() -
d->cachePix.height() ) / 2, d->cachePix );
- setCursor( QCursor( QPixmap( zoom_in ) ) );
+ Q_INIT_RESOURCE(qt_icons);
+ QIcon icon = QIcon::fromTheme( "zoom-in", QIcon( ":/zoom-in" ) );
+ if ( !icon.isNull() )
+ setCursor( QCursor( icon.pixmap( QSize( 16, 16 ) ) ) );
} else {
int left = qMin( qMax( d->_zoom.x() - width() / 2, 0 ),
d->_pix.width() - width() );
int top = qMin( qMax( d->_zoom.y() - height() / 2, 0 ),
d->_pix.height() - height() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQTree.cc
new/libyui-qt-2.49.13/src/YQTree.cc
--- old/libyui-qt-2.49.7/src/YQTree.cc 2018-10-16 14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQTree.cc 2018-12-18 15:11:48.000000000 +0100
@@ -27,7 +27,7 @@
#include <QTreeWidget>
#include <QVBoxLayout>
#include <QString>
-#include <QPixmap>
+#include <QIcon>
#define YUILogComponent "qt-ui"
#include <yui/YUILog.h>
@@ -493,12 +493,12 @@
if ( _origItem->hasIconName() )
{
- string iconName = _tree->iconFullPath( _origItem );
- QPixmap icon( iconName.c_str() );
+ //YQTree is annoying with how it loads icons, this is an ugly
workaround
+ QIcon icon = QIcon( _tree->iconFullPath( _origItem ).c_str() );
+ if ( icon.isNull() )
+ icon = YQUI::ui()->loadIcon( _origItem->iconName() );
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon " << iconName << std::endl;
- else
+ if ( !icon.isNull() )
setData( 0, Qt::DecorationRole, icon );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQUI.cc
new/libyui-qt-2.49.13/src/YQUI.cc
--- old/libyui-qt-2.49.7/src/YQUI.cc 2018-10-16 14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQUI.cc 2018-12-18 15:11:48.000000000 +0100
@@ -691,6 +691,32 @@
yuiError() << "Client killed. Possibly caused by X server shutdown or
crash." << std::endl;
}
+QIcon YQUI::loadIcon( const string & iconName ) const
+{
+ QIcon icon;
+ const QString resource = ":/";
+ if ( QIcon::hasThemeIcon( iconName.c_str() ) )
+ {
+ yuiDebug() << "Trying theme icon from: " << iconName << std::endl;
+ icon = QIcon::fromTheme( iconName.c_str(), QIcon( resource +
iconName.c_str() ) );
+ }
+ if ( icon.isNull() )
+ {
+ yuiDebug() << "Trying icon from resource: " << iconName << std::endl;
+ icon = QIcon( resource + iconName.c_str() );
+
+ }
+
+ if ( icon.isNull() )
+ {
+ yuiDebug() << "Trying icon from path: " << iconName << std::endl;
+ icon = QIcon( iconName.c_str() );
+ }
+
+ if ( icon.isNull() )
+ yuiWarning() << "Couldn't load icon: " << iconName << std::endl;
+ return icon;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQUI.h
new/libyui-qt-2.49.13/src/YQUI.h
--- old/libyui-qt-2.49.7/src/YQUI.h 2018-10-16 14:04:32.000000000 +0200
+++ new/libyui-qt-2.49.13/src/YQUI.h 2018-12-18 15:11:48.000000000 +0100
@@ -28,6 +28,7 @@
#include <qapplication.h>
#include <QMap>
#include <QTimer>
+#include <QIcon>
#include <vector>
#include <type_traits>
@@ -286,6 +287,8 @@
**/
void setApplicationTitle(const QString& title) { _applicationTitle=title; }
+ QIcon loadIcon( const string& iconName ) const;
+
protected:
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/YQWizard.cc
new/libyui-qt-2.49.13/src/YQWizard.cc
--- old/libyui-qt-2.49.7/src/YQWizard.cc 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/YQWizard.cc 2018-12-18 15:11:48.000000000
+0100
@@ -46,6 +46,7 @@
#include <qtabwidget.h>
#include <qtoolbutton.h>
#include <QGraphicsDropShadowEffect>
+#include <QFileInfo>
#include "QY2ListView.h"
#include "QY2Styler.h"
@@ -114,7 +115,7 @@
setWidgetRep( this );
//either main wizard with `opt(`stepsEnabled), or sub-wizard of
steps-enabled wizard
- _stepsEnabled = ( (wizardMode == YWizardMode_Steps) || main_wizard );
+ _stepsEnabled = (wizardMode == YWizardMode_Steps);
_treeEnabled = (wizardMode == YWizardMode_Tree);
_stepsRegistered = false;
@@ -151,23 +152,23 @@
if( topLevelWidget()->windowTitle().isEmpty() )
{
topLevelWidget()->setWindowTitle ( YQUI::ui()->applicationTitle() );
- QPixmap pixmap ( YUI::app()->applicationIcon().c_str() );
- if ( !pixmap.isNull() )
- setWindowIcon ( QIcon ( pixmap ) );
+ QString icon_name = QFileInfo( YUI::app()->applicationIcon().c_str()
).baseName();
+ setWindowIcon ( QIcon::fromTheme( icon_name, QIcon(
YUI::app()->applicationIcon().c_str() ) ) );
}
layout->addLayout( layoutSideBar( this ) );
layout->addWidget( layoutWorkArea( this ) );
- setStretchFactor(indexOf(_sideBar),0);
- setStretchFactor(indexOf(_workArea),1);
+ setStretchFactor( indexOf( _sideBar ), 0 );
+ setStretchFactor( indexOf( _workArea ), 1 );
+ setCollapsible( indexOf( _sideBar ), false );
/* If steps are enabled, we want to delay
the registering for after we have steps registered */
if ( !_stepsEnabled )
QY2Styler::styler()->registerWidget( this );
- if ( !main_wizard && _stepsEnabled )
+ if ( !main_wizard )
{
main_wizard = this;
}
@@ -778,6 +779,7 @@
headingHBox->addWidget( _dialogIcon );
_dialogIcon->setSizePolicy( QSizePolicy( QSizePolicy::Minimum,
QSizePolicy::Minimum ) ); // hor/vert
_dialogIcon->setObjectName( "DialogIcon" );
+ _dialogIcon->hide();
_dialogHeading = new QLabel( _workArea );
YUI_CHECK_NEW( _dialogHeading );
@@ -999,15 +1001,20 @@
QPixmap icon( iconName.c_str() );
if ( icon.isNull() )
+ {
+ _dialogIcon->hide();
yuiWarning() << "Couldn't load dialog icon \"" << iconName <<
"\"" << std::endl;
+ }
else
{
+ _dialogIcon->show();
_dialogIcon->setPixmap( icon );
topLevelWidget()->setWindowIcon( icon );
}
}
else
{
+ _dialogIcon->hide();
_dialogIcon->clear();
topLevelWidget()->setWindowIcon( QIcon() );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/computer.svg
new/libyui-qt-2.49.13/src/icons/computer.svg
--- old/libyui-qt-2.49.7/src/icons/computer.svg 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-qt-2.49.13/src/icons/computer.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M3
1c-1.108 0-2 .892-2 2v7c0 1.108.892 2 2 2h10c1.108 0 2-.892
2-2V3c0-1.108-.892-2-2-2zm0 2h10v7H3zm2 10c-.554 0-1 .446-1
1v1h8v-1c0-.554-.446-1-1-1z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/configure.svg
new/libyui-qt-2.49.13/src/icons/configure.svg
--- old/libyui-qt-2.49.7/src/icons/configure.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/configure.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M7
1l-.777 2.332a5 5 0 0 0-.268.11L3.758 2.343 2.344 3.758l1.1 2.199a5 5 0 0
0-.116.268L1 7v2l2.332.777a5 5 0 0 0 .11.268l-1.098 2.197 1.414 1.414
2.199-1.1a5 5 0 0 0 .268.116L7 15h2l.777-2.332a5 5 0 0 0 .268-.11l2.197 1.098
1.414-1.414-1.1-2.199a5 5 0 0 0 .116-.268L15 9V7l-2.332-.777a5 5 0 0
0-.11-.268l1.098-2.197-1.414-1.414-2.199 1.1a5 5 0 0 0-.268-.116L9 1zm1 3a4 4 0
0 1 2.87 1.213A4 4 0 0 1 12 8a4 4 0 0 1-1.213 2.87A4 4 0 0 1 8 12a4 4 0 0
1-2.87-1.213A4 4 0 0 1 4 8a4 4 0 0 1 1.213-2.87A4 4 0 0 1 8 4z"
fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-error.svg
new/libyui-qt-2.49.13/src/icons/dialog-error.svg
--- old/libyui-qt-2.49.7/src/icons/dialog-error.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/dialog-error.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><circle cx="8"
cy="8" fill="#fff" r="8"/><circle cx="8" cy="8" fill="#e01b24" r="6"/><path
d="M4 7h8v2H4z" fill="#fff"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-information.svg
new/libyui-qt-2.49.13/src/icons/dialog-information.svg
--- old/libyui-qt-2.49.7/src/icons/dialog-information.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/dialog-information.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><circle cx="8"
cy="8" fill="#fff" r="8"/><circle cx="8" cy="8" fill="#3584e4" r="6"/><g
fill="#fff"><rect height="2" ry="1" width="2" x="7" y="4"/><path d="M7
7h2v5H7z"/></g></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-question.svg
new/libyui-qt-2.49.13/src/icons/dialog-question.svg
--- old/libyui-qt-2.49.7/src/icons/dialog-question.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/dialog-question.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M7.97
0a2 2 0 0 0-1.384.586l-6 6a2 2 0 0 0 0 2.828l6 6a2 2 0 0 0 2.828 0l6-6a2 2 0 0
0 0-2.828l-6-6A2 2 0 0 0 7.971 0z" fill="#fff"/><path d="M8 2L2 8l6 6 6-6z"
fill="#3584e4"/><g fill="#fff"><path d="M7 11h1v1H7zm1-6c-1.108 0-2 .892-2
2h1c0-.554.446-1 1-1s1 .446 1 1-.446 1-1 1v1c1.108 0 2-.892
2-2s-.892-2-2-2z"/><path d="M7 8h1v2H7z"/></g></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/dialog-warning.svg
new/libyui-qt-2.49.13/src/icons/dialog-warning.svg
--- old/libyui-qt-2.49.7/src/icons/dialog-warning.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/dialog-warning.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M8 1a1
1 0 0 0-.807.494l-7 12a1 1 0 0 0 .864 1.504h14a1 1 0 0 0 .863-1.504l-7-12A1 1 0
0 0 8 1z"/><path d="M8.057 3.98L2.795 13h10.523z" fill="#f6d32d"/><path d="M7
7h2v3H7zm0 4h2v1H7z"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libyui-qt-2.49.7/src/icons/drive-harddisk-encrypted.svg
new/libyui-qt-2.49.13/src/icons/drive-harddisk-encrypted.svg
--- old/libyui-qt-2.49.7/src/icons/drive-harddisk-encrypted.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/drive-harddisk-encrypted.svg
2018-12-18 15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M3
0C1.892 0 1 .892 1 2v12c0 1.108.892 2 2
2h6v-2H3V2h10v6h2V2c0-1.108-.892-2-2-2zm5 3C5.784 3 4 4.784 4 7s1.784 4 4
4c.349 0 .68-.061 1-.146v-.35l-.73-2.559C8.182 7.97 8.096 8 8 8c-.554
0-1-.446-1-1s.446-1 1-1a.998.998 0 0 1 .926 1.371L10.5
8h1.355c.085-.32.145-.652.145-1 0-2.216-1.784-4-4-4zm5 6c-1.108 0-2 .892-2
2v1h-1v4h6v-4h-1v-1c0-1.108-.892-2-2-2zm0 1c.554 0 1 .446 1
1v1h-2v-1c0-.554.446-1 1-1z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-harddisk.svg
new/libyui-qt-2.49.13/src/icons/drive-harddisk.svg
--- old/libyui-qt-2.49.7/src/icons/drive-harddisk.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/drive-harddisk.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M3
0C1.892 0 1 .892 1 2v12c0 1.108.892 2 2 2h10c1.108 0 2-.892
2-2V2c0-1.108-.892-2-2-2zm0 2h10v12H3zm5 1C5.784 3 4 4.784 4 7s1.784 4 4 4c.382
0 .744-.069 1.094-.168L8.27 7.945C8.182 7.97 8.096 8 8 8c-.554
0-1-.446-1-1s.446-1 1-1a.998.998 0 0 1 .926 1.371l2.785 1.113A3.991 3.991 0 0 0
8 3zm1 5l1.203 4.574c.14.534.957.531 1.399.2.441-.332.552-.976.199-1.401z"
fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-multidisk.svg
new/libyui-qt-2.49.13/src/icons/drive-multidisk.svg
--- old/libyui-qt-2.49.7/src/icons/drive-multidisk.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/drive-multidisk.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M3
0C1.892 0 1 .892 1 2v10c0 1.108.892 2 2 2h8c1.108 0 2-.892
2-2V2c0-1.108-.892-2-2-2zm0 2h8v10H3zm11 1v12H3c0 .554.446 1 1 1h10c.554 0
1-.446 1-1V4c0-.554-.446-1-1-1zM7 3C5.338 3 4 4.338 4 6a2.993 2.993 0 0 0 3.588
2.941l-.393-1.96a1 1 0 1 1 .698-.534l1.78.89C9.877 6.935 10 6.485 10
6c0-1.662-1.338-3-3-3z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-multipartition.svg
new/libyui-qt-2.49.13/src/icons/drive-multipartition.svg
--- old/libyui-qt-2.49.7/src/icons/drive-multipartition.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/drive-multipartition.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><g
fill="#c0bfbc"><path d="M3 0C1.892 0 1 .892 1 2v10c0 1.108.892 2 2
2h5v-2H3V2h8v6h2V2c0-1.108-.892-2-2-2zm4 3C5.338 3 4 4.338 4 6a2.993 2.993 0 0
0 3.588 2.941l-.393-1.96a1 1 0 1 1 .698-.534l1.78.89C9.877 6.935 10 6.485 10
6c0-1.662-1.338-3-3-3zm7 0v5h1V4c0-.554-.446-1-1-1zM3 15c0 .554.446 1 1
1h4v-1H4z"/><path d="M12.5 8.95a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7zM13 10a2.5
2.5 0 0 1-.5 4.95 2.5 2.5 0 0 1-2.445-2H13z"/></g></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/drive-partition.svg
new/libyui-qt-2.49.13/src/icons/drive-partition.svg
--- old/libyui-qt-2.49.7/src/icons/drive-partition.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/drive-partition.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M3
0C1.892 0 1 .892 1 2v12c0 1.108.892 2 2
2h5v-2H3V2h10v6h2V2c0-1.108-.892-2-2-2zm5 3C5.784 3 4 4.784 4 7s1.784 4 4
4V8c-.554 0-1-.446-1-1s.446-1 1-1a.998.998 0 0 1 .926 1.371L10.5
8h1.355c.085-.32.145-.652.145-1 0-2.216-1.784-4-4-4zm0 5h.285l-.015-.055C8.182
7.97 8.096 8 8 8zm4.5 1A3.5 3.5 0 0 0 9 12.5a3.5 3.5 0 0 0 3.5 3.5 3.5 3.5 0 0
0 3.5-3.5A3.5 3.5 0 0 0 12.5 9zm.5 1.05a2.5 2.5 0 0 1 2 2.45 2.5 2.5 0 0 1-2.5
2.5 2.5 2.5 0 0 1-2.445-2H13z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/edit-find.svg
new/libyui-qt-2.49.13/src/icons/edit-find.svg
--- old/libyui-qt-2.49.7/src/icons/edit-find.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/edit-find.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:cc="http://creativecommons.org/ns#";
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
xmlns:svg="http://www.w3.org/2000/svg"; xmlns="http://www.w3.org/2000/svg";
width="16" height="16" viewBox="0 0 16 16.000001" version="1.1" id="svg4243">
+<!--
+
+Copyright (C) 2018 Stasiek Michalski <hel...@opensuse.org>
+
+This image is freely licensed under the terms of Creative
+Commons Attribution-ShareAlike 4.0 International license.
+You can read terms of the license on:
+https://creativecommons.org/licenses/by-sa/4.0/legalcode
+
+-->
+ <defs
+ id="defs4237" />
+ <metadata
+ id="metadata4240">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path
+ id="path823"
+ d="M 6,0 C 2.6862915,0 0,2.6862915 0,6 c 0,3.3137085 2.6862915,6 6,6
1.2450211,-0.0018 2.458645,-0.390881 3.4726562,-1.113281 1.6067708,1.60677
3.2135418,3.213541 4.8203128,4.820312 l 1.414062,-1.414062 C
14.069214,12.655153 12.583263,11.169201 10.884766,9.4707031 11.607475,8.4574674
11.997214,7.2445668 12,6 12,2.6862915 9.3137085,0 6,0 Z m 0,2 c 2.209139,0
4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 C 3.790861,10 2,8.209139 2,6
2,3.790861 3.790861,2 6,2 Z"
+
style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/emblem-warning.svg
new/libyui-qt-2.49.13/src/icons/emblem-warning.svg
--- old/libyui-qt-2.49.7/src/icons/emblem-warning.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/emblem-warning.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M7.977
0a1 1 0 0 0-.858.525l-7 13A1 1 0 0 0 1 15h14a1 1 0 0 0 .88-1.475l-7-13A1 1 0 0
0 7.978 0zM7 4h2v6H7zm0 7h2v2H7z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/folder-remote.svg
new/libyui-qt-2.49.13/src/icons/folder-remote.svg
--- old/libyui-qt-2.49.7/src/icons/folder-remote.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/folder-remote.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M2
0C.892 0 0 .892 0 2v13c0 .554.446 1 1 1h14c.554 0 1-.446
1-1V4c0-.554-.446-1-1-1H9V2c0-1.108-.892-2-2-2zm8.5 5c.831 0 1.5.669 1.5
1.5S11.331 8 10.5 8c-.316 0-.608-.098-.85-.264L6.12 9.504l3.528 1.762A1.497
1.497 0 0 1 12 12.5c0 .831-.669 1.5-1.5 1.5S9 13.331 9
12.5c0-.143.027-.277.064-.408L5.69 10.406A1.497 1.497 0 0 1 3 9.5a1.497 1.497 0
0 1 2.694-.902l3.371-1.69A1.488 1.488 0 0 1 9 6.5c0-.831.669-1.5 1.5-1.5z"
fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/media-removable.svg
new/libyui-qt-2.49.13/src/icons/media-removable.svg
--- old/libyui-qt-2.49.7/src/icons/media-removable.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/media-removable.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M4
6v6c0 2.216 1.784 4 4 4s4-1.784 4-4V6H8zm1 1h6v1H5zm0 2h6v1H5zm0 2h6v1H5zM5
1v4h6V1zm1 1h1v1H6zm3 0h1v1H9z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/view-list-text.svg
new/libyui-qt-2.49.13/src/icons/view-list-text.svg
--- old/libyui-qt-2.49.7/src/icons/view-list-text.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/view-list-text.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M3
9h8c.554 0 1 .446 1 1s-.446 1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1zm0 4h4c.554 0
1 .446 1 1s-.446 1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1zm0-8h10c.554 0 1 .446 1
1s-.446 1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1zm0-4h6c.554 0 1 .446 1 1s-.446
1-1 1H3c-.554 0-1-.446-1-1s.446-1 1-1z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/view-list-tree.svg
new/libyui-qt-2.49.13/src/icons/view-list-tree.svg
--- old/libyui-qt-2.49.7/src/icons/view-list-tree.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/view-list-tree.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><path d="M10
13h5v1h-5zm0-5h5v1h-5zM6 2v2h9V2zM2 6v8h3v-1H3V9h2V8H3V6zm5 6h1c.554 0 1 .446 1
1v1c0 .554-.446 1-1 1H7c-.554 0-1-.446-1-1v-1c0-.554.446-1 1-1zm0-5h1c.554 0 1
.446 1 1v1c0 .554-.446 1-1 1H7c-.554 0-1-.446-1-1V8c0-.554.446-1 1-1zM2
1h2c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1
1-1z" fill="#c0bfbc"/></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/view-list.svg
new/libyui-qt-2.49.13/src/icons/view-list.svg
--- old/libyui-qt-2.49.7/src/icons/view-list.svg 1970-01-01
01:00:00.000000000 +0100
+++ new/libyui-qt-2.49.13/src/icons/view-list.svg 2018-12-18
15:11:48.000000000 +0100
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg";><g
fill="#c0bfbc"><rect height="4" ry="1" width="4" x="2" y="1"/><rect height="4"
ry="1" width="4" x="2" y="6"/><path d="M7 2h7v2H7zm0 5h7v2H7z"/><rect
height="4" ry="1" width="4" x="2" y="11"/><path d="M7 12h7v2H7z"/></g></svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/viewmag.xpm
new/libyui-qt-2.49.13/src/icons/viewmag.xpm
--- old/libyui-qt-2.49.7/src/icons/viewmag.xpm 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/icons/viewmag.xpm 1970-01-01 01:00:00.000000000
+0100
@@ -1,133 +0,0 @@
-/* XPM */
-static const char *viewmag[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 111 2",
-" c #7A4D27",
-". c #61596B",
-"X c #6E6F7D",
-"o c #874D18",
-"O c #A05A13",
-"+ c #AF6816",
-"@ c #BD7116",
-"# c #855427",
-"$ c #94622D",
-"% c #A36E2C",
-"& c #815C41",
-"* c #81624C",
-"= c #AD7E4A",
-"- c #D5902D",
-"; c #D7902C",
-": c #D8912B",
-"> c #DF9A33",
-", c #D1A65A",
-"< c #D7AE63",
-"1 c #D2B16D",
-"2 c #D1B16E",
-"3 c #DAB66D",
-"4 c #F3CC77",
-"5 c #F5D07A",
-"6 c #F5D07B",
-"7 c #707482",
-"8 c #887D81",
-"9 c #7F8188",
-"0 c #7E8289",
-"q c #83848A",
-"w c #86898D",
-"e c #998C8D",
-"r c #838993",
-"t c #8C8D91",
-"y c #8C8C94",
-"u c #8E8F97",
-"i c #888898",
-"p c #89909A",
-"a c #8E939D",
-"s c #8E929F",
-"d c #8E949D",
-"f c #929499",
-"g c #91979E",
-"h c #A0A8B2",
-"j c #A6AEB7",
-"k c #AAAEB8",
-"l c #ACB0B6",
-"z c #AEB2B9",
-"x c #ACB3BB",
-"c c #AFB5BB",
-"v c #B0B6BB",
-"b c #B1B6BC",
-"n c #B1BAC1",
-"m c #B4BDC3",
-"M c #B4BEC4",
-"N c #B9C3C9",
-"B c #BBC5CA",
-"V c #BEC6CB",
-"C c #BDC7CC",
-"Z c #BEC8CD",
-"A c #BFC8CE",
-"S c #BFC9CE",
-"D c #C6C8C9",
-"F c #C4CACC",
-"G c #C3CCCE",
-"H c #C2CCD0",
-"J c #C3CDD0",
-"K c #C4CED2",
-"L c #C5CED3",
-"P c #C6CFD3",
-"I c #C7D1D5",
-"U c #C8D1D4",
-"Y c #C9D3D7",
-"T c #CBD4D7",
-"R c #CCD6D9",
-"E c #CDD7DA",
-"W c #CED8DA",
-"Q c #D1D5D5",
-"! c #D0D9DB",
-"~ c #D1DBDC",
-"^ c #D2DBDC",
-"/ c #D2DADD",
-"( c #D5DDDF",
-") c #D5DEDF",
-"_ c #D6DEE0",
-"` c #D6DFE0",
-"' c #D7E0E2",
-"] c #D8E1E2",
-"[ c #D9E2E3",
-"{ c #DAE2E2",
-"} c #DBE2E3",
-"| c #DDE5E5",
-" . c #DEE6E7",
-".. c #DFE7E7",
-"X. c #E1E1E2",
-"o. c #E0E7E8",
-"O. c #E0E8E8",
-"+. c #E1E8E9",
-"@. c #E2EAEA",
-"#. c #E3EAEA",
-"$. c #E6EAEA",
-"%. c #E6ECEC",
-"&. c #E7EDED",
-"*. c #E8EDED",
-"=. c #EBF0F0",
-"-. c #ECF0F1",
-";. c #EDF1F1",
-":. c #F0F4F4",
-">. c #F3F6F6",
-",. c #F8F9F9",
-"<. c None",
-/* pixels */
-"<.<.<.k x c b z <.<.<.<.<.<.<.<.",
-"<.<.j M C S A V v <.<.<.<.<.<.<.",
-"<.h N T ^ R K I U l <.<.<.<.<.<.",
-"s n Y ..*./ ` ~ ) F <.<.<.<.<.<.",
-"a B ! &.-._ o.| .{ f <.<.<.<.<.",
-"g Z P E ( +.&.%.*.%.t <.<.<.<.<.",
-"r S L ! } %.*.;.:.$.q <.<.<.<.<.",
-"7 m H R [ #.=.>.,.D <.<.<.<.<.<.",
-"<.p J W ] @.=.>.X.y <.<.<.<.<.<.",
-"<.<.d G ' O.*.Q u i e <.<.<.<.<.",
-"<.<.<.0 0 w 9 X <.8 = ; @ <.<.<.",
-"<.<.<.<.<.<.<.<.<.<., 6 > + <.<.",
-"<.<.<.<.<.<.<.<.<.<.% 3 5 : O <.",
-"<.<.<.<.<.<.<.<.<.<.<.$ 1 4 - o ",
-"<.<.<.<.<.<.<.<.<.<.<.<.# 2 < & ",
-"<.<.<.<.<.<.<.<.<.<.<.<.<. * . "
-};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/zoom-in.svg
new/libyui-qt-2.49.13/src/icons/zoom-in.svg
--- old/libyui-qt-2.49.7/src/icons/zoom-in.svg 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-qt-2.49.13/src/icons/zoom-in.svg 2018-12-18 15:11:48.000000000
+0100
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:cc="http://creativecommons.org/ns#";
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
xmlns:svg="http://www.w3.org/2000/svg"; xmlns="http://www.w3.org/2000/svg";
width="16" height="16" viewBox="0 0 16 16.000001" version="1.1" id="svg4243">
+<!--
+
+Copyright (C) 2018 Stasiek Michalski <hel...@opensuse.org>
+
+This image is freely licensed under the terms of Creative
+Commons Attribution-ShareAlike 4.0 International license.
+You can read terms of the license on:
+https://creativecommons.org/licenses/by-sa/4.0/legalcode
+
+-->
+ <defs
+ id="defs4237" />
+ <metadata
+ id="metadata4240">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path
+ id="path819"
+ d="M 5,3 V 9 H 7 V 3 Z"
+
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#33d17a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
/>
+ <path
+ id="path821"
+ d="M 3,5 V 7 H 9 V 5 Z"
+
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#33d17a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
/>
+ <path
+ id="path823"
+ d="M 6,0 C 2.6862915,0 0,2.6862915 0,6 c 0,3.3137085 2.6862915,6 6,6
1.2450211,-0.0018 2.458645,-0.390881 3.4726562,-1.113281 1.6067708,1.60677
3.2135418,3.213541 4.8203128,4.820312 l 1.414062,-1.414062 C
14.069214,12.655153 12.583263,11.169201 10.884766,9.4707031 11.607475,8.4574674
11.997214,7.2445668 12,6 12,2.6862915 9.3137085,0 6,0 Z m 0,2 c 2.209139,0
4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 C 3.790861,10 2,8.209139 2,6
2,3.790861 3.790861,2 6,2 Z"
+
style="opacity:1;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/icons/zoom-in.xpm
new/libyui-qt-2.49.13/src/icons/zoom-in.xpm
--- old/libyui-qt-2.49.7/src/icons/zoom-in.xpm 2018-10-16 14:04:32.000000000
+0200
+++ new/libyui-qt-2.49.13/src/icons/zoom-in.xpm 1970-01-01 01:00:00.000000000
+0100
@@ -1,162 +0,0 @@
-/* XPM */
-static const char *zoom_in[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 132 2",
-" c black",
-". c #010101",
-"X c #020202",
-"o c gray1",
-"O c gray2",
-"+ c #060606",
-"@ c #090909",
-"# c gray4",
-"$ c #0B0B0B",
-"% c #0E0E0E",
-"& c gray6",
-"* c #101010",
-"= c #111111",
-"- c #131313",
-"; c gray8",
-": c #1B1B1B",
-"> c gray11",
-", c gray12",
-"< c #202020",
-"1 c gray13",
-"2 c #222222",
-"3 c gray15",
-"4 c #272727",
-"5 c gray16",
-"6 c gray17",
-"7 c #2D2D2D",
-"8 c gray18",
-"9 c gray19",
-"0 c #313131",
-"q c #343434",
-"w c #3A3A3A",
-"e c gray23",
-"r c #3C3C3C",
-"t c #3F3F3F",
-"y c #414141",
-"u c gray26",
-"i c #434343",
-"p c #444444",
-"a c gray27",
-"s c #4C4C4C",
-"d c #515151",
-"f c gray34",
-"g c #5B5B5B",
-"h c gray37",
-"j c #5F5F5F",
-"k c gray38",
-"l c #676767",
-"z c #686868",
-"x c #6D6D6D",
-"c c gray45",
-"v c gray46",
-"b c #777777",
-"n c #797979",
-"m c gray48",
-"M c #909090",
-"N c #939393",
-"B c gray60",
-"V c #9A9A9A",
-"C c #9B9B9B",
-"Z c #9D9D9D",
-"A c gray63",
-"S c #A5A5A5",
-"D c #A7A7A7",
-"F c gray66",
-"G c gray67",
-"H c #B2B2B2",
-"J c #B4B4B4",
-"K c #B6B6B6",
-"L c gray72",
-"P c #B9B9B9",
-"I c gray73",
-"U c #BBBBBB",
-"Y c #BCBCBC",
-"T c gray74",
-"R c gray75",
-"E c #C1C1C1",
-"W c gray76",
-"Q c #C5C5C5",
-"! c #C6C6C6",
-"~ c gray78",
-"^ c #C8C8C8",
-"/ c gray79",
-"( c #CACACA",
-") c #CBCBCB",
-"_ c gray80",
-"` c #CDCDCD",
-"' c #CECECE",
-"] c gray81",
-"[ c #D0D0D0",
-"{ c gray82",
-"} c #D2D2D2",
-"| c LightGray",
-" . c gray83",
-".. c #D5D5D5",
-"X. c gray84",
-"o. c #D7D7D7",
-"O. c #D8D8D8",
-"+. c gray85",
-"@. c #DADADA",
-"#. c gray86",
-"$. c gainsboro",
-"%. c #DFDFDF",
-"&. c gray88",
-"*. c #E1E1E1",
-"=. c #E2E2E2",
-"-. c gray89",
-";. c #E4E4E4",
-":. c gray90",
-">. c #E6E6E6",
-",. c #E7E7E7",
-"<. c #E9E9E9",
-"1. c #EAEAEA",
-"2. c gray92",
-"3. c #ECECEC",
-"4. c gray93",
-"5. c #EEEEEE",
-"6. c #EFEFEF",
-"7. c gray94",
-"8. c #F1F1F1",
-"9. c gray95",
-"0. c #F3F3F3",
-"q. c #F4F4F4",
-"w. c gray96",
-"e. c #F6F6F6",
-"r. c #F8F8F8",
-"t. c #F9F9F9",
-"y. c gray98",
-"u. c #FBFBFB",
-"i. c gray99",
-"p. c #FDFDFD",
-"a. c #FEFEFE",
-"s. c None",
-/* pixels */
-"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.",
-"s.s.s.s.s.s.s.q 7 5 3 3 3 s.s.s.s.s.s.s.s.s.s.s.",
-"s.s.s.s.s.8 9 c A J H Z l < > s.s.s.s.s.s.s.s.s.",
-"s.s.s.s.4 k J ( ] [ ' / E D s - s.s.s.s.s.s.s.s.",
-"s.s.s.2 v ( | #.,.6.0.8.:.} Y h * s.s.s.s.s.s.s.",
-"s.s.1 g _ o.:.w.y.u.y.r.w.7.*.W i & s.s.s.s.s.s.",
-"s.s., P X.,.t.u.p.a a u.r.9.3.;.G % s.s.s.s.s.s.",
-"s.: x } *.w.y.p.a.a a i.t.w.5.>.#.f @ s.s.s.s.s.",
-"s.; F O.5.e.t.i.a.a a u.r.q.5.>.$.C + s.s.s.s.s.",
-"s.= Q %.6.w.p p a a a p i u 4.:.#.R + s.s.s.s.s.",
-"s.% ! -.3.9.i p p p p i u y 1.&.o.I O s.s.s.s.s.",
-"s.$ S *.,.4.8.q.e.i i 0.6.3.;.#.{ N X s.s.s.s.s.",
-"s.# j +.*.>.2.5.6.y y 4.<.;.#. .( s s.s.s.s.s.",
-"s.s.# J O.$.=.:.>.t t -.%.@. .) A X s.s.s.s.s.s.",
-"s.s.+ e _ } .@.#.@.#.O...[ ^ T 8 s.s.s.s.s.s.",
-"s.s.s.O d W ~ ) _ ` ) ) ^ W L a s.s.s.s.s.s.s.",
-"s.s.s.s.o 0 B U T Y Y Y K M 6 s.s.s.s.s.s.",
-"s.s.s.s.s.. o y m V V b r s. s.s.s.s.",
-"s.s.s.s.s.s.s. s.s.s.s.< < s.s.s.",
-"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. z q s.s.",
-"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. n w s.",
-"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. z , s.",
-"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s. s.s.",
-"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s."
-};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-qt-2.49.7/src/qt_icons.qrc
new/libyui-qt-2.49.13/src/qt_icons.qrc
--- old/libyui-qt-2.49.7/src/qt_icons.qrc 1970-01-01 01:00:00.000000000
+0100
+++ new/libyui-qt-2.49.13/src/qt_icons.qrc 2018-12-18 15:11:48.000000000
+0100
@@ -0,0 +1,24 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource>
+ <file alias="computer">icons/computer.svg</file>
+ <file alias="configure">icons/configure.svg</file>
+ <file alias="dialog-error">icons/dialog-error.svg</file>
+ <file
alias="dialog-information">icons/dialog-information.svg</file>
+ <file alias="dialog-question">icons/dialog-question.svg</file>
+ <file alias="dialog-warning">icons/dialog-warning.svg</file>
+ <file
alias="drive-harddisk-encrypted">icons/drive-harddisk-encrypted.svg</file>
+ <file alias="drive-harddisk">icons/drive-harddisk.svg</file>
+ <file alias="drive-multidisk">icons/drive-multidisk.svg</file>
+ <file
alias="drive-multipartition">icons/drive-multipartition.svg</file>
+ <file alias="drive-partition">icons/drive-partition.svg</file>
+ <file alias="edit-find">icons/edit-find.svg</file>
+ <file alias="emblem-warning">icons/emblem-warning.svg</file>
+ <file alias="folder-remote">icons/folder-remote.svg</file>
+ <file alias="media-removable">icons/media-removable.svg</file>
+ <file alias="view-list">icons/view-list.svg</file>
+ <file alias="view-list-text">icons/view-list-text.svg</file>
+ <file alias="view-list-tree">icons/view-list-tree.svg</file>
+ <file alias="zoom-in">icons/zoom-in.svg</file>
+ </qresource>
+</RCC>
