From ce0729e6601a63017a9d4d11b720f012da1e1c66 Mon Sep 17 00:00:00 2001
From: sellep <sellep@de.ibm.com>
Date: Thu, 4 Jun 2020 19:28:03 +0200
Subject: [PATCH] Add frame option for collage

Change-Id: Ic1d62579ba49998fc48c4b46cf108d535eb43e19
---
 README.md               |  1 +
 api/applyEffects.php    |  2 +-
 config/config.inc.php   |  2 ++
 lib/configsetup.inc.php | 11 +++++++++++
 resources/lang/de.json  |  2 ++
 resources/lang/en.json  |  2 ++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a71881fae..eea7ccef7 100644
--- a/README.md
+++ b/README.md
@@ -115,3 +115,4 @@ Donators who donated 5€ or more get early access to new features/options i am
 - [poldixd](https://github.com/poldixd)
 - [TheVaan](https://github.com/TheVaan)
 - [Andreas Remdt](https://andreasremdt.com)
+- [philippselle](philippselle)
diff --git a/api/applyEffects.php b/api/applyEffects.php
index 4c24801bb..11ce4ae48 100644
--- a/api/applyEffects.php
+++ b/api/applyEffects.php
@@ -30,7 +30,7 @@
         $collageSrcImagePaths[] = $collageBasename . '-' . $i . '.jpg';
     }
 
-    if (!createCollage($collageSrcImagePaths, $filename_tmp, $config['take_frame'], $frame_path)) {
+    if (!createCollage($collageSrcImagePaths, $filename_tmp, $config['take_collage_frame'], $config['take_collage_frame_path'])) {
         die(json_encode([
             'error' => 'Could not create collage'
         ]));
diff --git a/config/config.inc.php b/config/config.inc.php
index 6ac6a2ad9..dea99bb16 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -45,6 +45,8 @@
 $config['polaroid_rotation'] = '0';
 $config['take_frame'] = false;
 $config['take_frame_path'] = '../resources/img/frames/frame.png';
+$config['take_collage_frame'] = false;
+$config['take_collage_frame_path'] = '../resources/img/frames/frame.png';
 $config['chroma_keying'] = true;
 $config['use_collage'] = false;
 $config['continuous_collage'] = false;
diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
index 870f165bd..6e07d5897 100644
--- a/lib/configsetup.inc.php
+++ b/lib/configsetup.inc.php
@@ -198,6 +198,17 @@
 			'name' => 'use_collage',
 			'value' => $config['use_collage']
 		],
+		'take_collage_frame' => [
+			'type' => 'checkbox',
+			'name' => 'take_collage_frame',
+			'value' => $config['take_collage_frame']
+		],
+		'take_collage_frame_path' => [
+			'type' => 'input',
+			'placeholder' => $defaultConfig['take_collage_frame_path'],
+			'name' => 'take_collage_frame_path',
+			'value' => $config['take_collage_frame_path']
+		],
 		'collage_cntdwn_time' => [
 			'type' => 'range',
 			'name' => 'collage_cntdwn_time',
diff --git a/resources/lang/de.json b/resources/lang/de.json
index 963a5b4d8..cd559f3b5 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -59,6 +59,7 @@
   "general_polaroid_rotation": "Polaroid Bild-Rotation",
   "general_start_screen_subtitle": "Startbildschirm (Untertitel)",
   "general_start_screen_title": "Startbildschirm (Titel)",
+  "general_take_collage_frame_path": "Rahmen",
   "general_take_frame_path": "Rahmen",
   "general_time_to_live": "Bildanzeige nach Aufnahme:",
   "general_videoHeight": "Gerätekamera Bildhöhe",
@@ -272,6 +273,7 @@
   "symbol": "Symbol auswählen",
   "takeCollage": "Collage erstellen!",
   "takePhoto": "Foto erstellen!",
+  "take_collage_frame": "Foto-Collage mit Rahmen aufnehmen",
   "take_frame": "Bild mit Rahmen aufnehmen",
   "test_update_available": "Es ist ein Test-Update verfügbar.",
   "toggleFullscreen": "Vollbildmodus umschalten",
diff --git a/resources/lang/en.json b/resources/lang/en.json
index 9fe7c730e..f9338df40 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -60,6 +60,7 @@
   "general_polaroid_rotation": "Polaroid picture rotation",
   "general_start_screen_subtitle": "Start screen (subtitle)",
   "general_start_screen_title": "Start screen (title)",
+  "general_take_collage_frame_path": "Frame",
   "general_take_frame_path": "Frame",
   "general_time_to_live": "Show image after capture:",
   "general_videoHeight": "Device cam picture height",
@@ -276,6 +277,7 @@
   "symbol": "Choose a symbol",
   "takeCollage": "Take Collage!",
   "takePhoto": "Take Pic!",
+  "take_collage_frame": "Take collage with frame",
   "take_frame": "Take picture with frame",
   "test_update_available": "There is a test update available.",
   "toggleFullscreen": "Toggle Fullscreen",