Skip to content

[Feature / WIP] Add frame option for collage #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philippselle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Feature / WIP] Add frame option for collage #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/applyEffects.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
$collageSrcImagePaths[] = $collageBasename . '-' . $i . '.jpg';
}

if (!createCollage($collageSrcImagePaths, $filename_tmp, $config['take_frame'], $config['take_frame_path'])) {
if (!createCollage($collageSrcImagePaths, $filename_tmp, $config['take_collage_frame'], $config['take_collage_frame_path'])) {
die(json_encode([
'error' => 'Could not create collage'
]));
Expand Down
2 changes: 2 additions & 0 deletions config/config.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,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;
Expand Down
11 changes: 11 additions & 0 deletions lib/configsetup.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,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' => 'input',
'name' => 'collage_cntdwn_time',
Expand Down
2 changes: 2 additions & 0 deletions resources/lang/de.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ const L10N = {
'polaroid_effect': 'Polaroid Effekt',
'general_polaroid_rotation': 'Polaroid Bild-Rotation',
'use_collage': 'Foto-Collage erlauben',
'take_collage_frame': 'Foto-Collage mit Rahmen aufnehmen',
'take_collage_frame_path': 'Rahmen',
Copy link
Collaborator

@andi34 andi34 Jun 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

general_take_collage_frame_path

'take_frame': 'Bild mit Rahmen aufnehmen',
'general_take_frame_path': 'Rahmen',
'print_frame': 'Rahmen auf Bild drucken',
Expand Down
2 changes: 2 additions & 0 deletions resources/lang/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ const L10N = {
'polaroid_effect': 'Polaroid effect',
'general_polaroid_rotation': 'Polaroid picture rotation',
'use_collage': 'Allow photo collage',
'take_collage_frame': 'Take collage with frame',
'take_collage_frame_path': 'Frame',
'take_frame': 'Take picture with frame',
Copy link
Collaborator

@andi34 andi34 Jul 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

general_take_collage_frame_path here too

'general_take_frame_path': 'Frame',
'print_frame': 'Print frame on picture',
Expand Down