Merge branch 'NewIcon' into develop

GUI/coregui/CMakeLists.txt

@@ -138,7 +138,7 @@ target_link_libraries(${library_name}
 # --- Installation ---
 install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Libraries)
 if(APPLE AND CREATE_BUNDLE)
-  set(source_files ${source_files} ${CMAKE_SOURCE_DIR}/Images/BAicon.icns)
+  set(source_files ${source_files} ${CMAKE_SOURCE_DIR}/GUI/main/BornAgainApp.icns)
 endif(APPLE AND CREATE_BUNDLE)
 # system libraries: ROOT installation
 if(WIN32)

GUI/coregui/coregui.qrc

@@ -37,7 +37,6 @@
         <file>images/toolbar_save.png</file>
         <file>images/toolbar_refresh.png</file>
         <file>images/toolbar_parameter_export.png</file>
-        <file>images/bornagain_icon.ico</file>
-        <file>images/bornagain_icon.png</file>
+        <file>images/BornAgain.ico</file>
     </qresource>
 </RCC>

GUI/coregui/mainwindow/mainwindow.cpp

@@ -76,7 +76,7 @@ MainWindow::MainWindow(QWidget *parent)
     initModels();
 
     if (!Utils::HostOsInfo::isMacHost())
-        QApplication::setWindowIcon(QIcon(":/images/bornagain_icon.ico"));
+        QApplication::setWindowIcon(QIcon(":/images/BornAgain.ico"));
 
     QString baseName = QApplication::style()->objectName();
     qApp->setStyle(new ManhattanStyle(baseName));

GUI/main/CMakeLists.txt

@@ -149,5 +149,9 @@ Plugins = PlugIns
 
 else()
   install (TARGETS ${executable_name} DESTINATION ${destination_bin} COMPONENT Applications)
+
+    set(image_files ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.ico ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns)
+    install (FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applications)
+
 endif(APPLE AND CREATE_BUNDLE)
 

GUI/main/bornagain.rc

-IDI_ICON1               ICON    DISCARDABLE     "bornagain.ico"
+IDI_ICON1               ICON    DISCARDABLE     "BornAgain.ico"

cmake/modules/BornAgainConfiguration.cmake

@@ -27,6 +27,7 @@ set(destination_bin bin)
 set(destination_lib lib)
 set(destination_include include/BornAgain)
 set(destination_examples share/BornAgain/Examples)
+set(destination_images share/BornAgain/Images)
 if(WIN32)
     set(destination_lib bin)
     set(destination_include include)

cmake/modules/CPackWindows.cmake

@@ -9,9 +9,9 @@ set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 set( CPACK_NSIS_MENU_LINKS "bin\\\\BornAgain.exe" "BornAgain")
 
 
-set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\coregui\\\\images\\\\bornagain_icon.ico" )
-set( CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\coregui\\\\images\\\\bornagain_icon.ico" )
-set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\coregui\\\\images\\\\bornagain_icon.ico" )
+set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\coregui\\\\images\\\\BornAgain.ico" )
+set( CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\coregui\\\\images\\\\BornAgain.ico" )
+set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/GUI\\\\coregui\\\\images\\\\BornAgain.ico" )
 
 set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
   Push \\\"PATH\\\" 

cmake/modules/DarwinSetup.cmake

@@ -11,11 +11,11 @@ set(destination_lib ${INBUNDLE}/Contents/MacOs)
 set(destination_include ${INBUNDLE}/Contents/Resources/Headers)
 set(destination_examples ${INBUNDLE}/Contents/SharedSupport/Examples)
 
-install ( FILES ${CMAKE_SOURCE_DIR}/Images/BAicon.icns
+install ( FILES ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns
           DESTINATION ${INBUNDLE}/Contents/Resources/
 )
 
 #set ( CPACK_DMG_BACKGROUND_IMAGE ${CMAKE_SOURCE_DIR}/Images/osx-bundle-background.png )
 #set ( CPACK_DMG_DS_STORE ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/osx_DS_Store)
-set ( MACOSX_BUNDLE_ICON_FILE BAicon.icns )
-SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/Images/BAicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+set ( MACOSX_BUNDLE_ICON_FILE BornAgain.icns )
+SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)