New upstream version 0.25.0upstream/0.25.0

2 files changed, 76 insertions, 6 deletions

diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index 16ba868..ce3b815 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -14,6 +14,7 @@
     <child name="window" schema="org.yorba.shotwell.preferences.window" />
     <child name="files" schema="org.yorba.shotwell.preferences.files" />
     <child name="editing" schema="org.yorba.shotwell.preferences.editing" />
+    <child name="export" schema="org.yorba.shotwell.preferences.export" />
 </schema>
 
 <schema id="org.yorba.shotwell.preferences.ui" path="/org/yorba/shotwell/preferences/ui/">
@@ -74,7 +75,7 @@
     <key name="display-photo-ratings" type="b">
         <default>true</default>
         <summary>display photo ratings</summary>
-        <description>True if a photo's rating should be displayed as overlaid trinket, false otherwise.</description>
+        <description>True if a photo’s rating should be displayed as overlaid trinket, false otherwise.</description>
     </key>
     
     <key name="photo-rating-filter" type="i">
@@ -163,8 +164,8 @@
     
     <key name="hide-photos-already-imported" type="b">
         <default>false</default>
-        <summary>Selection state of "hide photos" option</summary>
-        <description>Last used selection state of the "hide photos already imported" option in the import page.</description>
+        <summary>Selection state of “hide photos” option</summary>
+        <description>Last used selection state of the “hide photos already imported” option in the import page.</description>
     </key>
 </schema>
 
@@ -290,12 +291,12 @@
     </key>
     <key name="last-crop-width" type="i">
         <default>1</default>
-        <summary>Most-recently-used crop custom aspect ratio's numerator.</summary>
+        <summary>Most-recently-used crop custom aspect ratio’s numerator.</summary>
         <description>A nonzero, positive integer representing the width part of the last custom crop ratio the user entered.</description>
     </key>
     <key name="last-crop-height" type="i">
         <default>1</default>
-        <summary>Most-recently-used crop custom aspect ratio's denominator.</summary>
+        <summary>Most-recently-used crop custom aspect ratio’s denominator.</summary>
         <description>A nonzero, positive integer representing the height part of the last custom crop ratio the user entered.</description>
     </key>
 </schema>
@@ -314,6 +315,75 @@
     </key>
 </schema>
 
+<enum id="org.yorba.shotwell.ScaleConstraint">
+    <value value="0" nick="ORIGINAL" />
+    <value value="1" nick="DIMENSIONS" />
+    <value value="2" nick="WIDTH" />
+    <value value="3" nick="HEIGHT" />
+    <value value="4" nick="FILL_VIEWPORT" />
+</enum>
+
+<enum id="org.yorba.shotwell.ExportFormatMode">
+    <value value="0" nick="UNMODIFIED" />
+    <value value="1" nick="CURRENT" />
+    <value value="2" nick="SPECIFIED" />
+    <value value="3" nick="LAST" />
+</enum>
+
+<enum id="org.yorba.shotwell.PhotoFileFormat">
+    <value value="0" nick="JFIF" />
+    <value value="1" nick="RAW" />
+    <value value="2" nick="PNG" />
+    <value value="3" nick="TIFF" />
+    <value value="4" nick="BMP" />
+    <value value="5" nick="UNKNOWN" />
+</enum>
+
+<enum id="org.yorba.shotwell.JpegQuality">
+    <value value="50" nick="LOW" />
+    <value value="75" nick="MEDIUM" />
+    <value value="90" nick="HIGH" />
+    <value value="100" nick="MAXIMUM" />
+</enum>
+
+<schema id="org.yorba.shotwell.preferences.export" path="/org/yorba/shotwell/preferences/export/">
+    <key name="constraint" enum="org.yorba.shotwell.ScaleConstraint">
+        <default>'ORIGINAL'</default>
+        <summary>Setting in export dialog: how to trim images</summary>
+        <description>Setting in export dialog: how to trim images</description>
+    </key>
+
+    <key name="export-metadata" type="b">
+        <default>true</default>
+        <summary>export metadata</summary>
+        <description>Setting in export dialog: option to export metadata</description>
+    </key>
+
+    <key name="export-format-mode" enum="org.yorba.shotwell.ExportFormatMode">
+        <default>'CURRENT'</default>
+        <summary>format setting, special value</summary>
+        <description>Setting in export dialog: format setting, special value</description>
+    </key>
+
+    <key name="photo-file-format" enum="org.yorba.shotwell.PhotoFileFormat">
+        <default>'JFIF'</default>
+        <summary>format setting, type value</summary>
+        <description>Setting in export dialog: format setting, type value</description>
+    </key>
+
+    <key name="quality" enum="org.yorba.shotwell.JpegQuality">
+        <default>'HIGH'</default>
+        <summary>JPEG quality option</summary>
+        <description>Setting in export dialog: jpeg quality option</description>
+    </key>
+
+    <key name="scale" type="i">
+        <default>1200</default>
+        <summary>maximal size of image</summary>
+        <description>Setting in export dialog: maximal size of image</description>
+    </key>
+</schema>
+
 <schema id="org.yorba.shotwell.sharing" path="/org/yorba/shotwell/sharing/">
     <key name="last-used-service" type="s">
         <default>""</default>
diff --git a/misc/shotwell.appdata.xml.in b/misc/shotwell.appdata.xml.in
index 955ec1c..15a8e92 100644
--- a/misc/shotwell.appdata.xml.in
+++ b/misc/shotwell.appdata.xml.in
@@ -12,7 +12,7 @@
       Shotwell is an easy-to-use, fast photo organizer designed for the GNOME desktop.
       It allows you to import photos from your camera or disk, organize them by date and subject
       matter, even ratings.  It also offers basic photo editing, like crop, red-eye correction,
-      color adjustments, and straighten.  Shotwell's non-destructive photo editor does not alter
+      color adjustments, and straighten.  Shotwell’s non-destructive photo editor does not alter
       your master photos, making it easy to experiment and correct errors.
     </p>
     <p>