[shotwell/wip/phako/enhanced-faces: 95/136] Merge branch 'master' of https://gitlab.gnome.org/GNOME/shotwell into wip/faces
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/phako/enhanced-faces: 95/136] Merge branch 'master' of https://gitlab.gnome.org/GNOME/shotwell into wip/faces
- Date: Thu, 11 Oct 2018 09:57:01 +0000 (UTC)
commit 1f0c3b146cd50f431cb7e862d7f6fa95d0c2dbe7
Merge: de4bc694 39c58752
Author: NarendraMA <narendra_m_a yahoo com>
Date: Sat Sep 15 11:31:44 2018 +0530
Merge branch 'master' of https://gitlab.gnome.org/GNOME/shotwell into wip/faces
NEWS | 15 +
data/appdata/edit.png | Bin 0 -> 759405 bytes
data/appdata/harbor.png | Bin 0 -> 915595 bytes
data/appdata/import.png | Bin 0 -> 938932 bytes
data/appdata/organize.png | Bin 0 -> 737779 bytes
data/appdata/publish.png | Bin 0 -> 557536 bytes
{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 +-
.../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 | 12 +-
.../org.gnome.Shotwell.desktop.in | 2 +-
.../org.gnome.Shotwell.gresource.xml | 51 +-
{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 | 100 +-
{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 | 2 +-
{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 | 9 +-
help/fr/fr.po | 2 +-
help/sv/sv.po | 232 +-
icons/about-braunschweig.jpg | Bin 17968 -> 0 bytes
meson.build | 17 +-
misc/shotwell.convert | 105 -
plugins/common/RESTSupport.vala | 3 +
plugins/shotwell-publishing/PiwigoPublishing.vala | 3 +
po/POTFILES.in | 77 +-
po/POTFILES.skip | 1 +
po/cs.po | 8977 +++++++++----------
po/de.po | 9151 ++++++++++----------
po/hr.po | 1403 +--
po/hu.po | 1413 +--
po/id.po | 2042 +++--
po/lv.po | 1473 ++--
po/pt_BR.po | 8943 +++++++++----------
po/sv.po | 8914 +++++++++----------
po/zh_TW.po | 237 +-
settings-migrator/meson.build | 3 -
settings-migrator/shotwell-settings-migrator | 33 -
shotwell-plugin-dev-1.0.m4 | 11 -
src/AppWindow.vala | 19 +-
src/International.vala | 2 +-
src/Photo.vala | 6 +-
src/PhotoPage.vala | 2 +-
src/Printing.vala | 4 +-
src/Properties.vala | 5 +-
src/Resources.vala | 13 +-
src/ThumbnailCache.vala | 2 +-
src/config/GSettingsEngine.vala | 31 +-
src/editing_tools/EditingTools.vala | 27 +-
src/faces/FaceShape.vala | 9 +-
src/faces/FacesTool.vala | 6 +-
src/main.vala | 4 +-
src/meson.build | 6 +-
src/photos/PhotoFileFormat.vala | 18 +-
src/photos/WebPSupport.vala | 240 +
src/searches/SavedSearchDialog.vala | 29 +-
src/util/system.vala | 26 +-
src/util/ui.vala | 9 +-
test/NaturalCollate-Test.vala | 12 +-
test/NaturalCollate.vala | 1 +
test/meson.build | 5 +
vapi/libwebp.vapi | 5 +
vapi/libwebpdemux.vapi | 43 +
132 files changed, 22637 insertions(+), 21301 deletions(-)
---
diff --cc src/faces/FaceShape.vala
index 34e13b56,089c051a..88639534
--- a/src/faces/FaceShape.vala
+++ b/src/faces/FaceShape.vala
@@@ -41,8 -39,7 +41,8 @@@ public abstract class FaceShape : Objec
face_window.show_all();
face_window.hide();
- this.canvas.get_drawing_window().set_cursor(new Gdk.Cursor(current_cursor_type));
+ this.face_vec = vec;
+ this.canvas.set_cursor(current_cursor_type);
}
~FaceShape() {
diff --cc src/meson.build
index ce0788f0,4f501b42..12d96b90
--- a/src/meson.build
+++ b/src/meson.build
@@@ -252,8 -247,8 +256,8 @@@ 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],
+ link_with: shotwell_libs,
install : true)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
