Commit 284c3c67 authored by Jens Georg's avatar Jens Georg

Reorganize source tree

 * Move everything data into data
 * Move all icons into one common place
 * Rename desktop and appdata files to org.gnome.Shotwell
 * Drop GConf migrator (broken anyway since ages)
parent a164ff45
...@@ -4,4 +4,3 @@ import apport.hookutils ...@@ -4,4 +4,3 @@ import apport.hookutils
def add_info(report): def add_info(report):
log_file = os.path.expanduser('~/.cache/shotwell/shotwell.log') log_file = os.path.expanduser('~/.cache/shotwell/shotwell.log')
apport.hookutils.attach_file_if_exists(report, log_file, 'shotwell.log') apport.hookutils.attach_file_if_exists(report, log_file, 'shotwell.log')
install_data(files('org.yorba.shotwell-extras.gschema.xml',
'org.yorba.shotwell.gschema.xml'),
install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'schemas'))
gnome.compile_schemas()
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
<summary>Token</summary> <summary>Token</summary>
<description>The token to access tumblr</description> <description>The token to access tumblr</description>
</key> </key>
<key name="token-secret" type="s"> <key name="token-secret" type="s">
<default>""</default> <default>""</default>
<summary>Secret token</summary> <summary>Secret token</summary>
<description>The secret token to sign oauth requests</description> <description>The secret token to sign oauth requests</description>
</key> </key>
<key name="default-size" type="i"> <key name="default-size" type="i">
<default>2</default> <default>2</default>
<summary>default size</summary> <summary>default size</summary>
<description>A numeric code representing the default size for photos uploaded to Tumblr</description> <description>A numeric code representing the default size for photos uploaded to Tumblr</description>
</key> </key>
<key name="default-blog" type="i"> <key name="default-blog" type="i">
<default>0</default> <default>0</default>
<summary>default blog</summary> <summary>default blog</summary>
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
<summary>Rajce URL</summary> <summary>Rajce URL</summary>
<description>URL of the Rajce server.</description> <description>URL of the Rajce server.</description>
</key> </key>
<key name="username" type="s"> <key name="username" type="s">
<default>""</default> <default>""</default>
<summary>username</summary> <summary>username</summary>
<description>Rajce username, if logged in.</description> <description>Rajce username, if logged in.</description>
</key> </key>
<key name="token" type="s"> <key name="token" type="s">
<default>""</default> <default>""</default>
<summary>token</summary> <summary>token</summary>
...@@ -58,19 +58,19 @@ ...@@ -58,19 +58,19 @@
<summary>last category</summary> <summary>last category</summary>
<description>The last selected Rajce category.</description> <description>The last selected Rajce category.</description>
</key> </key>
<key name="last-photo-size" type="i"> <key name="last-photo-size" type="i">
<default>-1</default> <default>-1</default>
<summary>last photo size</summary> <summary>last photo size</summary>
<description>A numeric code representing the last photo size preset used when publishing to Rajce.</description> <description>A numeric code representing the last photo size preset used when publishing to Rajce.</description>
</key> </key>
<key name="remember" type="b"> <key name="remember" type="b">
<default>false</default> <default>false</default>
<summary>remember</summary> <summary>remember</summary>
<description>If true, remember last login.</description> <description>If true, remember last login.</description>
</key> </key>
<key name="hide-album" type="b"> <key name="hide-album" type="b">
<default>false</default> <default>false</default>
<summary>hide album</summary> <summary>hide album</summary>
...@@ -92,4 +92,3 @@ ...@@ -92,4 +92,3 @@
</schema> </schema>
</schemalist> </schemalist>
...@@ -23,19 +23,19 @@ ...@@ -23,19 +23,19 @@
<summary>display basic properties</summary> <summary>display basic properties</summary>
<description>True if the basic properties pane is to be displayed, false otherwise.</description> <description>True if the basic properties pane is to be displayed, false otherwise.</description>
</key> </key>
<key name="display-extended-properties" type="b"> <key name="display-extended-properties" type="b">
<default>false</default> <default>false</default>
<summary>display extended properties</summary> <summary>display extended properties</summary>
<description>True if the extended properties window is to be displayed, false otherwise.</description> <description>True if the extended properties window is to be displayed, false otherwise.</description>
</key> </key>
<key name="display-sidebar" type="b"> <key name="display-sidebar" type="b">
<default>true</default> <default>true</default>
<summary>display sidebar</summary> <summary>display sidebar</summary>
<description>True if the sidebar is to be displayed, false otherwise.</description> <description>True if the sidebar is to be displayed, false otherwise.</description>
</key> </key>
<key name="display-toolbar" type="b"> <key name="display-toolbar" type="b">
<default>true</default> <default>true</default>
<summary>display toolbar</summary> <summary>display toolbar</summary>
...@@ -47,91 +47,91 @@ ...@@ -47,91 +47,91 @@
<summary>display search bar</summary> <summary>display search bar</summary>
<description>True if the Search/Filter Toolbar is to be displayed, false otherwise.</description> <description>True if the Search/Filter Toolbar is to be displayed, false otherwise.</description>
</key> </key>
<key name="display-photo-titles" type="b"> <key name="display-photo-titles" type="b">
<default>false</default> <default>false</default>
<summary>display photo titles</summary> <summary>display photo titles</summary>
<description>True if photo titles are to be displayed beneath thumbnails in collection views, false otherwise.</description> <description>True if photo titles are to be displayed beneath thumbnails in collection views, false otherwise.</description>
</key> </key>
<key name="display-photo-comments" type="b"> <key name="display-photo-comments" type="b">
<default>false</default> <default>false</default>
<summary>display photo comments</summary> <summary>display photo comments</summary>
<description>True if photo comments are to be displayed beneath thumbnails in collection views, false otherwise.</description> <description>True if photo comments are to be displayed beneath thumbnails in collection views, false otherwise.</description>
</key> </key>
<key name="display-event-comments" type="b"> <key name="display-event-comments" type="b">
<default>false</default> <default>false</default>
<summary>display event comments</summary> <summary>display event comments</summary>
<description>True if event comments are to be displayed beneath thumbnails in event views, false otherwise.</description> <description>True if event comments are to be displayed beneath thumbnails in event views, false otherwise.</description>
</key> </key>
<key name="display-photo-tags" type="b"> <key name="display-photo-tags" type="b">
<default>true</default> <default>true</default>
<summary>display photo tags</summary> <summary>display photo tags</summary>
<description>True if photo tags are to be listed beneath thumbnails in collection views, false otherwise.</description> <description>True if photo tags are to be listed beneath thumbnails in collection views, false otherwise.</description>
</key> </key>
<key name="display-photo-ratings" type="b"> <key name="display-photo-ratings" type="b">
<default>true</default> <default>true</default>
<summary>display photo ratings</summary> <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>
<key name="photo-rating-filter" type="i"> <key name="photo-rating-filter" type="i">
<default>0</default> <default>0</default>
<summary>rating filter level</summary> <summary>rating filter level</summary>
<description>Determines how to filter photos based on their ratings. 1: Rejected or better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three or better, 6: Four or better, 7: Five or better.</description> <description>Determines how to filter photos based on their ratings. 1: Rejected or better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three or better, 6: Four or better, 7: Five or better.</description>
</key> </key>
<key name="events-sort-ascending" type="b"> <key name="events-sort-ascending" type="b">
<default>false</default> <default>false</default>
<summary>sort events ascending</summary> <summary>sort events ascending</summary>
<description>True if events should be sorted ascending, false if descending.</description> <description>True if events should be sorted ascending, false if descending.</description>
</key> </key>
<key name="library-photos-sort-ascending" type="b"> <key name="library-photos-sort-ascending" type="b">
<default>false</default> <default>false</default>
<summary>sort library photos ascending</summary> <summary>sort library photos ascending</summary>
<description>True if library photos should be sorted ascending, false if descending.</description> <description>True if library photos should be sorted ascending, false if descending.</description>
</key> </key>
<key name="library-photos-sort-by" type="i"> <key name="library-photos-sort-by" type="i">
<default>2</default> <default>2</default>
<summary>sort library photos criteria</summary> <summary>sort library photos criteria</summary>
<description>A numeric code that specifies the sort criteria for photos in library views.</description> <description>A numeric code that specifies the sort criteria for photos in library views.</description>
</key> </key>
<key name="event-photos-sort-ascending" type="b"> <key name="event-photos-sort-ascending" type="b">
<default>true</default> <default>true</default>
<summary>sort event photos ascending</summary> <summary>sort event photos ascending</summary>
<description>True if event photos should be sorted ascending, false if descending.</description> <description>True if event photos should be sorted ascending, false if descending.</description>
</key> </key>
<key name="event-photos-sort-by" type="i"> <key name="event-photos-sort-by" type="i">
<default>2</default> <default>2</default>
<summary>sort event photos criteria</summary> <summary>sort event photos criteria</summary>
<description>Specifies the sort criteria for event photos.</description> <description>Specifies the sort criteria for event photos.</description>
</key> </key>
<key name="use-24-hour-time" type="b"> <key name="use-24-hour-time" type="b">
<default>false</default> <default>false</default>
<summary>use 24 hour time</summary> <summary>use 24 hour time</summary>
<description>True if should display times with a 24 hour clock, false if times should use AM/PM notation.</description> <description>True if should display times with a 24 hour clock, false if times should use AM/PM notation.</description>
</key> </key>
<key name="keep-relativity" type="b"> <key name="keep-relativity" type="b">
<default>true</default> <default>true</default>
<summary>keep relative time between photos</summary> <summary>keep relative time between photos</summary>
<description>True if when adjusting time/date of photos, relative time should be maintained. False if all photos should be set to the same time.</description> <description>True if when adjusting time/date of photos, relative time should be maintained. False if all photos should be set to the same time.</description>
</key> </key>
<key name="modify-originals" type="b"> <key name="modify-originals" type="b">
<default>false</default> <default>false</default>
<summary>modify original photo files</summary> <summary>modify original photo files</summary>
<description>True if when adjusting time/date of photos, the original files should be modified as well. False if changes are made only in the database.</description> <description>True if when adjusting time/date of photos, the original files should be modified as well. False if changes are made only in the database.</description>
</key> </key>
<key name="show-welcome-dialog" type="b"> <key name="show-welcome-dialog" type="b">
<default>true</default> <default>true</default>
<summary>show welcome dialog on startup</summary> <summary>show welcome dialog on startup</summary>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<summary>pin toolbar state</summary> <summary>pin toolbar state</summary>
<description>Pin toolbar in fullscreen, or not.</description> <description>Pin toolbar in fullscreen, or not.</description>
</key> </key>
<key name="use-dark-theme" type="b"> <key name="use-dark-theme" type="b">
<default>true</default> <default>true</default>
<summary>prefer GTK+’s dark theme</summary> <summary>prefer GTK+’s dark theme</summary>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<summary>transition effect id</summary> <summary>transition effect id</summary>
<description>The name of the transition effect that will be used between photos when running a slideshow</description> <description>The name of the transition effect that will be used between photos when running a slideshow</description>
</key> </key>
<key name="show-title" type="b"> <key name="show-title" type="b">
<default>false</default> <default>false</default>
<summary>Show title</summary> <summary>Show title</summary>
...@@ -213,37 +213,37 @@ ...@@ -213,37 +213,37 @@
<summary>maximize library window</summary> <summary>maximize library window</summary>
<description>True if library application is maximized, false otherwise.</description> <description>True if library application is maximized, false otherwise.</description>
</key> </key>
<key name="library-width" type="i"> <key name="library-width" type="i">
<default>1024</default> <default>1024</default>
<summary>width of library window</summary> <summary>width of library window</summary>
<description>The last recorded width of the library application window.</description> <description>The last recorded width of the library application window.</description>
</key> </key>
<key name="library-height" type="i"> <key name="library-height" type="i">
<default>768</default> <default>768</default>
<summary>height of library window</summary> <summary>height of library window</summary>
<description>The last recorded height of the library application window.</description> <description>The last recorded height of the library application window.</description>
</key> </key>
<key name="direct-maximize" type="b"> <key name="direct-maximize" type="b">
<default>false</default> <default>false</default>
<summary>maximize direct-edit window</summary> <summary>maximize direct-edit window</summary>
<description>True if direct-edit application is maximized, false otherwise.</description> <description>True if direct-edit application is maximized, false otherwise.</description>
</key> </key>
<key name="direct-width" type="i"> <key name="direct-width" type="i">
<default>1024</default> <default>1024</default>
<summary>width of direct-edit window</summary> <summary>width of direct-edit window</summary>
<description>The last recorded width of the direct-edit application window.</description> <description>The last recorded width of the direct-edit application window.</description>
</key> </key>
<key name="direct-height" type="i"> <key name="direct-height" type="i">
<default>768</default> <default>768</default>
<summary>height of direct-edit window</summary> <summary>height of direct-edit window</summary>
<description>The last recorded height of the direct-edit application window.</description> <description>The last recorded height of the direct-edit application window.</description>
</key> </key>
<key name="sidebar-position" type="i"> <key name="sidebar-position" type="i">
<default>180</default> <default>180</default>
<summary>sidebar divider position</summary> <summary>sidebar divider position</summary>
...@@ -257,13 +257,13 @@ ...@@ -257,13 +257,13 @@
<summary>import directory</summary> <summary>import directory</summary>
<description>Directory in which imported photo files are placed.</description> <description>Directory in which imported photo files are placed.</description>
</key> </key>
<key name="auto-import" type="b"> <key name="auto-import" type="b">
<default>false</default> <default>false</default>
<summary>watch library directory for new files</summary> <summary>watch library directory for new files</summary>
<description>If true, files added to the library directory are automatically imported.</description> <description>If true, files added to the library directory are automatically imported.</description>
</key> </key>
<key name="commit-metadata" type="b"> <key name="commit-metadata" type="b">
<default>false</default> <default>false</default>
<summary>write metadata to master files</summary> <summary>write metadata to master files</summary>
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
<summary>directory pattern custom</summary> <summary>directory pattern custom</summary>
<description>A string encoding a custom naming pattern that will be used to name photo directories on import.</description> <description>A string encoding a custom naming pattern that will be used to name photo directories on import.</description>
</key> </key>
<key name="raw-developer-default" type="s"> <key name="raw-developer-default" type="s">
<default>'CAMERA'</default> <default>'CAMERA'</default>
<summary>RAW developer default</summary> <summary>RAW developer default</summary>
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
<summary>external photo editor</summary> <summary>external photo editor</summary>
<description>External application used to edit photos.</description> <description>External application used to edit photos.</description>
</key> </key>
<key name="external-raw-editor" type="s"> <key name="external-raw-editor" type="s">
<default>""</default> <default>""</default>
<summary>external raw editor</summary> <summary>external raw editor</summary>
...@@ -402,13 +402,13 @@ ...@@ -402,13 +402,13 @@
<summary>last used publishing service</summary> <summary>last used publishing service</summary>
<description>A numeric code representing the last service to which photos were published</description> <description>A numeric code representing the last service to which photos were published</description>
</key> </key>
<key name="default-service" type="i"> <key name="default-service" type="i">
<default>1</default> <default>1</default>
<summary>default publishing service</summary> <summary>default publishing service</summary>
<description>A numeric code representing the last service to which photos were published</description> <description>A numeric code representing the last service to which photos were published</description>
</key> </key>
<child name="facebook" schema="org.yorba.shotwell.sharing.facebook" /> <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
<child name="flickr" schema="org.yorba.shotwell.sharing.flickr" /> <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
<child name="gallery3" schema="org.yorba.shotwell.sharing.publishing-gallery3" /> <child name="gallery3" schema="org.yorba.shotwell.sharing.publishing-gallery3" />
...@@ -428,19 +428,19 @@ ...@@ -428,19 +428,19 @@
<summary>user i.d.</summary> <summary>user i.d.</summary>
<description>Facebook user i.d. for the currently logged in user, if any</description> <description>Facebook user i.d. for the currently logged in user, if any</description>
</key> </key>
<key name="user-name" type="s"> <key name="user-name" type="s">
<default>""</default> <default>""</default>
<summary>user name</summary> <summary>user name</summary>
<description>The name of the currently logged in Facebook user, if any</description> <description>The name of the currently logged in Facebook user, if any</description>
</key> </key>
<key name="default-size" type="i"> <key name="default-size" type="i">
<default>0</default> <default>0</default>
<summary>default size code</summary> <summary>default size code</summary>
<description>A numeric code representing the default size for photos published to Facebook</description> <description>A numeric code representing the default size for photos published to Facebook</description>
</key> </key>
<key name="strip-metadata" type="b"> <key name="strip-metadata" type="b">
<default>false</default> <default>false</default>
<summary>remove sensitive info from uploads</summary> <summary>remove sensitive info from uploads</summary>
...@@ -466,13 +466,13 @@ ...@@ -466,13 +466,13 @@
<summary>username</summary> <summary>username</summary>
<description>The user name of the currently logged in Flickr user, if any</description> <description>The user name of the currently logged in Flickr user, if any</description>
</key> </key>
<key name="default-size" type="i"> <key name="default-size" type="i">
<default>2</default> <default>2</default>
<summary>default size code</summary> <summary>default size code</summary>
<description>A numeric code representing the default size for photos published to Flickr</description> <description>A numeric code representing the default size for photos published to Flickr</description>
</key> </key>
<key name="visibility" type="i"> <key name="visibility" type="i">
<default>1</default> <default>1</default>
<summary>default visibility</summary> <summary>default visibility</summary>
...@@ -492,13 +492,13 @@ ...@@ -492,13 +492,13 @@
<summary>refresh token</summary> <summary>refresh token</summary>
<description>The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any.</description> <description>The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any.</description>
</key> </key>
<key name="default-size" type="i"> <key name="default-size" type="i">
<default>2</default> <default>2</default>
<summary>default size</summary> <summary>default size</summary>
<description>A numeric code representing the default size for photos uploaded to Picasa Web Albums</description> <description>A numeric code representing the default size for photos uploaded to Picasa Web Albums</description>
</key> </key>
<key name="last-album" type="s"> <key name="last-album" type="s">
<default>""</default> <default>""</default>
<summary>last album</summary> <summary>last album</summary>
...@@ -518,37 +518,37 @@ ...@@ -518,37 +518,37 @@
<summary>Piwigo URL</summary> <summary>Piwigo URL</summary>
<description>URL of the Piwigo server.</description> <description>URL of the Piwigo server.</description>
</key> </key>
<key name="username" type="s"> <key name="username" type="s">
<default>""</default> <default>""</default>
<summary>username</summary> <summary>username</summary>
<description>Piwigo username, if logged in.</description> <description>Piwigo username, if logged in.</description>
</key> </key>
<key name="password" type="s"> <key name="password" type="s">
<default>""</default> <default>""</default>
<summary>password</summary> <summary>password</summary>
<description>Piwigo password, if logged in.</description> <description>Piwigo password, if logged in.</description>
</key> </key>
<key name="remember-password" type="b"> <key name="remember-password" type="b">
<default>false</default> <default>false</default>
<summary>remember password</summary> <summary>remember password</summary>
<description>If true, remember the Piwigo password.</description> <description>If true, remember the Piwigo password.</description>
</key> </key>
<key name="last-category" type="i"> <key name="last-category" type="i">
<default>-1</default> <default>-1</default>
<summary>last category</summary> <summary>last category</summary>
<description>The last selected Piwigo category.</description> <description>The last selected Piwigo category.</description>
</key> </key>
<key name="last-permission-level" type="i"> <key name="last-permission-level" type="i">
<default>-1</default> <default>-1</default>
<summary>last permission level</summary> <summary>last permission level</summary>
<description>The last chosen Piwigo permission level.</description> <description>The last chosen Piwigo permission level.</description>
</key> </key>
<key name="last-photo-size" type="i"> <key name="last-photo-size" type="i">
<default>-1</default> <default>-1</default>
<summary>last photo size</summary> <summary>last photo size</summary>
...@@ -648,25 +648,25 @@ ...@@ -648,25 +648,25 @@
<summary>content layout mode</summary> <summary>content layout mode</summary>
<description>A numeric code that describes how photos are laid out on the page during printing</description> <description>A numeric code that describes how photos are laid out on the page during printing</description>
</key> </key>
<key name="content-ppi" type="i"> <key name="content-ppi" type="i">
<default>600</default> <default>600</default>
<summary>content ppi</summary> <summary>content ppi</summary>
<description>The number of pixels per inch (ppi) sent to the printer during printing</description> <description>The number of pixels per inch (ppi) sent to the printer during printing</description>
</key> </key>
<key name="content-width" type="d"> <key name="content-width" type="d">
<default>7.0</default> <default>7.0</default>
<summary>content width</summary> <summary>content width</summary>
<description>The width of the printed emulsion on the page when printing</description> <description>The width of the printed emulsion on the page when printing</description>
</key> </key>
<key name="content-height" type="d"> <key name="content-height" type="d">
<default>5.0</default> <default>5.0</default>
<summary>content height</summary> <summary>content height</summary>
<description>The height of the printed emulsion on the page when printing</description> <description>The height of the printed emulsion on the page when printing</description>
</key> </key>
<key name="content-units" type="i"> <key name="content-units" type="i">
<default>1</default> <default>1</default>
<summary>content units</summary> <summary>content units</summary>
...@@ -684,7 +684,7 @@ ...@@ -684,7 +684,7 @@
<summary>size selection</summary> <summary>size selection</summary>
<description>The index of the current print size in a pre-defined list of standard sizes</description> <description>The index of the current print size in a pre-defined list of standard sizes</description>
</key> </key>
<key name="match-aspect-ratio" type="b"> <key name="match-aspect-ratio" type="b">
<default>true</default> <default>true</default>
<summary>match aspect ratio</summary> <summary>match aspect ratio</summary>
...@@ -696,7 +696,7 @@ ...@@ -696,7 +696,7 @@
<summary>print titles</summary> <summary>print titles</summary>
<description>True if the title of a photo should be printed when the photo is printed, false otherwise.</description> <description>True if the title of a photo should be printed when the photo is printed, false otherwise.</description>
</key> </key>