Merge remote-tracking branch 'cubantech/master'

Author: olemis

watermarks/LICENSE.GPLv2

@@ -0,0 +1,62 @@
+<p align="center"><img src=media/appIcon.png></p>  
+
+# Watermarker - Tool to print watermarks over images
+
+*Copyright 2019 Carlos Enrique Pérez Sánchez.*  
+
+-----------------------------------------------------------------------------------------------------------------------------------
+
+## Features  
+* Shows 4 images with the watermark in each corner  
+* Set horizontal and/or vertical padding for the watermark image  
+* Select one or more images and print them to an output folder  
+* View a image in full-screen
+* Remember configuration
+
+-----------------------------------------------------------------------------------------------------------------------------------
+
+## Usage  
+The first time you open the application, you will see a window telling you to configure the input folder (where you previously copied the images), the output folder and the watermark image:  
+
+![](media/Screenshot_1.png)  
+
+You can configure all from the menu bar:  
+
+![](media/Screenshot_2.png)  
+
+![](media/Screenshot_3.png)  
+
+![](media/Screenshot_4.png)  
+
+Then configure the position of the watermark image from the sliders, as shown bellow. Then, you can select one or more images and click **NEXT** to continue to the next image (if any).
+
+![](media/Screenshot_5.png)  
+
+You can *Press and hold* one of the images to show it in full-screen mode, where you can flick it both horizontally and vertically to observe it in detail.
+
+![](media/Screenshot_6.png)  
+
+A progress bar bellow the menu bar indicates the progress (remaining images). Once you finish you will see the following screen (click anywhere to exit that screen and start again).
+
+![](media/Screenshot_7.png)  
+
+-----------------------------------------------------------------------------------------------------------------------------------
+
+## Platforms
+This program has been tested in **Linux** (*Ubuntu 18.04 LTS*) and **Windows** (*Windows 10 RS5*). The program should behave in MacOS in the same way it works in Linux/Windows, but I haven't tested it due to the lac of a Mac. A MacOS icon must be configured.  
+This program ***can*** be compiled to mobile platforms, like Android & iOS, but I haven't designed it to fit the requirements of smartphone's screens. An alternative UI must be implemented first.  
+
+-----------------------------------------------------------------------------------------------------------------------------------
+
+## Build
+This program uses Qt. The minimum required version is [Qt 5.12.0 LTS](https://download.qt.io/archive/qt/5.12/5.12.0/ "Qt Archive"). To build it, just open the `.pro` file in Qt Creator or execute `qmake` in the project directory:  
+`$ qmake Watermarker.pro`  
+
+-----------------------------------------------------------------------------------------------------------------------------------
+
+## License
+This program is under the *General Public License* (version 2).  
+
+-----------------------------------------------------------------------------------------------------------------------------------
+
+***Contact info:*** [*thecrowporation@gmail.com*](mailto:thecrowporation@gmail.com)

watermarks/README.md

@@ -0,0 +1,38 @@
+QT += quick widgets
+CONFIG += c++11
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Refer to the documentation for the
+# deprecated API to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += \
+        backend/main.cpp \
+    backend/ImagesManager/imagesmanager.cpp
+
+RESOURCES += \
+        ui/qml.qrc \
+        resources/qt.qrc \
+    resources/images/images.qrc
+
+RC_FILE = resources/resManifest.rc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
+
+HEADERS += \
+    backend/ImagesManager/imagesmanager.h