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
def add_info(report):
log_file = os.path.expanduser('~/.cache/shotwell/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 @@
<summary>Token</summary>
<description>The token to access tumblr</description>
</key>
<key name="token-secret" type="s">
<default>""</default>
<summary>Secret token</summary>
<description>The secret token to sign oauth requests</description>
</key>
<key name="default-size" type="i">
<default>2</default>
<summary>default size</summary>
<description>A numeric code representing the default size for photos uploaded to Tumblr</description>
</key>
<key name="default-blog" type="i">
<default>0</default>
<summary>default blog</summary>
......@@ -40,13 +40,13 @@
<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>
......@@ -58,19 +58,19 @@
<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>
......@@ -92,4 +92,3 @@
</schema>
</schemalist>
......@@ -23,19 +23,19 @@
<summary>display basic properties</summary>
<description>True if the basic properties pane is to be displayed, false otherwise.</description>
</key>
<key name="display-extended-properties" type="b">
<default>false</default>
<summary>display extended properties</summary>
<description>True if the extended properties window is to be displayed, false otherwise.</description>
</key>
<key name="display-sidebar" type="b">
<default>true</default>
<summary>display sidebar</summary>
<description>True if the sidebar is to be displayed, false otherwise.</description>
</key>
<key name="display-toolbar" type="b">
<default>true</default>
<summary>display toolbar</summary>
......@@ -47,91 +47,91 @@
<summary>display search bar</summary>
<description>True if the Search/Filter Toolbar is to be displayed, false otherwise.</description>
</key>
<key name="display-photo-titles" type="b">
<default>false</default>
<summary>display photo titles</summary>
<description>True if photo titles are to be displayed beneath thumbnails in collection views, false otherwise.</description>
</key>
<key name="display-photo-comments" type="b">
<default>false</default>
<summary>display photo comments</summary>
<description>True if photo comments are to be displayed beneath thumbnails in collection views, false otherwise.</description>
</key>
<key name="display-event-comments" type="b">
<default>false</default>
<summary>display event comments</summary>
<description>True if event comments are to be displayed beneath thumbnails in event views, false otherwise.</description>
</key>
<key name="display-photo-tags" type="b">
<default>true</default>
<summary>display photo tags</summary>
<description>True if photo tags are to be listed beneath thumbnails in collection views, false otherwise.</description>
</key>
<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>
</key>
<key name="photo-rating-filter" type="i">
<default>0</default>
<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>
</key>
<key name="events-sort-ascending" type="b">
<default>false</default>
<summary>sort events ascending</summary>
<description>True if events should be sorted ascending, false if descending.</description>
</key>
<key name="library-photos-sort-ascending" type="b">
<default>false</default>
<summary>sort library photos ascending</summary>
<description>True if library photos should be sorted ascending, false if descending.</description>
</key>
<key name="library-photos-sort-by" type="i">
<default>2</default>
<summary>sort library photos criteria</summary>
<description>A numeric code that specifies the sort criteria for photos in library views.</description>
</key>
<key name="event-photos-sort-ascending" type="b">
<default>true</default>
<summary>sort event photos ascending</summary>
<description>True if event photos should be sorted ascending, false if descending.</description>
</key>
<key name="event-photos-sort-by" type="i">
<default>2</default>
<summary>sort event photos criteria</summary>
<description>Specifies the sort criteria for event photos.</description>
</key>
<key name="use-24-hour-time" type="b">
<default>false</default>
<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>
</key>
<key name="keep-relativity" type="b">
<default>true</default>
<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>
</key>
<key name="modify-originals" type="b">
<default>false</default>
<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>
</key>
<key name="show-welcome-dialog" type="b">
<default>true</default>
<summary>show welcome dialog on startup</summary>
......@@ -155,7 +155,7 @@
<summary>pin toolbar state</summary>
<description>Pin toolbar in fullscreen, or not.</description>
</key>
<key name="use-dark-theme" type="b">
<default>true</default>
<summary>prefer GTK+’s dark theme</summary>
......@@ -199,7 +199,7 @@
<summary>transition effect id</summary>
<description>The name of the transition effect that will be used between photos when running a slideshow</description>
</key>
<key name="show-title" type="b">
<default>false</default>
<summary>Show title</summary>
......@@ -213,37 +213,37 @@
<summary>maximize library window</summary>
<description>True if library application is maximized, false otherwise.</description>
</key>
<key name="library-width" type="i">
<default>1024</default>
<summary>width of library window</summary>
<description>The last recorded width of the library application window.</description>
</key>
<key name="library-height" type="i">
<default>768</default>
<summary>height of library window</summary>
<description>The last recorded height of the library application window.</description>
</key>
<key name="direct-maximize" type="b">
<default>false</default>
<summary>maximize direct-edit window</summary>
<description>True if direct-edit application is maximized, false otherwise.</description>
</key>
<key name="direct-width" type="i">
<default>1024</default>
<summary>width of direct-edit window</summary>
<description>The last recorded width of the direct-edit application window.</description>
</key>
<key name="direct-height" type="i">
<default>768</default>
<summary>height of direct-edit window</summary>
<description>The last recorded height of the direct-edit application window.</description>
</key>
<key name="sidebar-position" type="i">
<default>180</default>
<summary>sidebar divider position</summary>
......@@ -257,13 +257,13 @@
<summary>import directory</summary>
<description>Directory in which imported photo files are placed.</description>
</key>
<key name="auto-import" type="b">
<default>false</default>
<summary>watch library directory for new files</summary>
<description>If true, files added to the library directory are automatically imported.</description>
</key>
<key name="commit-metadata" type="b">
<default>false</default>
<summary>write metadata to master files</summary>
......@@ -287,7 +287,7 @@
<summary>directory pattern custom</summary>
<description>A string encoding a custom naming pattern that will be used to name photo directories on import.</description>
</key>
<key name="raw-developer-default" type="s">
<default>'CAMERA'</default>
<summary>RAW developer default</summary>
......@@ -319,7 +319,7 @@
<summary>external photo editor</summary>
<description>External application used to edit photos.</description>
</key>
<key name="external-raw-editor" type="s">
<default>""</default>
<summary>external raw editor</summary>
......@@ -402,13 +402,13 @@
<summary>last used publishing service</summary>
<description>A numeric code representing the last service to which photos were published</description>
</key>
<key name="default-service" type="i">
<default>1</default>
<summary>default publishing service</summary>
<description>A numeric code representing the last service to which photos were published</description>
</key>
<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" />
......@@ -428,19 +428,19 @@
<summary>user i.d.</summary>
<description>Facebook user i.d. for the currently logged in user, if any</description>
</key>
<key name="user-name" type="s">
<default>""</default>
<summary>user name</summary>
<description>The name of the currently logged in Facebook user, if any</description>
</key>
<key name="default-size" type="i">
<default>0</default>
<summary>default size code</summary>
<description>A numeric code representing the default size for photos published to Facebook</description>
</key>
<key name="strip-metadata" type="b">
<default>false</default>
<summary>remove sensitive info from uploads</summary>
......@@ -466,13 +466,13 @@
<summary>username</summary>
<description>The user name of the currently logged in Flickr user, if any</description>
</key>
<key name="default-size" type="i">
<default>2</default>
<summary>default size code</summary>
<description>A numeric code representing the default size for photos published to Flickr</description>
</key>
<key name="visibility" type="i">
<default>1</default>
<summary>default visibility</summary>
......@@ -492,13 +492,13 @@
<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>
</key>
<key name="default-size" type="i">
<default>2</default>
<summary>default size</summary>
<description>A numeric code representing the default size for photos uploaded to Picasa Web Albums</description>
</key>
<key name="last-album" type="s">
<default>""</default>
<summary>last album</summary>
......@@ -518,37 +518,37 @@
<summary>Piwigo URL</summary>
<description>URL of the Piwigo server.</description>
</key>
<key name="username" type="s">
<default>""</default>
<summary>username</summary>
<description>Piwigo username, if logged in.</description>
</key>
<key name="password" type="s">
<default>""</default>
<summary>password</summary>
<description>Piwigo password, if logged in.</description>
</key>
<key name="remember-password" type="b">
<default>false</default>
<summary>remember password</summary>
<description>If true, remember the Piwigo password.</description>
</key>
<key name="last-category" type="i">
<default>-1</default>
<summary>last category</summary>
<description>The last selected Piwigo category.</description>
</key>
<key name="last-permission-level" type="i">
<default>-1</default>
<summary>last permission level</summary>
<description>The last chosen Piwigo permission level.</description>
</key>
<key name="last-photo-size" type="i">
<default>-1</default>
<summary>last photo size</summary>
......@@ -648,25 +648,25 @@
<summary>content layout mode</summary>
<description>A numeric code that describes how photos are laid out on the page during printing</description>
</key>
<key name="content-ppi" type="i">
<default>600</default>
<summary>content ppi</summary>
<description>The number of pixels per inch (ppi) sent to the printer during printing</description>
</key>
<key name="content-width" type="d">
<default>7.0</default>
<summary>content width</summary>
<description>The width of the printed emulsion on the page when printing</description>
</key>
<key name="content-height" type="d">
<default>5.0</default>
<summary>content height</summary>
<description>The height of the printed emulsion on the page when printing</description>
</key>
<key name="content-units" type="i">
<default>1</default>
<summary>content units</summary>
......@@ -684,7 +684,7 @@
<summary>size selection</summary>
<description>The index of the current print size in a pre-defined list of standard sizes</description>
</key>
<key name="match-aspect-ratio" type="b">
<default>true</default>
<summary>match aspect ratio</summary>
......@@ -696,7 +696,7 @@
<summary>print titles</summary>
<description>True if the title of a photo should be printed when the photo is printed, false otherwise.</description>
</key>
<key name="titles-font" type="s">
<default>"Sans Bold 12"</default>
<summary>titles font</summary>
......@@ -744,7 +744,7 @@
<summary>enable yandex publishing plugin</summary>
<description>True if the Yandex.Fotki publishing plugin is enabled, false otherwise</description>
</key>
<key name="publishing-tumblr" type="b">
<default>false</default>
<summary>enable tumblr publishing plugin</summary>
......@@ -756,7 +756,7 @@
<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>
......@@ -786,25 +786,25 @@
<summary>enable slideshow slide transition</summary>
<description>True if the Slide slideshow transition plugin is enabled, false otherwise</description>
</key>
<key name="transitions-clock" type="b">
<default>true</default>
<summary>enable slideshow clock transition</summary>
<description>True if the Clock slideshow transition plugin is enabled, false otherwise</description>
</key>
<key name="transitions-circle" type="b">
<default>true</default>
<summary>enable slideshow circle transition</summary>
<description>True if the Circle slideshow transition plugin is enabled, false otherwise</description>
</key>
<key name="transitions-circles" type="b">
<default>true</default>
<summary>enable slideshow circles transition</summary>
<description>True if the Circles slideshow transition plugin is enabled, false otherwise</description>
</key>
<key name="transitions-blinds" type="b">
<default>true</default>
<summary>enable slideshow blinds transition</summary>
......@@ -831,4 +831,3 @@
</schema>
</schemalist>
......@@ -17,7 +17,7 @@
<title id='title9167'>Gnome Symbolic Icon Theme</title>
<defs id='defs7386'/>
<g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-41.0002,-337)'>
<path inkscape:connector-curvature='0' d='m 51.55489,345.09373 c -0.70541,0.62353 -1.53918,0.90625 -2.55469,0.90625 -1.01551,0 -1.85318,-0.29053 -2.55859,-0.91406 -1.10938,0.36328 -2.43603,1.28775 -2.4375,2.90234 l -0.0039,3.01172 c -7.2e-4,0.554 0.446,1.00002 1,1.00002 l 8,0 c 0.554,0 1,-0.44602 1,-1.00002 l 0,-3 c 0,-1.38672 -1.10231,-2.5558 -2.44531,-2.90625 z' id='path3940-5' sodipodi:nodetypes='csccsssscc' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
<path sodipodi:cx='49.5' sodipodi:cy='342.5' d='m 52,342.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z' id='path3942-6' sodipodi:rx='2.5' sodipodi:ry='2.5' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(1.2,0,0,1.2,-10.3998,-69.00003)' sodipodi:type='arc'/>
</g>
......
......@@ -17,7 +17,7 @@
<title id='title9167'>Gnome Symbolic Icon Theme</title>
<defs id='defs7386'/>
<g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-122.99995,-175)'>
<path inkscape:connector-curvature='0' d='m 133.0002,177.5 0,-1.4375 -8.90625,0 0,11.03125 3.75,0 -0.875,-3.0625 -2,0 0,-7.03125 7.0625,0 0,0.75 z' id='rect3118' sodipodi:nodetypes='ccccccccccc' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
<path inkscape:connector-curvature='0' d='m 126.94314,180.0217 2.73118,10.19291 8.22941,-2.20506 -2.73119,-10.19291 -8.2294,2.20506 z m 1.04061,0.64961 6.52578,-1.74857 1.74084,6.4969 -6.52578,1.74858 -1.74084,-6.49691 z' id='path3123' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
</g>
......
icondir = join_paths(get_option('datadir'), 'icons/hicolor')
install_subdir('hicolor/16x16', install_dir : icondir)
install_subdir('hicolor/22x22', install_dir : icondir)
install_subdir('hicolor/24x24', install_dir : icondir)
install_subdir('hicolor/32x32', install_dir : icondir)
install_subdir('hicolor/48x48', install_dir : icondir)
install_subdir('hicolor/256x256', install_dir : icondir)
install_subdir('hicolor/symbolic', install_dir : icondir)
if get_option('install-apport-hook')
subdir('apport')
endif
subdir('gsettings')
subdir('icons')
podir = join_paths('..', 'po')
i18n.merge_file(input : 'shotwell.appdata.xml.in',
output : 'shotwell.appdata.xml',
i18n.merge_file(input : 'org.gnome.Shotwell.appdata.xml.in',
output : 'org.gnome.Shotwell.appdata.xml',
po_dir : join_paths('..', 'po'),
type : 'xml',
install: true,
install_dir : join_paths(get_option('datadir'), 'metainfo'))
i18n.merge_file(input : 'shotwell.desktop.in',
output: 'shotwell.desktop',
i18n.merge_file(input : 'org.gnome.Shotwell.desktop.in',
output: 'org.gnome.Shotwell.desktop',
po_dir : podir,
type : 'desktop',
install : true,
install_dir : join_paths(get_option('datadir'), 'applications'))
i18n.merge_file(input : 'shotwell-viewer.desktop.in',
output: 'shotwell-viewer.desktop',
i18n.merge_file(input : 'org.gnome.Shotwell-Viewer.desktop.in',
output: 'org.gnome.Shotwell-Viewer.desktop',
po_dir : podir,
type : 'desktop',
install : true,
install_dir : join_paths(get_option('datadir'), 'applications'))
install_data(['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()
shotwell_resources = gnome.compile_resources('shotwell-resources',
'org.gnome.Shotwell.gresource.xml')
......@@ -4,7 +4,7 @@ Name=Shotwell Viewer
GenericName=Photo Viewer
Exec=shotwell %f
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=shotwell
Icon=org.gnome.Shotwell
Terminal=false
NoDisplay=true
Type=Application
......
......@@ -7,7 +7,7 @@ Comment=Organize your photos
Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;
Exec=shotwell %U
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=shotwell
Icon=org.gnome.Shotwell
Terminal=false
Type=Application
MimeType=x-content/image-dcf;
......
......@@ -33,35 +33,35 @@
<file preprocess="xml-stripblanks">ui/textentrydialog.ui</file>
<file preprocess="xml-stripblanks">ui/trash.ui</file>
<!-- Icons -->
<file>icons/avatar-default-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/avatar-default-symbolic.svg</file>
<file>icons/image-missing.png</file>
<file>icons/about-braunschweig.jpg</file>
<file>icons/crop-pivot-reticle-symbolic.svg</file>
<file>icons/events-merge-symbolic.svg</file>
<file>icons/filter-flagged-symbolic.svg</file>
<file>icons/filter-flagged-disabled-symbolic.svg</file>
<file>icons/filter-photos-symbolic.svg</file>
<file>icons/filter-photos-disabled-symbolic.svg</file>
<file>icons/filter-raw-symbolic.svg</file>
<file>icons/filter-raw-disabled-symbolic.svg</file>
<file>icons/filter-videos-disabled-symbolic.svg</file>
<file>icons/filter-videos-symbolic.svg</file>
<file>icons/image-crop-symbolic.svg</file>
<file>icons/image-auto-adjust-symbolic.svg</file>
<file>icons/image-adjust-color-symbolic.svg</file>
<file>icons/image-zoom-in-symbolic.svg</file>
<file>icons/image-zoom-out-symbolic.svg</file>
<file>icons/multiple-events-symbolic.svg</file>
<file>icons/multiple-tags-symbolic.svg</file>
<file>icons/no-event-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/crop-pivot-reticle-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/events-merge-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-flagged-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-flagged-disabled-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-photos-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-photos-disabled-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-raw-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-raw-disabled-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-videos-disabled-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/filter-videos-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/image-crop-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/image-auto-adjust-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/image-adjust-color-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/image-zoom-in-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/image-zoom-out-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/multiple-events-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/multiple-tags-symbolic.svg</file>
<file>icons/hicolor/scalable/actions/no-event-symbolic.svg</file>