Skip to content

Commit 7a3c887

Browse files
Andries-SmitAndries-Smit
authored
Merge feature/blocking-upload
2 parents 9948ac8 + ce4f014 commit 7a3c887

File tree

5 files changed

+204
-101
lines changed

5 files changed

+204
-101
lines changed

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ and run further actions.
5555
Setting that determines where the image will come from: gallery or the camera.
5656

5757
### Image quality
58-
Be aware that setting this higher will be more taxing and will take longer to upload. If quality
59-
width and height are both set to `0`, the image will be saved full size.
58+
This will change the image-width and height on output. Be aware that setting this higher will be more taxing and will take longer to upload. If quality width and height are both set to `0`, the image will be saved full size.
6059

6160
#### Quality width
62-
The width of the image that is eventually stored and send to the application, between 0 and 100.
63-
#### Quality height
64-
The height of the image that is eventually stored and send to the application, between 0 and 100.
61+
Width in pixels to scale image. Must be used with targetHeight. Aspect ratio remains constant.
6562

63+
#### Quality height
64+
Height in pixels to scale image. Must be used with targetWidth. Aspect ratio remains constant.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CameraWidgetForPhoneGap",
3-
"version": "3.3.2",
3+
"version": "4.0.0",
44
"description": "Enable native camera functionality within your Mendix hybrid app",
55
"license": "Apache-2.0",
66
"author": "Mendix BV",

‎src/CameraWidgetForPhoneGap/CameraWidgetForPhoneGap.xml‎

Lines changed: 48 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,43 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<widget id="CameraWidgetForPhoneGap.widget.CameraWidgetForPhoneGap" needsEntityContext="true" offlineCapable="true"
3-
xmlns="http://www.mendix.com/widget/1.0/">
2+
<widget id="CameraWidgetForPhoneGap.widget.CameraWidgetForPhoneGap" needsEntityContext="true" offlineCapable="true" xmlns="http://www.mendix.com/widget/1.0/">
43
<name>Camera</name>
5-
<description>Creates a button to use the phone camera option within a Mendix Developer application.</description>
4+
<description>Creates a button to use the phone camera option within a Mendix Developer application</description>
65
<icon>iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAA21BMVEUAAAD///+A//9VVVVmZmZVVVVgYGBVVVVmZmZVVVViYmJeXl5SuP9cXFxJtv9YWFhVVVVYWFhXV1dVVVVVVVVXV1dWVlZXV1dJs/lWVlZJs/lVVVVJsfdJsfhIsvhXV1dVVVVWVlZWVlZWVlZVVVVWVlZWVlZVVVVWVlZWVlZVVVVWVlZVVVVVVVVIsfhJsPhJsfhJsfhVVVVJsfdVVVVJsfhVVVVVVVVWVlZJsPdVVVVVVVVVVVVWVlZIsPhVVVVJsfhIsPhVVVVVVVVVVVVJsPhVVVVIsPdVVVUd0v+1AAAAR3RSTlMAAQIDBQYICQoMDRMZGRwgJDQ1NkhJSk9QUFdjZWlqcHJ5g4WZmpufoKOrrLCxtLW2vcLIyNHS1d/j5Ons7vDw8fP19vn8/PqNolUAAAJ4SURBVHgB7VdvX+IwDO6YoIhDBO4QYTL+HJwip4ITVByHotv3/0SX5IdzuWxs/vrW5w1tw/OsTZq0Vcn4hll1htPFcrNZLqa/nKr5NfZeY7wKGFaXjb3M9P3uMojBsrufbe6txyABj60MK/k53/77ddKpV0r5fKlS70xet4PzHyl0ox8QnkfNg+j4QXP0HBD6xi5+8SpAvPQOpe2w90LGq2Iy//ge//E+sOLN1uAd7ffHifwn8tSJSsQJ+fcpQaFI37+z1A5YdzSH2FUYtP6LgtqJwgX5Ic6TfeKrVJBCPyb+NP9CukCBViH2gzlH/1kqAyz05NxUHC2MH/f/6YO/xcMpjwVGs/Vf/qDqgA2dvfkh3s6YaYCz5ZnVxf1nCX6CgoV7ssvyH/O3J/iJCj3M7mh9aGL+4P7PnbseJ3Exz7VzmBeYWY2IwBj6I2zY4qNiOjaOjIBwGYkh1q8mtlzBFwrux5RXn5GsYf2g/P/ry9DxkPoe1QesMNXQ7EBvQi0fEEmP9my9nrUN6nD7BChOODyEXkcKHN36hNsjKdAByjAcnkKvLgQM4pMCzOH6mtnrQJmGAgvoVYRA2w/RBoE/zF4ByiIUwG1UEgIzaN+UyzfwMxNLKOFWCgU20MsLgTW0y0qV4WctBPJA2egL6C8huxMJ0onZw4iQYdTfSNpbmSeTEJBAO0smls5ZBXg684Li+amgdP7NC4pqfJQ0N13AjZY0UVTtdAGbFVVe1llRjYXnnudkWZcHi0TawSKPNgl5tOkfrvrHu/4FQ/+Ko3/J0r/m6V809a+6Wpdtjeu+xoND48mj8egapzy6BMza57Nv6NR2zP0b/wDScUGfAMfR4QAAAABJRU5ErkJggg==</icon>
76
<phonegap enabled="true"/>
87
<properties>
98
<property key="buttonClass" type="string" defaultValue="wx-mxwx-button-extra">
109
<caption>Class</caption>
1110
<category>Button</category>
12-
<description>The class on the button.</description>
11+
<description>The CSS class on the button</description>
1312
</property>
14-
<property key="buttonText" type="string" defaultValue="activate camera">
13+
<property key="buttonText" type="translatableString">
1514
<caption>Label</caption>
1615
<category>Button</category>
17-
<description>The label on the button.</description>
16+
<description/>
17+
<translations>
18+
<translation lang="en_US">Activate camera</translation>
19+
<translation lang="nl_NL">Camera activeren</translation>
20+
</translations>
1821
</property>
1922
<property key="imageContainerClass" type="string" defaultValue="wx-mxwx-imagecontainer-extra">
2023
<caption>Image container class</caption>
2124
<category>Appearance</category>
22-
<description>The class on the button.</description>
25+
<description>The CSS class on the preview</description>
2326
</property>
2427
<property key="imageWidth" type="integer" defaultValue="150">
2528
<caption>Width</caption>
2629
<category>Appearance</category>
27-
<description>The width of the image.</description>
30+
<description>The width of the image thumbnail</description>
2831
</property>
2932
<property key="imageHeight" type="integer" defaultValue="150">
3033
<caption>Height</caption>
3134
<category>Appearance</category>
32-
<description>The height of the image.</description>
35+
<description>The height of the image thumbnail</description>
3336
</property>
3437
<property key="imageLocation" type="enumeration" defaultValue="right">
3538
<caption>Image location</caption>
3639
<category>Appearance</category>
37-
<description>The position where the image is set.</description>
40+
<description>The position where the thumbnail image is set</description>
3841
<enumerationValues>
3942
<enumerationValue key="above">Above</enumerationValue>
4043
<enumerationValue key="below">Below</enumerationValue>
@@ -45,38 +48,62 @@
4548
<property key="targetWidth" type="integer" defaultValue="150">
4649
<caption>Quality width</caption>
4750
<category>Image quality</category>
48-
<description>The width of the image.</description>
51+
<description>The width of the captured image</description>
4952
</property>
5053
<property key="targetHeight" type="integer" defaultValue="150">
5154
<caption>Quality height</caption>
5255
<category>Image quality</category>
53-
<description>The height of the image.</description>
56+
<description>The height of the captured image</description>
57+
</property>
58+
<property key="autoCapture" type="boolean" defaultValue="false">
59+
<caption>Auto capture</caption>
60+
<category>Behavior</category>
61+
<description>Enable auto capture to automatically start the camera</description>
5462
</property>
5563
<property key="autoSaveEnabled" type="boolean" defaultValue="false">
56-
<caption>Autosave</caption>
57-
<category>Behaviour</category>
58-
<description>Enable autosave to automatically save your image</description>
64+
<caption>Auto save</caption>
65+
<category>Behavior</category>
66+
<description>Enable auto save to automatically save your image</description>
5967
</property>
6068
<property key="onchangemf" type="microflow" required="false">
6169
<caption>On save microflow</caption>
62-
<category>Behaviour</category>
63-
<description>This microflow is called when the object is saved. use this to commit the object when using autosave</description>
70+
<category>Behavior</category>
71+
<description>This microflow is called when the object is saved. Use this to commit the object when using autosave</description>
6472
<returnType type="Void"/>
6573
</property>
6674
<property key="onSaveNanoflow" type="nanoflow" required="false">
6775
<caption>On save nanoflow</caption>
68-
<category>Behaviour</category>
69-
<description>This nanoflow is called when the object is saved. use this to commit the object when using autosave</description>
76+
<category>Behavior</category>
77+
<description>This nanoflow is called when the object is saved. Use this to commit the object when using autosave</description>
7078
<returnType type="Void"/>
7179
</property>
7280
<property key="pictureSource" type="enumeration" defaultValue="camera">
73-
<caption>Picture Source</caption>
74-
<category>Behaviour</category>
81+
<caption>Picture source</caption>
82+
<category>Behavior</category>
7583
<description>Grab image from either the camera or the phone's image gallery</description>
7684
<enumerationValues>
7785
<enumerationValue key="camera">Camera</enumerationValue>
7886
<enumerationValue key="gallery">Gallery</enumerationValue>
7987
</enumerationValues>
8088
</property>
89+
<property key="blockingUpload" type="enumeration" defaultValue="disabled">
90+
<caption>Block during upload</caption>
91+
<category>Behavior</category>
92+
<description>Prevent any form interaction. Shows the blocking progress message during the whole upload. Or show 'On form save', useful for 'autosave', will only show the blocking progress when the form will be closed, and the upload is not completed</description>
93+
<enumerationValues>
94+
<enumerationValue key="disabled">None</enumerationValue>
95+
<enumerationValue key="duringUpload">During upload</enumerationValue>
96+
<enumerationValue key="onFormSave">On form save</enumerationValue>
97+
</enumerationValues>
98+
</property>
99+
<property key="progressText" type="translatableString" required="false" >
100+
<caption>Progress upload text</caption>
101+
<category>Behavior</category>
102+
<description/>
103+
<translations>
104+
<translation lang="en_US">Uploading image in progress...</translation>
105+
<translation lang="nl_NL">Bezig met uploaden van de afbeelding...</translation>
106+
</translations>
107+
</property>
81108
</properties>
82109
</widget>

0 commit comments

Comments
 (0)