Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
ui: add option to show / hide button bar on result screen
Browse files Browse the repository at this point in the history
Change-Id: I1988943dd5832a8ea5045969f3c7cc4f0cce881f
  • Loading branch information
andi34 committed Aug 19, 2021
1 parent 8692f2e commit 2fbdac3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions config/config.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@
$config['ui']['style'] = 'modern';
$config['button']['show_fs'] = false;
$config['button']['homescreen'] = true;
$config['ui']['result_buttons'] = true;
$config['ui']['font_size'] = '16px';
$config['colors']['countdown'] = '#ffffff';
$config['colors']['background_countdown'] = '#214852';
Expand Down
6 changes: 6 additions & 0 deletions lib/configsetup.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,12 @@
'name' => 'button[homescreen]',
'value' => $config['button']['homescreen'],
],
'ui_result_buttons' => [
'view' => 'advanced',
'type' => 'checkbox',
'name' => 'ui[result_buttons]',
'value' => $config['ui']['result_buttons'],
],
'ui_font_size' => [
'view' => 'advanced',
'type' => 'input',
Expand Down
2 changes: 2 additions & 0 deletions resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@
"manual:userinterface:button_show_fs": "If enabled, a button to toggle fullscreenmode will be added to the start screen.",
"manual:userinterface:ui_decore_lines": "If enabled, decorate lines will be visible on start page.",
"manual:userinterface:ui_font_size": "Enter the default font size used for the Photobooth interface.",
"manual:userinterface:ui_result_buttons": "If enabled, post-processing buttons will be visible on the on result screen. If disabled the whole button bar will be hidden.",
"manual:userinterface:ui_rounded_corners": "If enabled, the Photobooth UI uses smooth rounded edges.",
"manual:userinterface:ui_style": "Choose a start page styling. To use custom styling please create and use \"/template/custom.template.php\" and \"/resources/css/custom_style.css\", if one of these files is not readable we will fallback to default theme.",
"manual:version:check_version": "This will check online against the Github repository for the latest Photobooth version.",
Expand Down Expand Up @@ -556,6 +557,7 @@
"userinterface:colors_start_font": "Start screen font color",
"userinterface:ui_decore_lines": "Show decorate lines",
"userinterface:ui_font_size": "Default font size",
"userinterface:ui_result_buttons": "Show button bar on result screen",
"userinterface:ui_rounded_corners": "Rounded corners",
"userinterface:ui_style": "Styling",
"using_latest_version": "You are using the latest version of photobooth.",
Expand Down
4 changes: 1 addition & 3 deletions src/js/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ const photoBooth = (function () {
$(selector).addClass('modal--show');
},
close: function (selector) {
//api.showResultInner(true);

if ($(selector).hasClass('modal--show')) {
$(selector).removeClass('modal--show');

Expand Down Expand Up @@ -787,7 +785,7 @@ const photoBooth = (function () {
startPage.hide();
resultPage.show();

api.showResultInner(true);
api.showResultInner(config.ui.result_buttons);

loader.removeClass('open');

Expand Down

0 comments on commit 2fbdac3

Please sign in to comment.