[Cmake-commits] [cmake-commits] clinton committed CMake.desktop 1.3 1.4 CMakeLists.txt 1.24 1.25 CMakeSetup.cxx 1.26 1.27 CMakeSetup.png 1.1 NONE CMakeSetup.qrc 1.4 1.5 CMakeSetup128.png NONE 1.1 CMakeSetup32.png NONE 1.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv2537

Modified Files:
	CMake.desktop CMakeLists.txt CMakeSetup.cxx CMakeSetup.qrc 
Added Files:
	CMakeSetup128.png CMakeSetup32.png 
Removed Files:
	CMakeSetup.png 
Log Message:
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.



--- NEW FILE: CMakeSetup32.png ---
(This appears to be a binary file; contents omitted.)

Index: CMake.desktop
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMake.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMake.desktop	5 Oct 2009 14:26:08 -0000	1.3
--- CMake.desktop	11 Dec 2009 05:35:33 -0000	1.4
***************
*** 4,8 ****
  Comment=Cross-platform buildsystem
  Exec=cmake-gui %f
! Icon=CMakeSetup.png
  Terminal=false
  X-MultipleArgs=false
--- 4,8 ----
  Comment=Cross-platform buildsystem
  Exec=cmake-gui %f
! Icon=CMakeSetup32.png
  Terminal=false
  X-MultipleArgs=false

--- CMakeSetup.png DELETED ---

--- NEW FILE: CMakeSetup128.png ---
(This appears to be a binary file; contents omitted.)

Index: CMakeSetup.qrc
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.qrc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CMakeSetup.qrc	13 Nov 2007 04:54:49 -0000	1.4
--- CMakeSetup.qrc	11 Dec 2009 05:35:33 -0000	1.5
***************
*** 1,5 ****
  <RCC>
      <qresource prefix="/Icons" >
!         <file>CMakeSetup.png</file>
          <file>Delete16.png</file>
          <file>Plus16.png</file>
--- 1,6 ----
  <RCC>
      <qresource prefix="/Icons" >
!         <file>CMakeSetup128.png</file>
!         <file>CMakeSetup32.png</file>
          <file>Delete16.png</file>
          <file>Plus16.png</file>

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeLists.txt	28 Sep 2009 15:43:17 -0000	1.24
--- CMakeLists.txt	11 Dec 2009 05:35:33 -0000	1.25
***************
*** 98,102 ****
      # with an icon
      INSTALL(FILES CMake.desktop DESTINATION share/applications )
!     INSTALL(FILES CMakeSetup.png DESTINATION share/pixmaps )
      INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
    ENDIF(UNIX)
--- 98,102 ----
      # with an icon
      INSTALL(FILES CMake.desktop DESTINATION share/applications )
!     INSTALL(FILES CMakeSetup32.png DESTINATION share/pixmaps )
      INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
    ENDIF(UNIX)

Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** CMakeSetup.cxx	26 Oct 2009 17:18:15 -0000	1.26
--- CMakeSetup.cxx	11 Dec 2009 05:35:33 -0000	1.27
***************
*** 135,139 ****
    app.setApplicationName("CMakeSetup");
    app.setOrganizationName("Kitware");
!   app.setWindowIcon(QIcon(":/Icons/CMakeSetup.png"));
    
    CMakeSetupDialog dialog;
--- 135,142 ----
    app.setApplicationName("CMakeSetup");
    app.setOrganizationName("Kitware");
!   QIcon appIcon;
!   appIcon.addFile(":/Icons/CMakeSetup32.png");
!   appIcon.addFile(":/Icons/CMakeSetup128.png");
!   app.setWindowIcon(appIcon);
    
    CMakeSetupDialog dialog;