mv GUI/main/ to App/

GUI/main/CMakeLists.txt → App/CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 
 if(APPLE)
     set(MACOSX_BUNDLE_ICON_FILE BornAgain.icns)
-    set_source_files_properties(${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns
+    set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/BornAgain.icns
         PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     if(BORNAGAIN_APPLE_BUNDLE)
         set(executable_options MACOSX_BUNDLE)
@@ -96,8 +96,8 @@ endif()
 install (TARGETS ${executable_name} ${executable_destination} COMPONENT Applications)
 
 set(image_files
-    ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.ico
-    ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns
+    ${CMAKE_CURRENT_SOURCE_DIR}/BornAgain.ico
+    ${CMAKE_CURRENT_SOURCE_DIR}/BornAgain.icns
     ${CMAKE_SOURCE_DIR}/GUI/images/BornAgain_48x48.png
     ${CMAKE_SOURCE_DIR}/GUI/images/BornAgain_64x64.png)
 install (FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applications)
@@ -107,7 +107,7 @@ install (FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applic
 # -----------------------------------------------------------------------------
 if(UNIX)
     if(BORNAGAIN_APPLE_BUNDLE)
-        install(FILES ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/BornAgain.icns
             DESTINATION ${destination_bundle}/Contents/Resources/)
         install(FILES ${CMAKE_SOURCE_DIR}/cmake/configurables/qt.conf
             DESTINATION ${destination_bundle}/Contents/Resources/)

GUI/main/MessageHandler.cpp → App/MessageHandler.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/main/MessageHandler.cpp
+//! @file      App/MessageHandler.cpp
 //! @brief     Implements function MessageHandler
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/main/MessageHandler.h"
+#include "App/MessageHandler.h"
 #include <QMessageBox>
 #include <iostream>
 

GUI/main/MessageHandler.h → App/MessageHandler.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/main/MessageHandler.h
+//! @file      App/MessageHandler.h
 //! @brief     Declares function MessageHandler
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAIN_MESSAGEHANDLER_H
-#define BORNAGAIN_GUI_MAIN_MESSAGEHANDLER_H
+#ifndef BORNAGAIN_APP_MESSAGEHANDLER_H
+#define BORNAGAIN_APP_MESSAGEHANDLER_H
 
 #include <QApplication>
 
 void MessageHandler(QtMsgType type, const QMessageLogContext&, const QString& msg);
 
-#endif // BORNAGAIN_GUI_MAIN_MESSAGEHANDLER_H
+#endif // BORNAGAIN_APP_MESSAGEHANDLER_H

GUI/main/appoptions.cpp → App/appoptions.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/main/appoptions.cpp
+//! @file      App/appoptions.cpp
 //! @brief     Implements class ProgramOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/main/appoptions.h"
+#include "App/appoptions.h"
 #include "GUI/utils/Helpers.h"
 #include <QSize>
 #include <boost/program_options/config.hpp>

GUI/main/appoptions.h → App/appoptions.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/main/appoptions.h
+//! @file      App/appoptions.h
 //! @brief     Collection of utilities to parse command line options
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MAIN_APPOPTIONS_H
-#define BORNAGAIN_GUI_MAIN_APPOPTIONS_H
+#ifndef BORNAGAIN_APP_APPOPTIONS_H
+#define BORNAGAIN_APP_APPOPTIONS_H
 
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/positional_options.hpp>
@@ -68,4 +68,4 @@ private:
     bpo::variables_map m_variables_map; //! parsed variables
 };
 
-#endif // BORNAGAIN_GUI_MAIN_APPOPTIONS_H
+#endif // BORNAGAIN_APP_APPOPTIONS_H

GUI/main/main.cpp → App/main.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/main/main.cpp
+//! @file      App/main.cpp
 //! @brief     Main function of the whole GUI
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -14,8 +14,8 @@
 
 #include "GUI/Application/Application.h"
 #include "GUI/DataLoaders/DataLoaderUtil.h"
-#include "GUI/main/MessageHandler.h"
-#include "GUI/main/appoptions.h"
+#include "App/MessageHandler.h"
+#include "App/appoptions.h"
 #include "GUI/mainwindow/mainwindow.h"
 #include "config_build.h"
 #include <QDir>

CMakeLists.txt

@@ -194,7 +194,7 @@ add_subdirectory(Tests/Examples)
 # GUI
 if(BORNAGAIN_GUI)
     add_subdirectory(GUI)
-    add_subdirectory(GUI/main)
+    add_subdirectory(App)
     add_subdirectory(Tests/Unit/GUI)
 endif()
 

Doc/Doxygen/gui/Doxyfile.in

@@ -857,7 +857,8 @@ WARN_LOGFILE           =
 
 INPUT                  = @CMAKE_SOURCE_DIR@/Doc/Doxygen/gui \
                          @CMAKE_SOURCE_DIR@/Doc/Doxygen/common \
-                         @CMAKE_SOURCE_DIR@/GUI
+                         @CMAKE_SOURCE_DIR@/GUI \
+                         @CMAKE_SOURCE_DIR@/App
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses