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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
ag+lz|br9<;)?M`CdFd!%dFgqw(S8J?<3xl2

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.45.0