[shotwell/wip/phako/misc-fixes: 3/9] Reorganize source tree
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/phako/misc-fixes: 3/9] Reorganize source tree
- Date: Wed, 12 Sep 2018 11:56:10 +0000 (UTC)
commit 3775aabbe0e8536d145437a89297dd10e7cfd925
Author: Jens Georg <mail jensge org>
Date: Sat Aug 18 14:41:26 2018 +0200
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)
{apport => data/apport}/git.mk | 0
{apport => data/apport}/meson.build | 0
{apport => data/apport}/shotwell.py | 1 -
data/gsettings/meson.build | 5 +
.../org.yorba.shotwell-extras.gschema.xml | 17 ++-
.../gsettings}/org.yorba.shotwell.gschema.xml | 115 ++++++++++-----------
{icons => data/icons}/about-braunschweig.jpg | Bin
.../hicolor/16x16/apps/org.gnome.Shotwell.png | Bin
.../hicolor/22x22/apps/org.gnome.Shotwell.png | Bin
.../hicolor/24x24/apps/org.gnome.Shotwell.png | Bin
.../hicolor/256x256/apps/org.gnome.Shotwell.png | Bin
.../hicolor/32x32/apps/org.gnome.Shotwell.png | Bin
.../hicolor/48x48/apps/org.gnome.Shotwell.png | Bin
{app-icons => data/icons/hicolor}/meson.build | 0
.../scalable/actions}/avatar-default-symbolic.svg | 2 +-
.../actions}/crop-pivot-reticle-symbolic.svg | 0
.../scalable/actions}/events-merge-symbolic.svg | 0
.../actions}/filter-flagged-disabled-symbolic.svg | 0
.../scalable/actions}/filter-flagged-symbolic.svg | 0
.../actions}/filter-photos-disabled-symbolic.svg | 0
.../scalable/actions}/filter-photos-symbolic.svg | 0
.../actions}/filter-raw-disabled-symbolic.svg | 0
.../scalable/actions}/filter-raw-symbolic.svg | 0
.../actions}/filter-videos-disabled-symbolic.svg | 0
.../scalable/actions}/filter-videos-symbolic.svg | 0
.../actions}/image-adjust-color-symbolic.svg | 0
.../actions}/image-auto-adjust-symbolic.svg | 0
.../scalable/actions}/image-crop-symbolic.svg | 0
.../scalable/actions}/image-zoom-in-symbolic.svg | 0
.../scalable/actions}/image-zoom-out-symbolic.svg | 0
.../scalable/actions}/multiple-events-symbolic.svg | 0
.../scalable/actions}/multiple-tags-symbolic.svg | 0
.../scalable/actions}/no-event-symbolic.svg | 0
.../scalable/actions}/one-event-symbolic.svg | 0
.../hicolor/scalable/actions}/one-tag-symbolic.svg | 0
.../scalable/actions}/stock-eye-symbolic.svg | 0
.../scalable/actions}/straighten-symbolic.svg | 0
.../hicolor/scalable/apps/org.gnome.Shotwell.svg | 0
.../icons/hicolor}/shotwell-source.svg | 0
.../symbolic/apps/org.gnome.Shotwell-symbolic.svg | 2 +-
{icons => data/icons}/image-missing.png | Bin
data/icons/meson.build | 9 ++
{icons => data/icons}/noninterpretable-video.png | Bin
{icons => data/icons}/shotwell-street.jpg | Bin
.../icons}/slideshow-extension-point.png | Bin
{misc => data}/meson.build | 26 +++--
.../org.gnome.Shotwell-Viewer.desktop.in | 2 +-
.../org.gnome.Shotwell.appdata.xml.in | 0
.../org.gnome.Shotwell.desktop.in | 2 +-
.../org.gnome.Shotwell.gresource.xml | 50 ++++-----
{misc => data/themes}/org.gnome.Shotwell.css | 0
{ui => data/ui}/collection.ui | 0
{ui => data/ui}/direct.ui | 0
{ui => data/ui}/direct_context.ui | 0
{ui => data/ui}/event.ui | 0
{ui => data/ui}/events_directory.ui | 0
{ui => data/ui}/faces.ui | 0
{ui => data/ui}/fullscreen.ui | 3 +-
{ui => data/ui}/import.ui | 0
{ui => data/ui}/import_queue.ui | 0
{ui => data/ui}/manifest_widget.ui | 0
{ui => data/ui}/media.ui | 0
{ui => data/ui}/multitextentrydialog.ui | 0
{ui => data/ui}/offline.ui | 0
{ui => data/ui}/photo.ui | 0
{ui => data/ui}/photo_context.ui | 0
{ui => data/ui}/preferences_dialog.ui | 0
{ui => data/ui}/printing_widget.ui | 0
{ui => data/ui}/saved_search_dialog.ui | 0
{ui => data/ui}/savedsearch.ui | 0
{ui => data/ui}/search_bar.ui | 0
{ui => data/ui}/search_sidebar_context.ui | 0
{ui => data/ui}/set_background_dialog.ui | 0
{ui => data/ui}/set_background_slideshow_dialog.ui | 0
{ui => data/ui}/shotwell.ui | 0
{ui => data/ui}/sidebar_default_context.ui | 1 -
{ui => data/ui}/slideshow_settings.ui | 0
{ui => data/ui}/tag_sidebar_context.ui | 0
{ui => data/ui}/tags.ui | 0
{ui => data/ui}/textentrydialog.ui | 0
{ui => data/ui}/trash.ui | 0
flatpak/org.gnome.Shotwell.json | 3 -
meson.build | 11 +-
misc/shotwell.convert | 105 -------------------
settings-migrator/meson.build | 3 -
settings-migrator/shotwell-settings-migrator | 33 ------
shotwell-plugin-dev-1.0.m4 | 11 --
src/AppWindow.vala | 7 +-
src/main.vala | 4 +-
src/meson.build | 2 +-
90 files changed, 133 insertions(+), 281 deletions(-)
---
diff --git a/apport/git.mk b/data/apport/git.mk
similarity index 100%
rename from apport/git.mk
rename to data/apport/git.mk
diff --git a/apport/meson.build b/data/apport/meson.build
similarity index 100%
rename from apport/meson.build
rename to data/apport/meson.build
diff --git a/apport/shotwell.py b/data/apport/shotwell.py
similarity index 99%
rename from apport/shotwell.py
rename to data/apport/shotwell.py
index a6a0183c..4b0dd780 100644
--- a/apport/shotwell.py
+++ b/data/apport/shotwell.py
@@ -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')
-
diff --git a/data/gsettings/meson.build b/data/gsettings/meson.build
new file mode 100644
index 00000000..ed8507a8
--- /dev/null
+++ b/data/gsettings/meson.build
@@ -0,0 +1,5 @@
+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()
diff --git a/misc/org.yorba.shotwell-extras.gschema.xml b/data/gsettings/org.yorba.shotwell-extras.gschema.xml
similarity index 98%
rename from misc/org.yorba.shotwell-extras.gschema.xml
rename to data/gsettings/org.yorba.shotwell-extras.gschema.xml
index e31f67ae..0ba803dd 100644
--- a/misc/org.yorba.shotwell-extras.gschema.xml
+++ b/data/gsettings/org.yorba.shotwell-extras.gschema.xml
@@ -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>
-
diff --git a/misc/org.yorba.shotwell.gschema.xml b/data/gsettings/org.yorba.shotwell.gschema.xml
similarity index 99%
rename from misc/org.yorba.shotwell.gschema.xml
rename to data/gsettings/org.yorba.shotwell.gschema.xml
index bc03007f..9f6a4fd0 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/data/gsettings/org.yorba.shotwell.gschema.xml
@@ -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>
-
diff --git a/icons/about-braunschweig.jpg b/data/icons/about-braunschweig.jpg
similarity index 100%
rename from icons/about-braunschweig.jpg
rename to data/icons/about-braunschweig.jpg
diff --git a/app-icons/16x16/apps/shotwell.png b/data/icons/hicolor/16x16/apps/org.gnome.Shotwell.png
similarity index 100%
rename from app-icons/16x16/apps/shotwell.png
rename to data/icons/hicolor/16x16/apps/org.gnome.Shotwell.png
diff --git a/app-icons/22x22/apps/shotwell.png b/data/icons/hicolor/22x22/apps/org.gnome.Shotwell.png
similarity index 100%
rename from app-icons/22x22/apps/shotwell.png
rename to data/icons/hicolor/22x22/apps/org.gnome.Shotwell.png
diff --git a/app-icons/24x24/apps/shotwell.png b/data/icons/hicolor/24x24/apps/org.gnome.Shotwell.png
similarity index 100%
rename from app-icons/24x24/apps/shotwell.png
rename to data/icons/hicolor/24x24/apps/org.gnome.Shotwell.png
diff --git a/app-icons/256x256/apps/shotwell.png b/data/icons/hicolor/256x256/apps/org.gnome.Shotwell.png
similarity index 100%
rename from app-icons/256x256/apps/shotwell.png
rename to data/icons/hicolor/256x256/apps/org.gnome.Shotwell.png
diff --git a/app-icons/32x32/apps/shotwell.png b/data/icons/hicolor/32x32/apps/org.gnome.Shotwell.png
similarity index 100%
rename from app-icons/32x32/apps/shotwell.png
rename to data/icons/hicolor/32x32/apps/org.gnome.Shotwell.png
diff --git a/app-icons/48x48/apps/shotwell.png b/data/icons/hicolor/48x48/apps/org.gnome.Shotwell.png
similarity index 100%
rename from app-icons/48x48/apps/shotwell.png
rename to data/icons/hicolor/48x48/apps/org.gnome.Shotwell.png
diff --git a/app-icons/meson.build b/data/icons/hicolor/meson.build
similarity index 100%
rename from app-icons/meson.build
rename to data/icons/hicolor/meson.build
diff --git a/icons/avatar-default-symbolic.svg
b/data/icons/hicolor/scalable/actions/avatar-default-symbolic.svg
similarity index 99%
rename from icons/avatar-default-symbolic.svg
rename to data/icons/hicolor/scalable/actions/avatar-default-symbolic.svg
index 3af03a0e..2d3da521 100644
--- a/icons/avatar-default-symbolic.svg
+++ b/data/icons/hicolor/scalable/actions/avatar-default-symbolic.svg
@@ -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>
diff --git a/icons/crop-pivot-reticle-symbolic.svg
b/data/icons/hicolor/scalable/actions/crop-pivot-reticle-symbolic.svg
similarity index 100%
rename from icons/crop-pivot-reticle-symbolic.svg
rename to data/icons/hicolor/scalable/actions/crop-pivot-reticle-symbolic.svg
diff --git a/icons/events-merge-symbolic.svg b/data/icons/hicolor/scalable/actions/events-merge-symbolic.svg
similarity index 100%
rename from icons/events-merge-symbolic.svg
rename to data/icons/hicolor/scalable/actions/events-merge-symbolic.svg
diff --git a/icons/filter-flagged-disabled-symbolic.svg
b/data/icons/hicolor/scalable/actions/filter-flagged-disabled-symbolic.svg
similarity index 100%
rename from icons/filter-flagged-disabled-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-flagged-disabled-symbolic.svg
diff --git a/icons/filter-flagged-symbolic.svg
b/data/icons/hicolor/scalable/actions/filter-flagged-symbolic.svg
similarity index 100%
rename from icons/filter-flagged-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-flagged-symbolic.svg
diff --git a/icons/filter-photos-disabled-symbolic.svg
b/data/icons/hicolor/scalable/actions/filter-photos-disabled-symbolic.svg
similarity index 100%
rename from icons/filter-photos-disabled-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-photos-disabled-symbolic.svg
diff --git a/icons/filter-photos-symbolic.svg b/data/icons/hicolor/scalable/actions/filter-photos-symbolic.svg
similarity index 100%
rename from icons/filter-photos-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-photos-symbolic.svg
diff --git a/icons/filter-raw-disabled-symbolic.svg
b/data/icons/hicolor/scalable/actions/filter-raw-disabled-symbolic.svg
similarity index 100%
rename from icons/filter-raw-disabled-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-raw-disabled-symbolic.svg
diff --git a/icons/filter-raw-symbolic.svg b/data/icons/hicolor/scalable/actions/filter-raw-symbolic.svg
similarity index 100%
rename from icons/filter-raw-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-raw-symbolic.svg
diff --git a/icons/filter-videos-disabled-symbolic.svg
b/data/icons/hicolor/scalable/actions/filter-videos-disabled-symbolic.svg
similarity index 100%
rename from icons/filter-videos-disabled-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-videos-disabled-symbolic.svg
diff --git a/icons/filter-videos-symbolic.svg b/data/icons/hicolor/scalable/actions/filter-videos-symbolic.svg
similarity index 100%
rename from icons/filter-videos-symbolic.svg
rename to data/icons/hicolor/scalable/actions/filter-videos-symbolic.svg
diff --git a/icons/image-adjust-color-symbolic.svg
b/data/icons/hicolor/scalable/actions/image-adjust-color-symbolic.svg
similarity index 100%
rename from icons/image-adjust-color-symbolic.svg
rename to data/icons/hicolor/scalable/actions/image-adjust-color-symbolic.svg
diff --git a/icons/image-auto-adjust-symbolic.svg
b/data/icons/hicolor/scalable/actions/image-auto-adjust-symbolic.svg
similarity index 100%
rename from icons/image-auto-adjust-symbolic.svg
rename to data/icons/hicolor/scalable/actions/image-auto-adjust-symbolic.svg
diff --git a/icons/image-crop-symbolic.svg b/data/icons/hicolor/scalable/actions/image-crop-symbolic.svg
similarity index 100%
rename from icons/image-crop-symbolic.svg
rename to data/icons/hicolor/scalable/actions/image-crop-symbolic.svg
diff --git a/icons/image-zoom-in-symbolic.svg b/data/icons/hicolor/scalable/actions/image-zoom-in-symbolic.svg
similarity index 100%
rename from icons/image-zoom-in-symbolic.svg
rename to data/icons/hicolor/scalable/actions/image-zoom-in-symbolic.svg
diff --git a/icons/image-zoom-out-symbolic.svg
b/data/icons/hicolor/scalable/actions/image-zoom-out-symbolic.svg
similarity index 100%
rename from icons/image-zoom-out-symbolic.svg
rename to data/icons/hicolor/scalable/actions/image-zoom-out-symbolic.svg
diff --git a/icons/multiple-events-symbolic.svg
b/data/icons/hicolor/scalable/actions/multiple-events-symbolic.svg
similarity index 100%
rename from icons/multiple-events-symbolic.svg
rename to data/icons/hicolor/scalable/actions/multiple-events-symbolic.svg
diff --git a/icons/multiple-tags-symbolic.svg b/data/icons/hicolor/scalable/actions/multiple-tags-symbolic.svg
similarity index 100%
rename from icons/multiple-tags-symbolic.svg
rename to data/icons/hicolor/scalable/actions/multiple-tags-symbolic.svg
diff --git a/icons/no-event-symbolic.svg b/data/icons/hicolor/scalable/actions/no-event-symbolic.svg
similarity index 100%
rename from icons/no-event-symbolic.svg
rename to data/icons/hicolor/scalable/actions/no-event-symbolic.svg
diff --git a/icons/one-event-symbolic.svg b/data/icons/hicolor/scalable/actions/one-event-symbolic.svg
similarity index 100%
rename from icons/one-event-symbolic.svg
rename to data/icons/hicolor/scalable/actions/one-event-symbolic.svg
diff --git a/icons/one-tag-symbolic.svg b/data/icons/hicolor/scalable/actions/one-tag-symbolic.svg
similarity index 100%
rename from icons/one-tag-symbolic.svg
rename to data/icons/hicolor/scalable/actions/one-tag-symbolic.svg
diff --git a/icons/stock-eye-symbolic.svg b/data/icons/hicolor/scalable/actions/stock-eye-symbolic.svg
similarity index 100%
rename from icons/stock-eye-symbolic.svg
rename to data/icons/hicolor/scalable/actions/stock-eye-symbolic.svg
diff --git a/icons/straighten-symbolic.svg b/data/icons/hicolor/scalable/actions/straighten-symbolic.svg
similarity index 100%
rename from icons/straighten-symbolic.svg
rename to data/icons/hicolor/scalable/actions/straighten-symbolic.svg
diff --git a/icons/shotwell.svg b/data/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg
similarity index 100%
rename from icons/shotwell.svg
rename to data/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg
diff --git a/app-icons/shotwell-source.svg b/data/icons/hicolor/shotwell-source.svg
similarity index 100%
rename from app-icons/shotwell-source.svg
rename to data/icons/hicolor/shotwell-source.svg
diff --git a/app-icons/symbolic/apps/shotwell-symbolic.svg
b/data/icons/hicolor/symbolic/apps/org.gnome.Shotwell-symbolic.svg
similarity index 99%
rename from app-icons/symbolic/apps/shotwell-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/org.gnome.Shotwell-symbolic.svg
index 52c4e1da..917582db 100644
--- a/app-icons/symbolic/apps/shotwell-symbolic.svg
+++ b/data/icons/hicolor/symbolic/apps/org.gnome.Shotwell-symbolic.svg
@@ -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>
diff --git a/icons/image-missing.png b/data/icons/image-missing.png
similarity index 100%
rename from icons/image-missing.png
rename to data/icons/image-missing.png
diff --git a/data/icons/meson.build b/data/icons/meson.build
new file mode 100644
index 00000000..1b1006f5
--- /dev/null
+++ b/data/icons/meson.build
@@ -0,0 +1,9 @@
+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)
diff --git a/icons/noninterpretable-video.png b/data/icons/noninterpretable-video.png
similarity index 100%
rename from icons/noninterpretable-video.png
rename to data/icons/noninterpretable-video.png
diff --git a/icons/shotwell-street.jpg b/data/icons/shotwell-street.jpg
similarity index 100%
rename from icons/shotwell-street.jpg
rename to data/icons/shotwell-street.jpg
diff --git a/icons/slideshow-extension-point.png b/data/icons/slideshow-extension-point.png
similarity index 100%
rename from icons/slideshow-extension-point.png
rename to data/icons/slideshow-extension-point.png
diff --git a/misc/meson.build b/data/meson.build
similarity index 50%
rename from misc/meson.build
rename to data/meson.build
index 664ddb05..fd808e98 100644
--- a/misc/meson.build
+++ b/data/meson.build
@@ -1,28 +1,32 @@
+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')
diff --git a/misc/shotwell-viewer.desktop.in b/data/org.gnome.Shotwell-Viewer.desktop.in
similarity index 97%
rename from misc/shotwell-viewer.desktop.in
rename to data/org.gnome.Shotwell-Viewer.desktop.in
index b5e41f3b..5444ac60 100644
--- a/misc/shotwell-viewer.desktop.in
+++ b/data/org.gnome.Shotwell-Viewer.desktop.in
@@ -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
diff --git a/misc/shotwell.appdata.xml.in b/data/org.gnome.Shotwell.appdata.xml.in
similarity index 100%
rename from misc/shotwell.appdata.xml.in
rename to data/org.gnome.Shotwell.appdata.xml.in
diff --git a/misc/shotwell.desktop.in b/data/org.gnome.Shotwell.desktop.in
similarity index 96%
rename from misc/shotwell.desktop.in
rename to data/org.gnome.Shotwell.desktop.in
index aa1ede22..9d4f503d 100644
--- a/misc/shotwell.desktop.in
+++ b/data/org.gnome.Shotwell.desktop.in
@@ -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;
diff --git a/org.gnome.Shotwell.gresource.xml b/data/org.gnome.Shotwell.gresource.xml
similarity index 55%
rename from org.gnome.Shotwell.gresource.xml
rename to data/org.gnome.Shotwell.gresource.xml
index 237a5e3f..946e7db9 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/data/org.gnome.Shotwell.gresource.xml
@@ -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>
<file>icons/noninterpretable-video.png</file>
- <file>icons/one-event-symbolic.svg</file>
- <file>icons/one-tag-symbolic.svg</file>
- <file>icons/stock-eye-symbolic.svg</file>
- <file preprocess="xml-stripblanks">icons/shotwell.svg</file>
+ <file>icons/hicolor/scalable/actions/one-event-symbolic.svg</file>
+ <file>icons/hicolor/scalable/actions/one-tag-symbolic.svg</file>
+ <file>icons/hicolor/scalable/actions/stock-eye-symbolic.svg</file>
+ <file preprocess="xml-stripblanks">icons/hicolor/scalable/apps/org.gnome.Shotwell.svg</file>
<file>icons/shotwell-street.jpg</file>
<file>icons/slideshow-extension-point.png</file>
- <file>icons/straighten-symbolic.svg</file>
- <file>misc/org.gnome.Shotwell.css</file>
+ <file>icons/hicolor/scalable/actions/straighten-symbolic.svg</file>
+ <file>themes/org.gnome.Shotwell.css</file>
</gresource>
</gresources>
diff --git a/misc/org.gnome.Shotwell.css b/data/themes/org.gnome.Shotwell.css
similarity index 100%
rename from misc/org.gnome.Shotwell.css
rename to data/themes/org.gnome.Shotwell.css
diff --git a/ui/collection.ui b/data/ui/collection.ui
similarity index 100%
rename from ui/collection.ui
rename to data/ui/collection.ui
diff --git a/ui/direct.ui b/data/ui/direct.ui
similarity index 100%
rename from ui/direct.ui
rename to data/ui/direct.ui
diff --git a/ui/direct_context.ui b/data/ui/direct_context.ui
similarity index 100%
rename from ui/direct_context.ui
rename to data/ui/direct_context.ui
diff --git a/ui/event.ui b/data/ui/event.ui
similarity index 100%
rename from ui/event.ui
rename to data/ui/event.ui
diff --git a/ui/events_directory.ui b/data/ui/events_directory.ui
similarity index 100%
rename from ui/events_directory.ui
rename to data/ui/events_directory.ui
diff --git a/ui/faces.ui b/data/ui/faces.ui
similarity index 100%
rename from ui/faces.ui
rename to data/ui/faces.ui
diff --git a/ui/fullscreen.ui b/data/ui/fullscreen.ui
similarity index 94%
rename from ui/fullscreen.ui
rename to data/ui/fullscreen.ui
index 6112a52c..8aade552 100644
--- a/ui/fullscreen.ui
+++ b/data/ui/fullscreen.ui
@@ -1,6 +1,5 @@
<ui>
-
+
<accelerator name="LeaveFullscreen" action="LeaveFullscreen" />
</ui>
-
diff --git a/ui/import.ui b/data/ui/import.ui
similarity index 100%
rename from ui/import.ui
rename to data/ui/import.ui
diff --git a/ui/import_queue.ui b/data/ui/import_queue.ui
similarity index 100%
rename from ui/import_queue.ui
rename to data/ui/import_queue.ui
diff --git a/ui/manifest_widget.ui b/data/ui/manifest_widget.ui
similarity index 100%
rename from ui/manifest_widget.ui
rename to data/ui/manifest_widget.ui
diff --git a/ui/media.ui b/data/ui/media.ui
similarity index 100%
rename from ui/media.ui
rename to data/ui/media.ui
diff --git a/ui/multitextentrydialog.ui b/data/ui/multitextentrydialog.ui
similarity index 100%
rename from ui/multitextentrydialog.ui
rename to data/ui/multitextentrydialog.ui
diff --git a/ui/offline.ui b/data/ui/offline.ui
similarity index 100%
rename from ui/offline.ui
rename to data/ui/offline.ui
diff --git a/ui/photo.ui b/data/ui/photo.ui
similarity index 100%
rename from ui/photo.ui
rename to data/ui/photo.ui
diff --git a/ui/photo_context.ui b/data/ui/photo_context.ui
similarity index 100%
rename from ui/photo_context.ui
rename to data/ui/photo_context.ui
diff --git a/ui/preferences_dialog.ui b/data/ui/preferences_dialog.ui
similarity index 100%
rename from ui/preferences_dialog.ui
rename to data/ui/preferences_dialog.ui
diff --git a/ui/printing_widget.ui b/data/ui/printing_widget.ui
similarity index 100%
rename from ui/printing_widget.ui
rename to data/ui/printing_widget.ui
diff --git a/ui/saved_search_dialog.ui b/data/ui/saved_search_dialog.ui
similarity index 100%
rename from ui/saved_search_dialog.ui
rename to data/ui/saved_search_dialog.ui
diff --git a/ui/savedsearch.ui b/data/ui/savedsearch.ui
similarity index 100%
rename from ui/savedsearch.ui
rename to data/ui/savedsearch.ui
diff --git a/ui/search_bar.ui b/data/ui/search_bar.ui
similarity index 100%
rename from ui/search_bar.ui
rename to data/ui/search_bar.ui
diff --git a/ui/search_sidebar_context.ui b/data/ui/search_sidebar_context.ui
similarity index 100%
rename from ui/search_sidebar_context.ui
rename to data/ui/search_sidebar_context.ui
diff --git a/ui/set_background_dialog.ui b/data/ui/set_background_dialog.ui
similarity index 100%
rename from ui/set_background_dialog.ui
rename to data/ui/set_background_dialog.ui
diff --git a/ui/set_background_slideshow_dialog.ui b/data/ui/set_background_slideshow_dialog.ui
similarity index 100%
rename from ui/set_background_slideshow_dialog.ui
rename to data/ui/set_background_slideshow_dialog.ui
diff --git a/ui/shotwell.ui b/data/ui/shotwell.ui
similarity index 100%
rename from ui/shotwell.ui
rename to data/ui/shotwell.ui
diff --git a/ui/sidebar_default_context.ui b/data/ui/sidebar_default_context.ui
similarity index 99%
rename from ui/sidebar_default_context.ui
rename to data/ui/sidebar_default_context.ui
index bd3d63a2..1bb0b331 100644
--- a/ui/sidebar_default_context.ui
+++ b/data/ui/sidebar_default_context.ui
@@ -14,4 +14,3 @@
</section>
</menu>
</interface>
-
diff --git a/ui/slideshow_settings.ui b/data/ui/slideshow_settings.ui
similarity index 100%
rename from ui/slideshow_settings.ui
rename to data/ui/slideshow_settings.ui
diff --git a/ui/tag_sidebar_context.ui b/data/ui/tag_sidebar_context.ui
similarity index 100%
rename from ui/tag_sidebar_context.ui
rename to data/ui/tag_sidebar_context.ui
diff --git a/ui/tags.ui b/data/ui/tags.ui
similarity index 100%
rename from ui/tags.ui
rename to data/ui/tags.ui
diff --git a/ui/textentrydialog.ui b/data/ui/textentrydialog.ui
similarity index 100%
rename from ui/textentrydialog.ui
rename to data/ui/textentrydialog.ui
diff --git a/ui/trash.ui b/data/ui/trash.ui
similarity index 100%
rename from ui/trash.ui
rename to data/ui/trash.ui
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 2470f7f6..5949b3a2 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -4,9 +4,6 @@
"runtime-version": "3.28",
"sdk": "org.gnome.Sdk",
"command" : "shotwell",
- "rename-desktop-file" : "shotwell.desktop",
- "rename-icon" : "shotwell",
- "rename-appdata-file" : "shotwell.appdata.xml",
"tags": [ "nightly" ],
"desktop-file-name-prefix": "(Nightly) ",
"finish-args": [
diff --git a/meson.build b/meson.build
index c466a34a..13fd17f9 100644
--- a/meson.build
+++ b/meson.build
@@ -100,19 +100,10 @@ cairo = dependency('cairo')
valac = meson.get_compiler('vala')
posix = valac.find_library('posix')
-shotwell_resources = gnome.compile_resources('shotwell-resources',
- 'org.gnome.Shotwell.gresource.xml')
-
+subdir('data')
subdir('src')
subdir('plugins')
subdir('po')
subdir('help')
-subdir('misc')
subdir('thumbnailer')
-subdir('settings-migrator')
subdir('test')
-subdir('app-icons')
-
-if get_option('install-apport-hook')
- subdir('apport')
-endif
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index b746ebbd..56e4383b 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -413,7 +413,7 @@ public abstract class AppWindow : PageWindow {
instance = this;
title = Resources.APP_TITLE;
- set_default_icon_name("shotwell");
+ set_default_icon_name("org.gnome.Shotwell");
// restore previous size and maximization state
if (this is LibraryWindow) {
@@ -441,8 +441,11 @@ public abstract class AppWindow : PageWindow {
add_actions ();
Gtk.CssProvider provider = new Gtk.CssProvider();
- provider.load_from_resource("/org/gnome/Shotwell/misc/org.gnome.Shotwell.css");
+ provider.load_from_resource("/org/gnome/Shotwell/themes/org.gnome.Shotwell.css");
Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+ var foo = Gtk.IconTheme.get_default();
+ foo.add_resource_path("/org/gnome/Shotwell/icons/hicolor");
}
private const GLib.ActionEntry[] common_actions = {
diff --git a/src/main.vala b/src/main.vala
index 8313ba18..8ae41fc0 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -109,7 +109,7 @@ void library_exec(string[] mounts) {
progress_dialog.update_display_every(100);
progress_dialog.set_minimum_on_screen_time_msec(250);
try {
- progress_dialog.icon = new
Gdk.Pixbuf.from_resource("/org/gnome/Shotwell/icons/shotwell.svg");
+ progress_dialog.icon = new
Gdk.Pixbuf.from_resource("/org/gnome/Shotwell/icons/hicolor/scalable/org.gnome.Shotwell.svg");
} catch (Error err) {
debug("Warning - could not load application icon for loading window: %s", err.message);
}
@@ -365,7 +365,7 @@ void main(string[] args) {
// muck with the user's XDG_... directories, which is seriously frowned upon
if (AppDirs.get_install_dir() == null) {
GLib.Environment.set_variable("GSETTINGS_SCHEMA_DIR", AppDirs.get_lib_dir().get_path() +
- "/misc", true);
+ "/data/gsettings", true);
}
// init GTK (valac has already called g_threads_init())
diff --git a/src/meson.build b/src/meson.build
index c452a986..ed0280de 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -246,7 +246,7 @@ executable('shotwell',
'--pkg', 'libexif',
'--pkg', 'misc',
'--gresources',
- join_paths(meson.source_root(),
+ join_paths(meson.source_root(), 'data',
'org.gnome.Shotwell.gresource.xml')
],
link_with: [sw_graphics_processor],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
