Browse files

BUG: 0002094. Move 3DSlicer icons into appropriate subdirectories.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20348 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
1 parent fcd29ef commit 05afaeaa9655fad086456ea038e1c0c61a75af6b Michael.jeulinl committed Jun 11, 2012
View
7 Applications/SlicerApp/Resources/UI/qSlicerAppMainWindow.ui
@@ -149,7 +149,7 @@
<item>
<widget class="QLabel" name="logoLabel">
<property name="pixmap">
- <pixmap resource="../../../../Resources/qSlicerLogos.qrc">:/Logos/Slicer3.png</pixmap>
+ <pixmap resource="../../../../Resources/qSlicer.qrc">:/Logos/Slicer3.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -1120,10 +1120,7 @@
<include location="../SlicerApp.qrc"/>
<include location="../../../../Base/QTGUI/Resources/qSlicerBaseQTGUI.qrc"/>
<include location="../../../../Libs/MRML/Widgets/Resources/qMRMLWidgets.qrc"/>
- <include location="../../../../Resources/qSlicerLogos.qrc"/>
- <include location="../../../../Resources/qSlicerLogos.qrc"/>
- <include location="../../../../Resources/qSlicerLogos.qrc"/>
- <include location="../../../../Resources/qSlicerLogos.qrc"/>
+ <include location="../../../../Resources/qSlicer.qrc"/>
</resources>
<connections/>
</ui>
View
4 CMake/SlicerMacroBuildBaseQtLibrary.cmake
@@ -123,7 +123,7 @@ macro(SlicerMacroBuildBaseQtLibrary)
QT4_ADD_RESOURCES(SLICERQTBASELIB_QRC_SRCS ${SLICERQTBASELIB_RESOURCES})
endif(DEFINED SLICERQTBASELIB_RESOURCES)
- QT4_ADD_RESOURCES(SLICERQTBASELIB_QRC_SRCS ${Slicer_SOURCE_DIR}/Resources/qSlicerLogos.qrc)
+ QT4_ADD_RESOURCES(SLICERQTBASELIB_QRC_SRCS ${Slicer_SOURCE_DIR}/Resources/qSlicer.qrc)
set_source_files_properties(
${SLICERQTBASELIB_UI_CXX}
@@ -137,7 +137,7 @@ macro(SlicerMacroBuildBaseQtLibrary)
# --------------------------------------------------------------------------
source_group("Resources" FILES
${SLICERQTBASELIB_UI_SRCS}
- ${Slicer_SOURCE_DIR}/Resources/qSlicerLogos.qrc
+ ${Slicer_SOURCE_DIR}/Resources/qSlicer.qrc
${SLICERQTBASELIB_RESOURCES}
)
View
2 CMakeLists.txt
@@ -73,7 +73,7 @@ endif()
# for shared libraries
#-----------------------------------------------------------------------------
set(Slicer_EXPORT_HEADER_TEMPLATE "${Slicer_SOURCE_DIR}/CMake/qSlicerExport.h.in")
-set(Slicer_LOGOS_RESOURCE "${Slicer_SOURCE_DIR}/Resources/qSlicerLogos.qrc")
+set(Slicer_LOGOS_RESOURCE "${Slicer_SOURCE_DIR}/Resources/qSlicer.qrc")
#-----------------------------------------------------------------------------
# CMake Function(s) and Macro(s)
View
2 Modules/Loadable/SlicerWelcome/Resources/UI/qSlicerWelcomeModule.ui
@@ -472,7 +472,7 @@
<resources>
<include location="../qSlicerWelcomeModule.qrc"/>
<include location="../../../../Base/QTGUI/Resources/qSlicerBaseQTGUI.qrc"/>
- <include location="../../../../Resources/qSlicerLogos.qrc"/>
+ <include location="../../../../Resources/qSlicer.qrc"/>
</resources>
<connections>
<connection>
View
0 ...ces/3DSlicerLogo-app-icon-centered-32.png → Resources/Icons/Medium/3DSlicerIcon.png
File renamed without changes
View
0 ...ces/3DSlicerLogo-app-icon-centered-16.png → Resources/Icons/Small/3DSlicerIcon.png
File renamed without changes
View
0 ...ces/3DSlicerLogo-app-icon-centered-64.png → Resources/Icons/XLarge/3DSlicerIcon.png
File renamed without changes
View
0 ...es/3DSlicerLogo-app-icon-centered-128.png → Resources/Icons/XXLarge/3DSlicerIcon.png
File renamed without changes
View
4 Resources/qSlicerLogos.qrc → Resources/qSlicer.qrc
@@ -29,5 +29,9 @@
<file>Logos/Slicer3.png</file>
<file>Logos/SPL.png</file>
<file>Logos/TATRC.png</file>
+ <file>Icons/Small/3DSlicerIcon.png</file>
+ <file alias="3DSlicerIcon">Icons/Medium/3DSlicerIcon.png</file>
+ <file>Icons/XLarge/3DSlicerIcon.png</file>
+ <file>Icons/XXLarge/3DSlicerIcon.png</file>
</qresource>
</RCC>

0 comments on commit 05afaea

Please sign in to comment.