From 2b133989fba6c3cb267e5bc92400d7ed310bcc99 Mon Sep 17 00:00:00 2001
From: unknown <gonzalez@EI-ED-345.creatis.insa-lyon.fr>
Date: Tue, 23 Apr 2013 15:15:16 +0200
Subject: [PATCH] Feature #1711 CreaDevManager application implementation

Feature: Application Logo included for main window
---
 appli/creaDevManager/CMakeLists.txt      |  37 -----------------------
 appli/creaDevManager/icon.ico            | Bin 0 -> 5694 bytes
 lib/creaDevManagerLib/wxCDMMainFrame.cpp |   2 ++
 3 files changed, 2 insertions(+), 37 deletions(-)
 create mode 100644 appli/creaDevManager/icon.ico

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 0000000000000000000000000000000000000000..3d29eb1adf248e609f3f375e2436f7ba27056d1b
GIT binary patch
literal 5694
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
Pao)vNTo=PSbyL3qqT@t_

literal 0
HcmV?d00001

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;
 }
 
-- 
2.47.1