BUG: Fix bug #9894. Make higher resolution CMake icon available as an application icon. On Mac, the higher resolution one is used in the dock.

This commit is contained in:
Clinton Stimpson 2009-12-11 00:35:33 -05:00
parent be12a1ae8f
commit 691d8784a7
6 changed files with 8 additions and 4 deletions

View File

@ -3,7 +3,7 @@ Version=1.0
Name=CMake Name=CMake
Comment=Cross-platform buildsystem Comment=Cross-platform buildsystem
Exec=cmake-gui %f Exec=cmake-gui %f
Icon=CMakeSetup.png Icon=CMakeSetup32.png
Terminal=false Terminal=false
X-MultipleArgs=false X-MultipleArgs=false
Type=Application Type=Application

View File

@ -97,7 +97,7 @@ ELSE(NOT QT4_FOUND)
# install a desktop file so CMake appears in the application start menu # install a desktop file so CMake appears in the application start menu
# with an icon # with an icon
INSTALL(FILES CMake.desktop DESTINATION share/applications ) INSTALL(FILES CMake.desktop DESTINATION share/applications )
INSTALL(FILES CMakeSetup.png DESTINATION share/pixmaps ) INSTALL(FILES CMakeSetup32.png DESTINATION share/pixmaps )
INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages ) INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
ENDIF(UNIX) ENDIF(UNIX)

View File

@ -134,7 +134,10 @@ int main(int argc, char** argv)
// app setup // app setup
app.setApplicationName("CMakeSetup"); app.setApplicationName("CMakeSetup");
app.setOrganizationName("Kitware"); app.setOrganizationName("Kitware");
app.setWindowIcon(QIcon(":/Icons/CMakeSetup.png")); QIcon appIcon;
appIcon.addFile(":/Icons/CMakeSetup32.png");
appIcon.addFile(":/Icons/CMakeSetup128.png");
app.setWindowIcon(appIcon);
CMakeSetupDialog dialog; CMakeSetupDialog dialog;
dialog.show(); dialog.show();

View File

@ -1,6 +1,7 @@
<RCC> <RCC>
<qresource prefix="/Icons" > <qresource prefix="/Icons" >
<file>CMakeSetup.png</file> <file>CMakeSetup128.png</file>
<file>CMakeSetup32.png</file>
<file>Delete16.png</file> <file>Delete16.png</file>
<file>Plus16.png</file> <file>Plus16.png</file>
</qresource> </qresource>

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 358 B