Imported Upstream version 0.20.0upstream/0.20.0

3 files changed, 118 insertions, 3 deletions

diff --git a/misc/org.yorba.shotwell-extras.gschema.xml b/misc/org.yorba.shotwell-extras.gschema.xml
index 17e66c7..3506f12 100644
--- a/misc/org.yorba.shotwell-extras.gschema.xml
+++ b/misc/org.yorba.shotwell-extras.gschema.xml
@@ -34,5 +34,62 @@
     </key>
 </schema>
 
+<schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-rajce" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-rajce/">
+    <key name="url" type="s">
+        <default>"http://rajce.net/"</default>
+        <summary>Rajce URL</summary>
+        <description>URL of the Rajce server.</description>
+    </key>
+    
+    <key name="username" type="s">
+        <default>""</default>
+        <summary>username</summary>
+        <description>Rajce username, if logged in.</description>
+    </key>
+    
+    <key name="token" type="s">
+        <default>""</default>
+        <summary>token</summary>
+        <description>user token, if remembered.</description>
+    </key>
+
+    <key name="last-category" type="i">
+        <default>-1</default>
+        <summary>last category</summary>
+        <description>The last selected Rajce category.</description>
+    </key>
+    
+    <key name="last-photo-size" type="i">
+        <default>-1</default>
+        <summary>last photo size</summary>
+        <description>A numeric code representing the last photo size preset used when publishing to Rajce.</description>
+    </key>
+    
+    <key name="remember" type="b">
+        <default>false</default>
+        <summary>remember</summary>
+        <description>If true, remember last login.</description>
+    </key>
+    
+    <key name="hide-album" type="b">
+        <default>false</default>
+        <summary>hide album</summary>
+        <description>If true, hide the newly created Rajce album.</description>
+    </key>
+
+    <key name="show-album" type="b">
+        <default>false</default>
+        <summary>open album in web browser</summary>
+        <description>If true, open target album in the web browser just after uploading photos</description>
+    </key>
+
+    <key name="strip-metadata" type="b">
+        <default>false</default>
+        <summary>remove sensitive info from uploads</summary>
+        <description>Whether images being uploaded to Rajce should have their metadata removed first</description>
+    </key>
+
+</schema>
+
 </schemalist>
 
diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index e0e9448..1f6a093 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -323,6 +323,7 @@
     
     <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
     <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
+    <child name="gallery3" schema="org.yorba.shotwell.sharing.publishing-gallery3" />
     <child name="picasa" schema="org.yorba.shotwell.sharing.picasa" />
     <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
 </schema>
@@ -485,6 +486,50 @@
     </key>
 </schema>
 
+<schema id="org.yorba.shotwell.sharing.publishing-gallery3" path="/org/yorba/shotwell/sharing/gallery3/">
+    <key name="username" type="s">
+        <default>""</default>
+        <summary>username</summary>
+        <description>Gallery3 username</description>
+    </key>
+
+    <key name="api-key" type="s">
+        <default>""</default>
+        <summary>API key</summary>
+        <description>Gallery3 API key</description>
+    </key>
+
+    <key name="url" type="s">
+        <default>""</default>
+        <summary>URL</summary>
+        <description>Gallery3 site URL</description>
+    </key>
+
+    <key name="last-album" type="s">
+        <default>""</default>
+        <summary>last album</summary>
+        <description>The name of the last album the user published photos to, if any</description>
+    </key>
+
+    <key name="strip-metadata" type="b">
+        <default>false</default>
+        <summary>remove sensitive info from uploads</summary>
+        <description>Indicates whether images being uploaded to Gallery3 should have their metadata removed first</description>
+    </key>
+
+    <key name="scaling-constraint-id" type="i">
+        <default>0</default>
+        <summary>scaling constraint of uploaded picture</summary>
+        <description>The scaling constraint ID of the picture to be uploaded</description>
+    </key>
+
+    <key name="scaling-pixels" type="i">
+        <default>1024</default>
+        <summary>pixels of the major axis uploaded picture</summary>
+        <description>The pixels of the major axis of the picture to be uploaded; used only if scaling-constraint-id is an appropriate value</description>
+    </key>
+</schema>
+
 <schema id="org.yorba.shotwell.sharing.youtube" path="/org/yorba/shotwell/sharing/youtube/">
     <key name="refresh-token" type="s">
         <default>""</default>
@@ -605,7 +650,7 @@
         <summary>enable piwigo publishing plugin</summary>
         <description>True if the Piwigo publishing plugin is enabled, false otherwise</description>
     </key>
-    
+
     <key name="publishing-yandex-fotki" type="b">
         <default>false</default>
         <summary>enable yandex publishing plugin</summary>
@@ -618,6 +663,18 @@
         <description>True if the Tumblr publishing plugin is enabled, false otherwise</description>
     </key>
 
+    <key name="publishing-rajce" type="b">
+        <default>false</default>
+        <summary>enable rajce publishing plugin</summary>
+        <description>True if the Rajce publishing plugin is enabled, false otherwise</description>
+    </key>
+    
+    <key name="publishing-gallery3" type="b">
+        <default>false</default>
+        <summary>enable gallery3 publishing plugin</summary>
+        <description>True if the Gallery3 publishing plugin is enabled, false otherwise</description>
+    </key>
+
     <key name="dataimports-fspot" type="b">
         <default>true</default>
         <summary>enable F-Spot import plugin</summary>
diff --git a/misc/shotwell.appdata.xml b/misc/shotwell.appdata.xml
index 8f13515..47cad46 100644
--- a/misc/shotwell.appdata.xml
+++ b/misc/shotwell.appdata.xml
@@ -2,7 +2,8 @@
 <!-- Copyright 2013-2014 Yorba Foundation (shotwell@yorba.org) -->
 <application>
   <id type="desktop">shotwell.desktop</id>
-  <licence>CC0</licence>
+  <metadata_license>CC0</metadata_license>
+  <project_license>LGPL-2.1+</project_license>
   <summary>Popular photo manager</summary>
   <description>
     <p>
@@ -20,7 +21,7 @@
       Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.
     </p>
   </description>
-  <url type="homepage">http://www.yorba.org/projects/shotwell/</url>
+  <url type="homepage">https://wiki.gnome.org/Apps/Shotwell</url>
   <screenshots>
     <screenshot type="default">http://www.yorba.org/wp-content/uploads/2013/02/harbor.png</screenshot>
     <screenshot>http://www.yorba.org/wp-content/uploads/2013/02/import-300x155.png</screenshot>