From: unknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Date: Tue, 23 Apr 2013 13:15:16 +0000 (+0200)
Subject: Feature #1711 CreaDevManager application implementation
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=crea.git;a=commitdiff_plain;h=2b133989fba6c3cb267e5bc92400d7ed310bcc99

Feature #1711 CreaDevManager application implementation

Feature: Application Logo included for main window
---

diff --git a/appli/creaDevManager/CMakeLists.txt b/appli/creaDevManager/CMakeLists.txt
index 8eca8df..bec75cd 100644
--- a/appli/creaDevManager/CMakeLists.txt
+++ b/appli/creaDevManager/CMakeLists.txt
@@ -71,40 +71,3 @@ SET ( ${EXE_NAME}_LINK_LIBRARIES
 #-Creates and installs the exe-----------------------------------------------
 CREA_ADD_EXECUTABLE( ${EXE_NAME} )
 #============================================================================
-
-#==sets additional files=====================================================
-IF(WIN32)
-
-# Build tree 
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/about.html
-    ${EXECUTABLE_OUTPUT_PATH}/Debug/about.html
-    COPYONLY 
-    )
-    
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/about.html
-    ${EXECUTABLE_OUTPUT_PATH}/Release/about.html
-    COPYONLY 
-    )
-    
-  INSTALL(
-    PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/Debug/about.html
-    DESTINATION bin
-    )
-
-ELSE(WIN32)
-
-CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/about.html
-    ${EXECUTABLE_OUTPUT_PATH}/about.html
-    @ONLY IMMEDIATE
-    )
-
-INSTALL(
-    FILES ${EXECUTABLE_OUTPUT_PATH}/about.html
-    DESTINATION bin
-    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-    )
-    
-ENDIF(WIN32)
diff --git a/appli/creaDevManager/icon.ico b/appli/creaDevManager/icon.ico
new file mode 100644
index 0000000..3d29eb1
Binary files /dev/null and b/appli/creaDevManager/icon.ico differ
diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 3b64a1e..76d18f4 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -40,6 +40,7 @@
 #include "wx/statline.h"
 #include "wx/config.h"
 #include "CDMUtilities.h"
+#include "images/CIcon64.xpm"
 
 #include "creaDevManagerIds.h"
 #include "wxCDMMainDescriptionPanel.h"
@@ -145,6 +146,7 @@ bool wxCDMMainFrame::Create(
 
   CreateMenus();
   CreateControls();
+  this->SetIcon(wxIcon(CIcon64));
   return TRUE;
 }