refactor root dir #11

Almond.pro

@@ -27,58 +27,58 @@ CONFIG += c++17
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 
 SOURCES += \
-        Almond.cpp \
-        AlmondMenuWidget.cpp \
-        BackgroundTask.cpp \
-        Color.cpp \
-        EscapeTimeVisualWidget.cpp \
-        ExportImageMenu.cpp \
-        ExportVideoMenu.cpp \
-        FractalWidget.cpp \
-        FractalWidgetUtils.cpp \
-        FractalZoomWidget.cpp \
-        GradientMenu.cpp \
-        GradientWidget.cpp \
-        MandelWidget.cpp \
-        choosegenerators.cpp \
-        customgenerator.cpp \
-        exportdialogs.cpp \
-        gradientchoosedialog.cpp \
-        GridFlowLayout.cpp \
-        main.cpp
+        src/Almond.cpp \
+        src/AlmondMenuWidget.cpp \
+        src/BackgroundTask.cpp \
+        src/Color.cpp \
+        src/EscapeTimeVisualWidget.cpp \
+        src/ExportImageMenu.cpp \
+        src/ExportVideoMenu.cpp \
+        src/FractalWidget.cpp \
+        src/FractalWidgetUtils.cpp \
+        src/FractalZoomWidget.cpp \
+        src/GradientMenu.cpp \
+        src/GradientWidget.cpp \
+        src/MandelWidget.cpp \
+        src/choosegenerators.cpp \
+        src/customgenerator.cpp \
+        src/exportdialogs.cpp \
+        src/gradientchoosedialog.cpp \
+        src/GridFlowLayout.cpp \
+        src/main.cpp
 
 HEADERS += \
-        Almond.h \
-        AlmondMenuWidget.h \
-        BackgroundTask.h \
-        Color.h \
-        EscapeTimeVisualWidget.h \
-        ExportImageMenu.h \
-        ExportVideoMenu.h \
-        FractalWidget.h \
-        FractalWidgetUtils.h \
-        FractalZoomWidget.h \
-        GradientMenu.h \
-        GradientWidget.h \
-        MandelWidget.h \
-        choosegenerators.h \
-        customgenerator.h \
-        exportdialogs.h \
-        GridFlowLayout.h \
-        gradientchoosedialog.h
+        include/Almond.h \
+        include/AlmondMenuWidget.h \
+        include/BackgroundTask.h \
+        include/Color.h \
+        include/EscapeTimeVisualWidget.h \
+        include/ExportImageMenu.h \
+        include/ExportVideoMenu.h \
+        include/FractalWidget.h \
+        include/FractalWidgetUtils.h \
+        include/FractalZoomWidget.h \
+        include/GradientMenu.h \
+        include/GradientWidget.h \
+        include/MandelWidget.h \
+        include/choosegenerators.h \
+        include/customgenerator.h \
+        include/exportdialogs.h \
+        include/GridFlowLayout.h \
+        include/gradientchoosedialog.h
 
 FORMS += \
-        Almond.ui \
-        ExportImageMenu.ui \
-        ExportVideoMenu.ui \
-        GradientMenu.ui \
-        choosegenerators.ui \
-        customgenerator.ui \
-        exportimagedialog.ui \
-        exportvideodialog.ui \
-        gradientchooser.ui
-
-
+        ui/Almond.ui \
+        ui/ExportImageMenu.ui \
+        ui/ExportVideoMenu.ui \
+        ui/GradientMenu.ui \
+        ui/choosegenerators.ui \
+        ui/customgenerator.ui \
+        ui/exportimagedialog.ui \
+        ui/exportvideodialog.ui \
+        ui/gradientchooser.ui
+
+INCLUDEPATH += include
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
@@ -142,8 +142,9 @@ unix|win32: LIBS += -L$FFMPEGPATH -lswscale
 #INCLUDEPATH += $$PWD/../libs/ffmpeg-4.1.1-win32-dev/include
 #DEPENDPATH += $$PWD/../libs/ffmpeg-4.1.1-win32-dev/include
 
-RESOURCES += Almond.qrc \
-    splash.qrc
+RESOURCES += \
+    resources/Almond.qrc \
+    resources/splash.qrc
 
 win32:LIBS += -llibpng16_static -lzlibstatic -ljpeg
 unix|win32: LIBS += -L$$PWD/libmandel/ -L$$PWD/libalmond/ -lmandel -lqd -lasmjit -lalmond

CMakeLists.txt

@@ -19,18 +19,25 @@ find_package(FFmpeg COMPONENTS AVCODEC AVDEVICE AVFORMAT AVUTIL SWSCALE REQUIRED
 
 set(CMAKE_CXX_STANDARD 17)
 
-FILE(GLOB AlmondSources *.cpp)
-FILE(GLOB AlmondHeaders *.h)
+FILE(GLOB AlmondSources src/*.cpp)
+FILE(GLOB AlmondHeaders include/*.h)
 
 
 IF (WIN32)
-    add_executable(Almond WIN32 ${AlmondSources} Almond.qrc splash.qrc icon.rc ${AlmondHeaders})
+    add_executable(Almond WIN32 ${AlmondSources}
+                   resources/Almond.qrc
+                   resources/splash.qrc
+                   resources/icon.rc
+                   ${AlmondHeaders})
 ELSE()
-    add_executable(Almond ${AlmondSources} Almond.qrc splash.qrc ${AlmondHeaders})
+    add_executable(Almond ${AlmondSources}
+                   resources/Almond.qrc
+                   resources/splash.qrc
+                   ${AlmondHeaders})
     set_target_properties(Almond PROPERTIES OUTPUT_NAME "almond")
 ENDIF()
 
-target_include_directories(Almond PUBLIC .)
+target_include_directories(Almond PUBLIC include)
 
 add_subdirectory(libalmond)
 
@@ -40,12 +47,12 @@ target_link_libraries(Almond PUBLIC libalmond)
 target_link_libraries(Almond PUBLIC Qt5::Core Qt5::Widgets Qt5::OpenGL Qt5::Xml Qt5::Concurrent)
 target_link_libraries(Almond PUBLIC ${FFMPEG_LIBRARIES})
 
+set_property(TARGET Almond PROPERTY AUTOUIC_SEARCH_PATHS "ui")
 set_property(TARGET Almond PROPERTY AUTOMOC ON)
 set_property(TARGET Almond PROPERTY AUTORCC ON)
 set_property(TARGET Almond PROPERTY AUTOUIC ON)
 
 
-
 if(Boost_FOUND)
     target_compile_definitions(Almond PUBLIC WITH_BOOST)
     target_include_directories(Almond SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
@@ -72,8 +79,8 @@ IF (WIN32)
 
 ELSEIF (UNIX AND NOT APPLE)
     install(TARGETS Almond RUNTIME DESTINATION "bin")
-    install(FILES Almond.desktop DESTINATION "share/applications")
-    install(FILES Almond.png DESTINATION "share/pixmaps")
+    install(FILES debian/Almond.desktop DESTINATION "share/applications")
+    install(FILES resources/Almond.png DESTINATION "share/pixmaps")
     install(FILES debian/copyright DESTINATION "share/doc/almond/" RENAME "copyright")
     install(FILES debian/Almond.appdata.xml DESTINATION "share/metainfo/" RENAME "org.winfor.Almond.appdata.xml")
     set(CPACK_GENERATOR "DEB")