Merge pull request #1 from Simon-12/develop

Add code

Author: Simon-12

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.gitignore

@@ -0,0 +1,5 @@
+
+*.dll
+*.user
+build*
+docs/html/

CMakeLists.txt

@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.14)
+
+project(tidy-images
+    VERSION 1.0.0
+    LANGUAGES CXX)
+
+# Options
+option( APP_BUILD_PLUGINS "Build plugins (be sure dependencies are installed and in PATH)" ON )
+option( APP_BUILD_TESTS   "Build unit tests"                                               ON )
+option( APP_BUILD_DOC     "Generate documentation (requires Doxygen)"                      ON )
+option( APP_COPY_SAMPLES  "Copy samples to application folder"                             ON )
+
+# Main application
+add_subdirectory(app)
+
+# Plugins
+if( APP_BUILD_PLUGINS )
+    add_subdirectory( plugins/exiv2  )
+    add_subdirectory( plugins/opencv )
+endif()
+
+# Unit tests
+if( APP_BUILD_TESTS )
+    add_subdirectory( tests/test_app )
+endif()
+
+# Documentation
+if( APP_BUILD_DOC )
+    add_subdirectory( docs )
+endif()
+
+# Copy samples
+if( APP_COPY_SAMPLES )
+    file(GLOB samples "samples/*")
+    file(COPY ${samples} DESTINATION "app/samples")
+endif()

README.md

@@ -1,2 +1,107 @@
-# tidy-images
-Easy sort and organize your image collection
+# Tidy Images
+Easy sort and organize your image collection
+<br>
+<br>
+
+[![Paypal](https://img.shields.io/badge/donate-PayPal-blue.svg?style=flat-square&logo=paypal)](https://paypal.me/SimonSchwarzkopf)
+[![Bitcoin](https://img.shields.io/badge/donate-Bitcoin-orange.svg?style=flat-square&logo=bitcoin)](https://github.com/Simon-12/TestImage/blob/develop/app/data/bitcoin-code.png)
+<br>
+<br>
+
+
+## Features
+
+![Gallery](https://github.com/Simon-12/common/blob/main/tidy-images/01.gif)
+<br>
+
+Image and videos can be viewed in different modes: as Gallery, Image-only-viewer and Video-only-viewer.  
+Files can be moved into separate folders and can be added to a database for later browsing.  
+Files can also be copied to a specific folder or be deleted.  
+All actions can be undo or redo.
+
+<details>
+<summary>...</summary>
+<img src="https://github.com/Simon-12/common/blob/main/tidy-images/02.gif" width="65%"/>
+<img src="https://github.com/Simon-12/common/blob/main/tidy-images/03.gif" width="65%"/>
+</details>  
+<br>
+
+Files can be labeled with text information or marked as favorite. Favorite images get copied into a separate folder.  
+The database can be browsed for already sorted files (currently support SQLite).  
+Folders can be completely added or removed from the database.
+
+<details>
+<summary>...</summary>
+<img src="https://github.com/Simon-12/common/blob/main/tidy-images/04.gif" width="65%"/>
+<img src="https://github.com/Simon-12/common/blob/main/tidy-images/05.gif" width="65%"/>
+</details>  
+<br>
+
+
+To find similar images, images can be compared side by side or with an algorithm.  
+(for algorithm the OpenCV plugin is needed)
+
+<details>
+<summary>...</summary>
+<img src="https://github.com/Simon-12/common/blob/main/tidy-images/06.gif" width="65%"/> 
+</details>  
+<br>
+
+## Plugins
+
+The application can be extended with plugins. The idea is to reduce dependencies, so the application can also be built without external libs.
+<br>
+<br>
+
+Plugin |      | Description | Link
+:----: | :--: | :----------- | :----
+**Exiv2** | <img src="https://github.com/Simon-12/TestImage/blob/develop/plugins/exiv2/plugin/icon.png" width="50%"/> | Image metadata library and tools. Is needed for read image metadata (date) and read and write labels to metadata comment section. | [github/exiv2](https://github.com/Exiv2/exiv2)
+**OpenCV** | <img src="https://github.com/Simon-12/TestImage/blob/develop/plugins/opencv/plugin/icon.png" width="40%"/> | Open Source Computer Vision Library. Is needed for read and rotate images, read in single video frames and the image compare algorithm. | [github/opencv](https://github.com/opencv/opencv)
+
+<br>
+
+## Installation
+- Tested under Windows 10 and Linux with Qt version 5.15.2
+- Download the current release link... and unzip
+- Open `CMakeLists.txt` inside your Qt Creator and configure with on if your installed Qt kits
+- If you want to play videos you have to install codecs to your system. For windows i can recommend the K-Lite Basic Pack: [link](http://www.codecguide.com/download_kl.htm)
+
+<br>
+
+**CMake options**
+
+Options | Purpose | Default |
+:------ |:------- |:------: |
+APP\_BUILD\_PLUGINS | Build plugins (be sure dependencies are installed and in PATH) | ON
+APP\_BUILD\_TESTS |Build unit tests | ON
+APP\_BUILD\_DOC | Generate documentation (requires Doxygen) | ON
+APP\_COPY\_SAMPLES | Copy samples to the application folder | ON
+
+<br>
+
+## TO-DO
+- [ ] Add more options to customize the application
+- [ ] Display more image meta data (exiv2 plugin)
+- [ ] Plugin for alternative database ...?
+- [ ] Use VLC lib for videos ...?
+- [ ] Port to Qt6
+<br>
+
+## Story
+This application was published in the hope that someone would find it useful and inspiring.
+In the first place this application was developed for my wife, to sort her beautiful camera pictures and to find her favorite memories in a well organized database.
+Thanks a lot to Bryan for the instructive Udemy courses and YouTube tutorials. With this i could improve my skills and got some good inspirations to do this project.
+For interested check out the links below and join the community:
+- [facebook/voidrealms](https://www.facebook.com/groups/1400884323467285/)
+- [youtube/voidrealms](https://www.youtube.com/user/VoidRealms)
+- [udemy/bryan-cairns](https://www.udemy.com/user/bryan-cairns/)
+
+Feedback, suggestions for improvements or ideas for new features are always welcome. If you find bugs, please report to: [github/issues](https://github.com/Simon-12/tidy-images/issues)
+
+If you like the application and want to support, you can donate via:
+
+PayPal | Bitcoin
+:----: | :-----:
+[![Paypal img](https://github.com/Simon-12/TestImage/blob/develop/app/icons/flaticon/paypal.png)](https://paypal.me/SimonSchwarzkopf) | <img src="https://github.com/Simon-12/TestImage/blob/develop/app/data/bitcoin-code.png" width="40%"/><br>**bc1qll43hkqvv9jjwqw54xhejw324q4t4t55p8ss9e**
+
+<br>

app/CMakeLists.txt

@@ -0,0 +1,181 @@
+cmake_minimum_required(VERSION 3.14)
+
+get_filename_component(ProjectId ${CMAKE_CURRENT_LIST_DIR} NAME)
+string(REPLACE " " "_" ProjectId ${ProjectId})
+project(${ProjectId} CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# QtCreator supports the following variables for Android, which are identical to qmake Android variables.
+# Check https://doc.qt.io/qt/deployment-android.html for more information.
+# They need to be set before the find_package(...) calls below.
+
+#if(ANDROID)
+#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
+#    if (ANDROID_ABI STREQUAL "armeabi-v7a")
+#        set(ANDROID_EXTRA_LIBS
+#            ${CMAKE_CURRENT_SOURCE_DIR}/path/to/libcrypto.so
+#            ${CMAKE_CURRENT_SOURCE_DIR}/path/to/libssl.so)
+#    endif()
+#endif()
+
+# - - - For static plugins
+#set("OpenCV_DIR" "E:/libs/opencv-4.5.3/release/x86/vc16/staticlib") # Win32
+#set("exiv2_DIR" "E:/libs/exiv2-0.27.4/release/lib/cmake/exiv2") # Win32
+#find_package(OpenCV REQUIRED)
+#find_package(exiv2 REQUIRED CONFIG NAMES exiv2)
+# - - -
+
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick QmlImportScanner Widgets Concurrent Sql Multimedia REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick QmlImportScanner Widgets Concurrent Sql Multimedia REQUIRED)
+
+set(PROJECT_SOURCES
+
+    src/main.cpp
+    data/data.qrc
+    icons/icons.qrc
+    qml/qml.qrc
+
+    src/options.h
+    src/settings.h
+    src/support.h
+    src/qmlcontroller.h
+    src/qmlcontroller.cpp
+    src/logger.h
+    src/logger.cpp
+    src/loaderclass.h
+    src/loaderclass.cpp
+    src/applicationinfo.h
+    src/applicationinfo.cpp
+    src/iconitem.h
+    src/iconmodel.h
+    src/iconmodel.cpp
+
+    src/plugins/baseplugin.h
+    src/plugins/exivplugin.h
+    src/plugins/exivplugin.cpp
+    src/plugins/visionplugin.h
+    src/plugins/visionplugin.cpp
+    src/plugins/pluginloader.h
+    src/plugins/pluginloader.cpp
+    src/plugins/pluginitem.h
+    src/plugins/pluginmodel.h
+    src/plugins/pluginmodel.cpp
+
+    src/filehandler/basehandler.h
+    src/filehandler/basehandler.cpp
+    src/filehandler/confighandler.h
+    src/filehandler/confighandler.cpp
+    src/filehandler/folderfiltermodel.h
+    src/filehandler/folderfiltermodel.cpp
+    src/filehandler/folderhandler.h
+    src/filehandler/folderhandler.cpp
+    src/filehandler/folderitem.h
+    src/filehandler/foldermodel.h
+    src/filehandler/foldermodel.cpp
+
+    src/listhandler/listhandler.h
+    src/listhandler/listhandler.cpp
+    src/listhandler/listsort.h
+    src/listhandler/listsort.cpp
+    src/listhandler/imageprovider.h
+    src/listhandler/imageprovider.cpp
+
+    src/listhandler/basefile/basefile.h
+    src/listhandler/basefile/basefile.cpp
+    src/listhandler/basefile/imagefile.h
+    src/listhandler/basefile/imagefile.cpp
+    src/listhandler/basefile/videofile.h
+    src/listhandler/basefile/videofile.cpp
+
+    src/listhandler/command/commandlist.h
+    src/listhandler/command/commandlist.cpp
+    src/listhandler/command/commanddata.h
+    src/listhandler/command/basecommand.h
+    src/listhandler/command/basecommand.cpp
+    src/listhandler/command/commanditem.h
+    src/listhandler/command/commandmodel.h
+    src/listhandler/command/commandmodel.cpp
+    src/listhandler/command/copycommand.h
+    src/listhandler/command/copycommand.cpp
+    src/listhandler/command/favoritecommand.h
+    src/listhandler/command/favoritecommand.cpp
+    src/listhandler/command/movecommand.h
+    src/listhandler/command/movecommand.cpp
+
+    src/listhandler/models/fileitem.h
+    src/listhandler/models/filemodel.h
+    src/listhandler/models/filemodel.cpp
+    src/listhandler/models/listmodels.h
+    src/listhandler/models/imagemodel.h
+    src/listhandler/models/imagemodel.cpp
+    src/listhandler/models/labelmodel.h
+    src/listhandler/models/labelmodel.cpp
+
+    src/listhandler/compare/comparelist.h
+    src/listhandler/compare/comparelist.cpp
+    src/listhandler/compare/tablemodel.h
+    src/listhandler/compare/tablemodel.cpp
+
+    src/listhandler/database/database.h
+    src/listhandler/database/database.cpp
+    src/listhandler/database/sqlhandler.h
+    src/listhandler/database/sqlhandler.cpp
+    src/listhandler/database/headeritem.h
+    src/listhandler/database/headermodel.h
+    src/listhandler/database/headermodel.cpp
+    )
+
+include_directories(src) # Avoids long headers (sorry)
+
+if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+    qt_add_executable(${CMAKE_PROJECT_NAME}
+        ${PROJECT_SOURCES}
+        )
+else()
+    if(ANDROID)
+        add_library(${CMAKE_PROJECT_NAME} SHARED
+            ${PROJECT_SOURCES}
+            )
+    else()
+        add_executable(${CMAKE_PROJECT_NAME}
+            ${PROJECT_SOURCES}
+            )
+    endif()
+endif()
+
+target_compile_definitions(${CMAKE_PROJECT_NAME}
+    PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+
+target_link_libraries(${CMAKE_PROJECT_NAME}
+    PRIVATE Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Quick
+    Qt${QT_VERSION_MAJOR}::Widgets
+    Qt${QT_VERSION_MAJOR}::Concurrent
+    Qt${QT_VERSION_MAJOR}::Sql
+    Qt${QT_VERSION_MAJOR}::Multimedia)
+
+# - - - For static build
+#set(CMAKE_CXX_FLAGS_RELEASE "/MT")
+#qt5_import_qml_plugins(${CMAKE_PROJECT_NAME})
+#target_link_libraries(${CMAKE_PROJECT_NAME}
+#    PRIVATE Qt${QT_VERSION_MAJOR}::Core
+#    Qt${QT_VERSION_MAJOR}::Quick
+#    Qt${QT_VERSION_MAJOR}::Widgets
+#    Qt${QT_VERSION_MAJOR}::Concurrent
+#    Qt${QT_VERSION_MAJOR}::Sql
+#    Qt${QT_VERSION_MAJOR}::Multimedia
+#    ${CMAKE_BINARY_DIR}/plugins/opencv_plugin.lib
+#    ${OpenCV_LIBS}
+#    ${CMAKE_BINARY_DIR}/plugins/exiv2_plugin.lib
+#    exiv2lib
+#    "E:/libs/exiv2-0.27.4/release/lib/exiv2-xmp.lib"
+#    "E:/libs/exiv2-0.27.4/release/lib/libexpat.lib"
+#    "E:/libs/exiv2-0.27.4/release/lib/zlibstatic.lib")

app/data/bitcoin-code.png

@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/">
+        <file>fonts/RobotoMono-Regular.ttf</file>
+        <file>bitcoin-code.png</file>
+        <file>fonts/Roboto-Regular.ttf</file>
+        <file>fonts/Roboto-Bold.ttf</file>
+        <file>fonts/Roboto-Italic.ttf</file>
+    </qresource>
+</RCC>