Merge d6cf220 into cb51af8

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:

src/components/form.js

@@ -146,10 +146,12 @@ class FormField extends React.PureComponent {
           ref={this.setInput}
           id={this.props.id}
           className="form-control"
+          max={this.props.max}
+          min={this.props.min}
           name={this.props.name}
           placeholder={this.props.placeholder}
           tabIndex={this.props.tabIndex}
-          type="text"
+          type={this.props.type}
           value={this.props.value || ''}
           isDisabled={this.props.isDisabled}
           isReadOnly={this.props.isReadOnly}
@@ -168,10 +170,13 @@ class FormField extends React.PureComponent {
     isReadOnly: bool,
     isRequired: bool,
     label: string,
+    max: number,
+    min: number,
     name: string.isRequired,
     placeholder: string,
     size: number.isRequired,
     tabIndex: number,
+    type: string.isRequired,
     title: string,
     value: string,
     onBlur: func.isRequired,
@@ -182,6 +187,7 @@ class FormField extends React.PureComponent {
   static defaultProps = {
     isReadOnly: false,
     size: 8,
+    type: 'text',
     onBlur: noop,
     onChange: noop,
     onInputChange: noop

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,

src/components/prefs/app.js

@@ -4,7 +4,7 @@ const React = require('react')
 const { TemplateSelect } = require('../template/select')
 const { ResourceSelect } = require('../resource/select')
 const { ipcRenderer: ipc } = require('electron')
-const { ESPER, ITEM } = require('../../constants')
+const { ESPER, ITEM, IMPORTS } = require('../../constants')
 const { darwin } = require('../../common/os')
 
 const {
@@ -14,11 +14,12 @@ const {
 } = require('../icons')
 
 const {
-  array, arrayOf, bool, func, object, shape, string
+  array, arrayOf, bool, func, object, shape, string, number
 } = require('prop-types')
 
 const {
   FormElement,
+  FormField,
   FormSelect,
   FormToggle,
   FormToggleGroup,
@@ -142,6 +143,15 @@ class AppPrefs extends React.PureComponent {
             name="force"
             value={this.props.settings.title.force}
             onChange={this.handleTitleChange}/>
+          <FormField
+            id="prefs.app.density.label"
+            isCompact
+            max={this.props.importMax}
+            min={this.props.importMin}
+            name="density"
+            onChange={this.props.onSettingsUpdate}
+            type="number"
+            value={this.props.settings.density}/>
           <hr/>
           <FormSelect
             id="prefs.app.style.theme"
@@ -268,6 +278,8 @@ class AppPrefs extends React.PureComponent {
     }).isRequired,
     layouts: arrayOf(string).isRequired,
     locales: arrayOf(string).isRequired,
+    importMin: number.isRequired,
+    importMax: number.isRequired,
     themes: arrayOf(string).isRequired,
     dupOptions: arrayOf(string).isRequired,
     zoomModes: arrayOf(string).isRequired,
@@ -281,7 +293,9 @@ class AppPrefs extends React.PureComponent {
     locales: ['de', 'en', 'es', 'fr', 'it', 'ja'],
     dupOptions: ['skip', 'import', 'prompt'],
     zoomModes: [ESPER.MODE.FIT, ESPER.MODE.FILL],
-    printModes: ['item', 'photo', 'selection']
+    printModes: ['item', 'photo', 'selection'],
+    importMin: IMPORTS.DPIMIN,
+    importMax: IMPORTS.DPIMAX
   }
 }
 

src/constants/import.js

@@ -1,5 +1,7 @@
 'use strict'
 
 module.exports = {
-  RESTORE: 'imports.restore'
+  RESTORE: 'imports.restore',
+  DPIMAX: 300,
+  DPIMIN: 72
 }

src/reducers/settings.js

@@ -7,6 +7,7 @@ const { darwin } = require('../common/os')
 const defaults = {
   debug: ARGS.debug,
   dup: 'prompt',
+  density: 300,
   export: {
     note: {
       format: {