From 4caf1132de5ef646de9b5d62c8005f113831d8d5 Mon Sep 17 00:00:00 2001 From: Roberto Martinez Date: Tue, 1 Oct 2019 14:26:31 -0400 Subject: [PATCH 1/5] Adds min max props to Input --- src/components/input.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/input.js b/src/components/input.js index 12491f2bb4..c22250bef6 100644 --- a/src/components/input.js +++ b/src/components/input.js @@ -208,6 +208,8 @@ class Input extends React.PureComponent { required={this.props.isRequired} tabIndex={this.props.tabIndex} type={this.props.type} + max={this.props.max} + min={this.props.min} value={this.state.value} onBlur={this.handleBlur} onChange={this.handleChange} @@ -241,6 +243,8 @@ class Input extends React.PureComponent { isReadOnly: bool, isRequired: bool, match: func.isRequired, + max: number, + min: number, placeholder: string, resize: bool, tabIndex: number, From ddfbd1e5525b4f970170c5d1c5d4027a283dde6e Mon Sep 17 00:00:00 2001 From: Roberto Martinez Date: Tue, 1 Oct 2019 14:26:52 -0400 Subject: [PATCH 2/5] Adds DPI to language file --- res/strings/renderer.en.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/strings/renderer.en.yml b/res/strings/renderer.en.yml index e741fe21da..2b4c5e5a6f 100644 --- a/res/strings/renderer.en.yml +++ b/res/strings/renderer.en.yml @@ -134,6 +134,8 @@ en: skip: Skip duplicate photos import: Accept duplicate photos prompt: Ask me every time + density: + label: DPI export: label: Export note: From 12a296e1aa1863ea00c6544532f27e53ba168939 Mon Sep 17 00:00:00 2001 From: Roberto Martinez Date: Tue, 1 Oct 2019 14:27:28 -0400 Subject: [PATCH 3/5] Adds DPI constants --- src/constants/import.js | 4 +++- src/reducers/settings.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/constants/import.js b/src/constants/import.js index cb10edf153..3ee97b9eac 100644 --- a/src/constants/import.js +++ b/src/constants/import.js @@ -1,5 +1,7 @@ 'use strict' module.exports = { - RESTORE: 'imports.restore' + RESTORE: 'imports.restore', + DPIMAX: 300, + DPIMIN: 72 } diff --git a/src/reducers/settings.js b/src/reducers/settings.js index f68e0e412e..da3d9be421 100644 --- a/src/reducers/settings.js +++ b/src/reducers/settings.js @@ -7,6 +7,7 @@ const { darwin } = require('../common/os') const defaults = { debug: ARGS.debug, dup: 'prompt', + dpi: 300, export: { note: { format: { From 285d6a7bb170bba00f580a30710dbea972c49cb2 Mon Sep 17 00:00:00 2001 From: Roberto Martinez Date: Tue, 1 Oct 2019 14:28:02 -0400 Subject: [PATCH 4/5] Adds DPI input to PreferencesSettings panel --- src/components/prefs/app.js | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/components/prefs/app.js b/src/components/prefs/app.js index b6c0d31509..f77710dc3c 100644 --- a/src/components/prefs/app.js +++ b/src/components/prefs/app.js @@ -3,8 +3,9 @@ const React = require('react') const { TemplateSelect } = require('../template/select') const { ResourceSelect } = require('../resource/select') +const { Input } = require('../input') const { ipcRenderer: ipc } = require('electron') -const { ESPER, ITEM } = require('../../constants') +const { ESPER, ITEM, IMPORTS } = require('../../constants') const { darwin } = require('../../common/os') const { @@ -14,7 +15,7 @@ const { } = require('../icons') const { - array, arrayOf, bool, func, object, shape, string + array, arrayOf, bool, func, object, shape, string, number } = require('prop-types') const { @@ -43,6 +44,10 @@ class AppPrefs extends React.PureComponent { this.props.onSettingsUpdate({ localtime }) } + handleDPIChange = dpi => { + this.props.onSettingsUpdate({ dpi }) + } + handleTemplateChange = (values, hasChanged) => { if (hasChanged) { let [type, template] = Object.entries(values)[0] @@ -142,6 +147,18 @@ class AppPrefs extends React.PureComponent { name="force" value={this.props.settings.title.force} onChange={this.handleTitleChange}/> + + +
Date: Tue, 1 Oct 2019 16:03:03 -0400 Subject: [PATCH 5/5] Saving DPI into a numeric value --- src/components/prefs/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/prefs/app.js b/src/components/prefs/app.js index f77710dc3c..0995477684 100644 --- a/src/components/prefs/app.js +++ b/src/components/prefs/app.js @@ -45,7 +45,7 @@ class AppPrefs extends React.PureComponent { } handleDPIChange = dpi => { - this.props.onSettingsUpdate({ dpi }) + this.props.onSettingsUpdate({ dpi: Number(dpi) }) } handleTemplateChange = (values, hasChanged) => {