Author: kmachalkova Date: Wed Jul 29 12:13:43 2009 New Revision: 58199 URL: http://svn.opensuse.org/viewcvs/yast?rev=58199&view=rev Log: Use YIconLoader Modified: trunk/qt/src/YQApplication.cc trunk/qt/src/YQGenericButton.cc trunk/qt/yast2-qt.spec.in Modified: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=58199&r1=58198&r2=58199&view=diff ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Wed Jul 29 12:13:43 2009 @@ -63,7 +63,9 @@ { yuiDebug() << "YQApplication constructor start" << endl; - setIconBasePath( ICONDIR "/icons/22x22/apps/" ); + //setIconBasePath( ICONDIR "/icons/22x22/apps/" ); + // the above works too, but let's try it the icon-loader way - FaTE #306356 + iconLoader()->addIconSearchPath( ICONDIR "/icons/" ); loadPredefinedQtTranslations(); yuiDebug() << "YQApplication constructor end" << endl; Modified: trunk/qt/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQGenericButton.cc?rev=58199&r1=58198&r2=58199&view=diff ============================================================================== --- trunk/qt/src/YQGenericButton.cc (original) +++ trunk/qt/src/YQGenericButton.cc Wed Jul 29 12:13:43 2009 @@ -121,7 +121,8 @@ return; } - qIconName = QString( ICONDIR ) + "/" + qIconName; + // Search for the icon - FaTE #306356 + qIconName = fromUTF8( YQUI::yqApp()->iconLoader()->findIcon( iconName ) ); QPixmap icon( qIconName ); if ( icon.isNull() ) Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=58199&r1=58198&r2=58199&view=diff ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Wed Jul 29 12:13:43 2009 @@ -18,8 +18,9 @@ Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.18.7 -Requires: yast2-libyui >= 2.18.7 +#YIconLoader +BuildRequires: yast2-libyui-devel >= 2.18.8 +Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org