diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2009-12-11 05:35:33 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2009-12-11 05:35:33 (GMT) |
| commit | 691d8784a7d41142fc67690eed1963e9424db723 (patch) | |
| tree | 6b1a6120003fdd87c19ab1261e88e1161ecd4429 | |
| parent | be12a1ae8f9b9f5933158f6bcdbb9f2246fa653e (diff) | |
| download | CMake-691d8784a7d41142fc67690eed1963e9424db723.zip CMake-691d8784a7d41142fc67690eed1963e9424db723.tar.gz CMake-691d8784a7d41142fc67690eed1963e9424db723.tar.bz2 | |
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.
| -rw-r--r-- | Source/QtDialog/CMake.desktop | 2 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 5 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetup.qrc | 3 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetup128.png | bin | 0 -> 13269 bytes | |||
| -rw-r--r-- | Source/QtDialog/CMakeSetup32.png (renamed from Source/QtDialog/CMakeSetup.png) | bin | 358 -> 358 bytes |
6 files changed, 8 insertions, 4 deletions
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop index d1d4fb2..645eb76 100644 --- a/Source/QtDialog/CMake.desktop +++ b/Source/QtDialog/CMake.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=CMake Comment=Cross-platform buildsystem Exec=cmake-gui %f -Icon=CMakeSetup.png +Icon=CMakeSetup32.png Terminal=false X-MultipleArgs=false Type=Application diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 4e7e357..405c952 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -97,7 +97,7 @@ ELSE(NOT QT4_FOUND) # install a desktop file so CMake appears in the application start menu # with an icon 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 ) ENDIF(UNIX) diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index f19a36d..e613a78 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -134,7 +134,10 @@ int main(int argc, char** argv) // app setup app.setApplicationName("CMakeSetup"); 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; dialog.show(); diff --git a/Source/QtDialog/CMakeSetup.qrc b/Source/QtDialog/CMakeSetup.qrc index 5ceb1df..eaac192 100644 --- a/Source/QtDialog/CMakeSetup.qrc +++ b/Source/QtDialog/CMakeSetup.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/Icons" > - <file>CMakeSetup.png</file> + <file>CMakeSetup128.png</file> + <file>CMakeSetup32.png</file> <file>Delete16.png</file> <file>Plus16.png</file> </qresource> diff --git a/Source/QtDialog/CMakeSetup128.png b/Source/QtDialog/CMakeSetup128.png Binary files differnew file mode 100644 index 0000000..12f1d9a --- /dev/null +++ b/Source/QtDialog/CMakeSetup128.png diff --git a/Source/QtDialog/CMakeSetup.png b/Source/QtDialog/CMakeSetup32.png Binary files differindex 7bbcee4..7bbcee4 100644 --- a/Source/QtDialog/CMakeSetup.png +++ b/Source/QtDialog/CMakeSetup32.png |
