Merge pull request #59 from shundhammer/huha-missing-icons-01

Better error handling for missing package selector / pattern selector icons
libyui · Nov 6, 2018 · e66a3d2 · e66a3d2
2 parents c03570a + 6e23c8d
commit e66a3d2
Show file tree

Hide file tree

Showing 46 changed files with 174 additions and 156 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,12 +41,18 @@ CMakeCache.txt
 CMakeFiles
 /CMakeLists.txt
 Makefile
-cmake_install.cmake
 install_manifest.txt
+**/*.cmake
 
 # CMake project-bindir
 build*/
 
+# Misc
+CMakeDoxyfile.in
+Doxyfile
+libyui-qt-pkg.pc
+src/yui-qt-pkg_autogen
+
 # Archives
 # It's better to unpack these files and commit the raw source because
 # git has its own built in compression methods.

diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "45" )
-SET( VERSION_PATCH "22" )
+SET( VERSION_PATCH "23" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
 ##### This is need for the libyui core, ONLY.

diff --git a/package/libyui-qt-pkg-doc.spec b/package/libyui-qt-pkg-doc.spec
@@ -20,7 +20,7 @@
 %define so_version 9
 
 Name:           %{parent}-doc
-Version:        2.45.22
+Version:        2.45.23
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

diff --git a/package/libyui-qt-pkg.changes b/package/libyui-qt-pkg.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov  6 15:21:12 UTC 2018 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Better error handling for missing icons (bsc#1114654):
+  Error message in the y2log plus displaying a small red square for
+  missing icons.
+- 2.45.23
+
 -------------------------------------------------------------------
 Mon Oct 29 06:00:36 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
 

diff --git a/package/libyui-qt-pkg.spec b/package/libyui-qt-pkg.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libyui-qt-pkg
-Version:        2.45.22
+Version:        2.45.23
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 

diff --git a/src/YQIconPool.cc b/src/YQIconPool.cc
@@ -42,9 +42,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define YUILogComponent "qt-ui"
 #include "YUILog.h"
+#include "utf8.h"
 
 #include "YQIconPool.h"
 
+using std::endl;
+
 
 
 YQIconPool * YQIconPool::_iconPool = 0;
@@ -113,19 +116,46 @@ YQIconPool::cachedIcon( const QString icon_name, const bool enabled )
 
     if ( !iconPixmap )
     {
-        if ( QIcon::hasThemeIcon(icon_name) )
-        {
-            QIcon icon = QIcon::fromTheme(icon_name, QIcon( ":/" + icon_name ));
-            iconPixmap = icon.pixmap(QSize(16,16), enabled ? QIcon::Normal : QIcon::Disabled);
-        }
-        else
+        iconPixmap = loadIcon( icon_name, enabled );
+
+        if ( !iconPixmap )
         {
-            QIcon icon = QIcon( ":/" + icon_name );
-            iconPixmap = icon.pixmap(QSize(16,16), enabled ? QIcon::Normal : QIcon::Disabled);
+            // Create an icon for the cache to avoid more than one complaint
+            // and to have a clearly visible error icon (a small red square)
+            iconPixmap = QPixmap( 8, 8 );
+            iconPixmap.fill( Qt::red );
         }
     }
 
-    _iconCache.insert( icon_name + enabled, iconPixmap);
+    _iconCache.insert( icon_name + enabled, iconPixmap );
+
+    return iconPixmap;
+}
+
+
+QPixmap
+YQIconPool::loadIcon( const QString icon_name, const bool enabled )
+{
+    QPixmap iconPixmap = _iconCache[ icon_name + enabled ];
+
+    if ( QIcon::hasThemeIcon( icon_name ) )
+    {
+        yuiDebug() << "Loading theme icon " << icon_name << endl;
+
+        QIcon icon = QIcon::fromTheme( icon_name, QIcon( ":/" + icon_name ) );
+        iconPixmap = icon.pixmap( QSize( 16, 16 ), enabled ? QIcon::Normal : QIcon::Disabled );
+    }
+    else
+    {
+        yuiDebug() << "Loading built-in icon " << icon_name << endl;
+
+        QIcon icon = QIcon( ":/" + icon_name );
+        iconPixmap = icon.pixmap( QSize( 16, 16 ), enabled ? QIcon::Normal : QIcon::Disabled );
+    }
+
+    if ( !iconPixmap )
+        yuiError() << "Could not load icon " << icon_name << endl;
+
     return iconPixmap;
 }
 
diff --git a/src/YQIconPool.h b/src/YQIconPool.h
@@ -70,12 +70,12 @@ class YQIconPool
     static QPixmap disabledPkgProtected();
     static QPixmap disabledPkgTaboo();
     static QPixmap disabledPkgUpdate();
-    
+
     static QPixmap normalPkgConflict();
 
     static QPixmap treePlus();
     static QPixmap treeMinus();
-    
+
     static QPixmap warningSign();
     static QPixmap pkgSatisfied();
 
@@ -92,12 +92,20 @@ class YQIconPool
     static YQIconPool * iconPool();
 
     /**
-     * Return the cached icon for 'xpm_data' ( an included XPM file ).
-     * If the icon isn't in the cache yet, create it and store it in the
-     * cache.
+     * Return the cached icon for 'icon_name'. If the icon isn't in the cache
+     * yet, load it and store it in the cache.
+     *
+     * Return a red square as an error icon if there is no icon by that name.
      **/
     QPixmap cachedIcon(const QString icon_name, const bool enabled );
 
+    /**
+     * Load the icon for 'icon_name' from the icon theme or, if that fails,
+     * from the compiled-in icons (using the Qt resource system). Return a null
+     * pixmap if there is no such icon.
+     **/
+    QPixmap loadIcon( const QString icon_name, const bool enabled );
+
 private:
 
     /**
@@ -111,7 +119,7 @@ class YQIconPool
      **/
     virtual ~YQIconPool();
 
-    
+
     //
     // Data members
     //

diff --git a/src/YQPackageSelector.cc b/src/YQPackageSelector.cc
@@ -1850,4 +1850,3 @@ void YQPackageSelector::normalCursor()
 }
 
 
-#include "YQPackageSelector.moc"
diff --git a/src/YQPackageSelectorBase.cc b/src/YQPackageSelectorBase.cc
@@ -514,4 +514,3 @@ YQPkgSelWmCloseHandler::filter( YEvent * event )
 }
 
 
-#include "YQPackageSelectorBase.moc"
diff --git a/src/YQPatternSelector.cc b/src/YQPatternSelector.cc
@@ -341,4 +341,3 @@ YQPatternSelector::debugTrace()
 
 
 
-#include "YQPatternSelector.moc"
diff --git a/src/YQPkgChangeLogView.cc b/src/YQPkgChangeLogView.cc
@@ -148,4 +148,3 @@ QString YQPkgChangeLogView::notDisplayedChanges(int missing, const std::string &
     return msg.arg(QString::number(missing), cmd);
 }
 
-#include "YQPkgChangeLogView.moc"
diff --git a/src/YQPkgChangesDialog.cc b/src/YQPkgChangesDialog.cc
@@ -416,4 +416,3 @@ YQPkgUnsupportedPackagesDialog::showUnsupportedPackagesDialog( QWidget *	parent,
 }
 
 
-#include "YQPkgChangesDialog.moc"
diff --git a/src/YQPkgConflictDialog.cc b/src/YQPkgConflictDialog.cc
@@ -444,4 +444,3 @@ YQPkgConflictDialog::keyPressEvent( QKeyEvent * event )
 
 
 
-#include "YQPkgConflictDialog.moc"
diff --git a/src/YQPkgConflictList.cc b/src/YQPkgConflictList.cc
@@ -416,4 +416,3 @@ YQPkgConflict::saveToFile( QFile &file ) const
     file.write( "\n\n" );
 }
 
-#include "YQPkgConflictList.moc"
diff --git a/src/YQPkgDependenciesView.cc b/src/YQPkgDependenciesView.cc
@@ -202,4 +202,3 @@ YQPkgDependenciesView::htmlLines( const zypp::Capabilities & capSet )
 }
 
 
-#include "YQPkgDependenciesView.moc"
diff --git a/src/YQPkgDescriptionDialog.cc b/src/YQPkgDescriptionDialog.cc
@@ -199,4 +199,3 @@ YQPkgDescriptionDialog::showDescriptionDialog( const QString & pkgName )
 
 
 
-#include "YQPkgDescriptionDialog.moc"
diff --git a/src/YQPkgDescriptionView.cc b/src/YQPkgDescriptionView.cc
@@ -359,4 +359,3 @@ void YQPkgDescriptionView::initLang()
 }
 
 
-#include "YQPkgDescriptionView.moc"
diff --git a/src/YQPkgDiskUsageList.cc b/src/YQPkgDiskUsageList.cc
@@ -428,4 +428,3 @@ YQPkgWarningRangeNotifier::needWarning() const
 
 
 
-#include "YQPkgDiskUsageList.moc"
diff --git a/src/YQPkgDiskUsageWarningDialog.cc b/src/YQPkgDiskUsageWarningDialog.cc
@@ -180,4 +180,3 @@ YQPkgDiskUsageWarningDialog::diskUsageWarning( const QString & 	message,
 
 
 
-#include "YQPkgDiskUsageWarningDialog.moc"
diff --git a/src/YQPkgFileListView.cc b/src/YQPkgFileListView.cc
@@ -134,4 +134,3 @@ QString YQPkgFileListView::formatFileList( const list<string> & fileList ) const
 }
 
 
-#include "YQPkgFileListView.moc"
diff --git a/src/YQPkgFilterTab.cc b/src/YQPkgFilterTab.cc
@@ -728,4 +728,3 @@ YQPkgFilterTab::saveSettings()
 
 
 
-#include "YQPkgFilterTab.moc"
diff --git a/src/YQPkgGenericDetailsView.cc b/src/YQPkgGenericDetailsView.cc
@@ -261,4 +261,3 @@ YQPkgGenericDetailsView::hcell( QString contents )
 }
 
 
-#include "YQPkgGenericDetailsView.moc"
diff --git a/src/YQPkgHistoryDialog.cc b/src/YQPkgHistoryDialog.cc
@@ -319,4 +319,3 @@ YQPkgHistoryDialog::moveToAction ()
     }
 }
 
-#include "YQPkgHistoryDialog.moc"
diff --git a/src/YQPkgLangList.cc b/src/YQPkgLangList.cc
@@ -330,4 +330,3 @@ bool YQPkgLangListItem::operator<( const QTreeWidgetItem & otherListViewItem ) c
 
     return QY2ListViewItem::operator<( otherListViewItem );
 }
-#include "YQPkgLangList.moc"
diff --git a/src/YQPkgList.cc b/src/YQPkgList.cc
@@ -965,4 +965,3 @@ bool YQPkgListItem::operator< ( const QTreeWidgetItem & otherListViewItem ) cons
     return YQPkgObjListItem::operator<( otherListViewItem );
 }
 
-#include "YQPkgList.moc"
diff --git a/src/YQPkgObjList.cc b/src/YQPkgObjList.cc
@@ -394,7 +394,12 @@ YQPkgObjList::createActions()
     actionSetCurrentKeepInstalled	= createAction( S_KeepInstalled,	"[<], [-]"	);
     actionSetCurrentDelete		= createAction( S_Del,			"[-]"		);
     actionSetCurrentUpdate		= createAction( S_Update,		"[>], [+]"	);
-    actionSetCurrentUpdateForce		= createAction( _( "Update unconditionally" ),  statusIcon( S_Update, true )  ,statusIcon( S_Update, false ) , "", true ) ;
+
+    actionSetCurrentUpdateForce		= createAction( _( "Update unconditionally" ),
+                                                        statusIcon( S_Update, true ),
+                                                        statusIcon( S_Update, false ) ,
+                                                        "",
+                                                        true ) ;
 
 
 
@@ -557,7 +562,7 @@ void
 YQPkgObjList::updateActions( YQPkgObjListItem * item )
 {
     if ( !item)
-      item = dynamic_cast<YQPkgObjListItem *> ( currentItem() );
+        item = dynamic_cast<YQPkgObjListItem *> ( currentItem() );
 
     if ( item )
     {
@@ -799,6 +804,7 @@ YQPkgObjList::logExcludeStatistics()
     }
 }
 
+
 void
 YQPkgObjList::applyExcludeRules( QTreeWidgetItem * listViewItem )
 {
@@ -1655,7 +1661,7 @@ void YQPkgObjList::slotCustomContextMenu(const QPoint& pos)
 
         QMenu * contextMenu =
       	    ! item->selectable()->installedEmpty() ?
-              installedContextMenu() : notInstalledContextMenu();
+            installedContextMenu() : notInstalledContextMenu();
 
         if ( contextMenu )
             contextMenu->popup( viewport()->mapToGlobal( pos ) );
@@ -1675,4 +1681,3 @@ QTreeWidgetItem * YQPkgObjList::ExcludedItems::oldParentItem( QTreeWidgetItem *
 
 
 
-#include "YQPkgObjList.moc"
diff --git a/src/YQPkgPackageKitGroupsFilterView.cc b/src/YQPkgPackageKitGroupsFilterView.cc
@@ -232,8 +232,6 @@ YQPkgPackageKitGroupsFilterView::fillGroups()
 		group = itg->second;
 	    }
 
-	    //std::cout << it.asString() << std::endl;
-
 	    if ( _groupsMap.find(group) == _groupsMap.end() )
 	    {
 		_groupsMap[group] =  new YQPkgPackageKitGroup( this, group );
@@ -462,4 +460,3 @@ YQPkgPackageKitGroup::operator< ( const QTreeWidgetItem & otherListViewItem ) co
 }
 
 
-#include "YQPkgPackageKitGroupsFilterView.moc"
diff --git a/src/YQPkgPatchFilterView.cc b/src/YQPkgPatchFilterView.cc
@@ -225,4 +225,3 @@ YQPkgPatchFilterView::fillPatchList()
 }
 
 
-#include "YQPkgPatchFilterView.moc"
diff --git a/src/YQPkgPatchList.cc b/src/YQPkgPatchList.cc
@@ -672,4 +672,3 @@ bool YQPkgPatchCategoryItem::operator< ( const QTreeWidgetItem & otherListViewIt
 
 
 
-#include "YQPkgPatchList.moc"