Author: kmachalkova Date: Wed Jul 1 15:11:04 2009 New Revision: 57820 URL: http://svn.opensuse.org/viewcvs/yast?rev=57820&view=rev Log: Use defines for icon dirs (theme/current as default, hicolor as fallback) Modified: trunk/control-center/src/CMakeLists.txt trunk/control-center/src/yqmodulegroupsmodel.cpp trunk/control-center/src/yqmodulesmodel.cpp Modified: trunk/control-center/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/CMakeLists.txt?rev=57820&r1=57819&r2=57820&view=diff ============================================================================== --- trunk/control-center/src/CMakeLists.txt (original) +++ trunk/control-center/src/CMakeLists.txt Wed Jul 1 15:11:04 2009 @@ -7,6 +7,7 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG_OUTPUT) ADD_DEFINITIONS("-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/YaST2/locale\"") ADD_DEFINITIONS("-DICON_DIR=\"${THEMEDIR}/current/icons/32x32/apps\"") +ADD_DEFINITIONS("-DFALLBACK_ICON_DIR=\"${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps\"") ADD_DEFINITIONS("-DPIXMAP_DIR=\"${THEMEDIR}/current/icons/32x32/apps\"") ADD_DEFINITIONS("-DDESKTOP_TRANSLATIONS_DIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\"") ADD_DEFINITIONS("-DMODULES_DESKTOP_DIR=\"${CMAKE_INSTALL_PREFIX}/share/applications/YaST2\"") Modified: trunk/control-center/src/yqmodulegroupsmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulegroupsmodel.cpp?rev=57820&r1=57819&r2=57820&view=diff ============================================================================== --- trunk/control-center/src/yqmodulegroupsmodel.cpp (original) +++ trunk/control-center/src/yqmodulegroupsmodel.cpp Wed Jul 1 15:11:04 2009 @@ -33,8 +33,8 @@ : YQDesktopFilesModel(parent) { addDesktopFilesPath( GROUPS_DESKTOP_DIR ); - addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps"); - addIconPath("/usr/share/icons/hicolor/32x32/apps"); + addIconPath( ICON_DIR ); + addIconPath( FALLBACK_ICON_DIR ); reindex(); //addPersonalStuff(); } Modified: trunk/control-center/src/yqmodulesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqmodulesmodel.cpp?rev=57820&r1=57819&r2=57820&view=diff ============================================================================== --- trunk/control-center/src/yqmodulesmodel.cpp (original) +++ trunk/control-center/src/yqmodulesmodel.cpp Wed Jul 1 15:11:04 2009 @@ -50,8 +50,8 @@ , priv(new Private) { addDesktopFilesPath( MODULES_DESKTOP_DIR ); - addIconPath("/usr/share/YaST2/theme/current/icons/32x32/apps"); - addIconPath("/usr/share/icons/hicolor/32x32/apps"); + addIconPath( ICON_DIR ); + addIconPath( FALLBACK_ICON_DIR ); removeEmptyGroups(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org