From 5e9f4eea451a77ba3b93db3747841ed2bd969e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 14:09:20 +0200 Subject: New upstream version 0.30.1 --- ui/Makefile.am | 32 --- ui/Makefile.in | 543 ----------------------------------------------- ui/collection.ui | 8 +- ui/faces.ui | 474 +++++++++++++++++++++++++++++++++++++++++ ui/offline.ui | 2 +- ui/preferences_dialog.ui | 97 +++------ ui/slideshow_settings.ui | 11 +- ui/trash.ui | 2 +- 8 files changed, 514 insertions(+), 655 deletions(-) delete mode 100644 ui/Makefile.am delete mode 100644 ui/Makefile.in create mode 100644 ui/faces.ui (limited to 'ui') diff --git a/ui/Makefile.am b/ui/Makefile.am deleted file mode 100644 index fe6cf12..0000000 --- a/ui/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -dist_noinst_DATA = \ - collection.ui \ - direct_context.ui \ - direct.ui \ - events_directory.ui \ - event.ui \ - fullscreen.ui \ - import_queue.ui \ - import.ui \ - manifest_widget.ui \ - media.ui \ - multitextentrydialog.ui \ - offline.ui \ - photo_context.ui \ - photo.ui \ - preferences_dialog.ui \ - printing_widget.ui \ - saved_search_dialog.ui \ - savedsearch.ui \ - search_bar.ui \ - search_sidebar_context.ui \ - set_background_dialog.ui \ - set_background_slideshow_dialog.ui \ - shotwell.ui \ - sidebar_default_context.ui \ - slideshow_settings.ui \ - tag_sidebar_context.ui \ - tags.ui \ - textentrydialog.ui \ - trash.ui - --include $(top_srcdir)/git.mk diff --git a/ui/Makefile.in b/ui/Makefile.in deleted file mode 100644 index ba09125..0000000 --- a/ui/Makefile.in +++ /dev/null @@ -1,543 +0,0 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2017 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ - false; \ - elif test -n '$(MAKE_HOST)'; then \ - true; \ - elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ - true; \ - else \ - false; \ - fi; \ -} -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = ui -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ - $(top_srcdir)/m4/ax_generate_changelog.m4 \ - $(top_srcdir)/m4/ax_is_release.m4 \ - $(top_srcdir)/m4/ax_require_defined.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ - $(am__DIST_COMMON) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DATA = $(dist_noinst_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -API_VERSION = @API_VERSION@ -APPSTREAM_UTIL = @APPSTREAM_UTIL@ -AR = @AR@ -AUTHENTICATOR_CFLAGS = @AUTHENTICATOR_CFLAGS@ -AUTHENTICATOR_LIBS = @AUTHENTICATOR_LIBS@ -AUTHENTICATOR_PACKAGES = @AUTHENTICATOR_PACKAGES@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIT = @GIT@ -GITVER = @GITVER@ -GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -HAVE_EXTRA_PLUGINS = @HAVE_EXTRA_PLUGINS@ -HAVE_UNITY = @HAVE_UNITY@ -HELP_DIR = @HELP_DIR@ -IMPORT_CFLAGS = @IMPORT_CFLAGS@ -IMPORT_LIBS = @IMPORT_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -ITSTOOL = @ITSTOOL@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -MAINT = @MAINT@ -MAJOR_VERSION = @MAJOR_VERSION@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MICRO_VERSION = @MICRO_VERSION@ -MINOR_VERSION = @MINOR_VERSION@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ -PLUGIN_LIBS = @PLUGIN_LIBS@ -POSUB = @POSUB@ -PUBLISHER_VALAFLAGS = @PUBLISHER_VALAFLAGS@ -PUBLISHING_CFLAGS = @PUBLISHING_CFLAGS@ -PUBLISHING_LIBS = @PUBLISHING_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SHOTWELL_CFLAGS = @SHOTWELL_CFLAGS@ -SHOTWELL_LIBS = @SHOTWELL_LIBS@ -STRIP = @STRIP@ -THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ -THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ -TRANSITIONS_CFLAGS = @TRANSITIONS_CFLAGS@ -TRANSITIONS_LIBS = @TRANSITIONS_LIBS@ -UNITY_CFLAGS = @UNITY_CFLAGS@ -UNITY_LIBS = @UNITY_LIBS@ -UNITY_VALAFLAGS = @UNITY_VALAFLAGS@ -USE_NLS = @USE_NLS@ -VALAC = @VALAC@ -VALAFLAGS = @VALAFLAGS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -XMLLINT = @XMLLINT@ -YELP_LC_DIST = @YELP_LC_DIST@ -YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appstreamxmldir = @appstreamxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -runstatedir = @runstatedir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -dist_noinst_DATA = \ - collection.ui \ - direct_context.ui \ - direct.ui \ - events_directory.ui \ - event.ui \ - fullscreen.ui \ - import_queue.ui \ - import.ui \ - manifest_widget.ui \ - media.ui \ - multitextentrydialog.ui \ - offline.ui \ - photo_context.ui \ - photo.ui \ - preferences_dialog.ui \ - printing_widget.ui \ - saved_search_dialog.ui \ - savedsearch.ui \ - search_bar.ui \ - search_sidebar_context.ui \ - set_background_dialog.ui \ - set_background_slideshow_dialog.ui \ - shotwell.ui \ - sidebar_default_context.ui \ - slideshow_settings.ui \ - tag_sidebar_context.ui \ - tags.ui \ - textentrydialog.ui \ - trash.ui - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ui/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign ui/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am - -.PRECIOUS: Makefile - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/ui/collection.ui b/ui/collection.ui index 212d5b9..c12c407 100644 --- a/ui/collection.ui +++ b/ui/collection.ui @@ -150,7 +150,7 @@ win.RotateClockwise Rotate True - object-rotate-right + object-rotate-right-symbolic False @@ -166,7 +166,7 @@ win.Enhance Enhance True - shotwell-auto-enhance + image-auto-adjust-symbolic False @@ -191,7 +191,7 @@ win.Publish Publish True - applications-internet + send-to-symbolic False @@ -216,7 +216,7 @@ win.CommonDisplaySearchbar Find True - edit-find + edit-find-symbolic False diff --git a/ui/faces.ui b/ui/faces.ui new file mode 100644 index 0000000..bcf7236 --- /dev/null +++ b/ui/faces.ui @@ -0,0 +1,474 @@ + + + + + _File +
+ + _Import From Folder… + <Primary>i + win.CommonFileImport + + + Import From _Application… + win.ExternalLibraryImport + + + _Export… + <Primary><Shift>e + win.Export + +
+
+ FileExtrasPlaceholder +
+
+ + Show in File Mana_ger + <Primary><Shift>m + win.CommonJumpToFile + +
+
+ + Empty T_rash + win.CommonEmptyTrash + +
+
+ + _Quit + <Primary>q + win.CommonQuit + +
+ + + _Edit +
+ + _Undo + <Primary>z + win.CommonUndo + + + _Redo + <Primary><Shift>z + win.CommonRedo + +
+
+ + _Find + win.CommonFind + + + Ne_w Saved Search… + <Primary>s + win.CommonNewSearch + +
+
+ EditExtrasPlaceholder + + R_emove From Library + <Shift>Delete + win.RemoveFromLibrary + + + _Move to Trash + Delete + win.MoveToTrash + +
+
+ + Select _All + <Primary>a + win.CommonSelectAll + +
+
+ + _Preferences + win.CommonPreferences + +
+ + + _View +
+ + _Basic Information + <Primary><Shift>i + win.CommonDisplayBasicProperties + + + E_xtended Information + <Primary><Shift>x + win.CommonDisplayExtendedProperties + + + _Search Bar + F8 + win.CommonDisplaySearchbar + + + S_idebar + F9 + win.CommonDisplaySidebar + + + T_oolbar + <Primary>F9 + win.CommonDisplayToolbar + +
+
+ + _Titles + <Primary><Shift>t + win.ViewTitle + + + _Comments + <Primary><Shift>c + win.ViewComment + + + Ta_gs + <Primary><Shift>g + win.ViewTags + + + _Ratings + <Primary><Shift>n + win.ViewRatings + +
+
+ + _Filter Photos +
+ + ★★★★★ + win.display.rating + 7 + <Primary>5 + + + ★★★★ + win.display.rating + 6 + <Primary>4 + + + ★★★ + win.display.rating + 5 + <Primary>3 + + + ★★ + win.display.rating + 4 + <Primary>2 + + + ★ + win.display.rating + 3 + <Primary>1 + + + _All Photos + win.display.rating + 2 + <Primary>0 + + + All + _Rejected + win.display.rating + 1 + <Primary>9 + + + Rejected _Only + win.display.rating + 8 + <Primary>8 + +
+ +
+
+ + Sort _Photos +
+ + By _Title + win.SortBy + 1 + + + By _Filename + win.SortBy + 4 + + + By Exposure _Date + win.SortBy + 2 + + + By _Rating + win.SortBy + 3 + +
+
+ + _Ascending + win.Sort + ascending + + + D_escending + win.Sort + descending + +
+ + + Sort _Events +
+ + _Ascending + win.CommonSortEvents + ascending + + + _Descending + win.CommonSortEvents + descending + +
+ +
+
+ + Zoom _In + <Primary>plus + win.IncreaseSize + + + Zoom _Out + <Primary>minus + win.DecreaseSize + +
+
+ ViewExtrasFullscreenSlideshowPlaceholder +
+ + + _Photos +
+ PhotosExtrasEditsPlaceholder +
+
+ + Toggle _Flag + <Primary>g + win.Flag + + + _Set Rating +
+ + ★★★★★ + 5 + win.RateFive + + + ★★★★ + 4 + win.RateFour + + + ★★★ + 3 + win.RateThree + + + ★★ + 2 + win.RateTwo + + + ★ + 1 + win.RateOne + + + _Unrated + 0 + win.RateUnrated + + + _Rejected + 9 + win.RateRejected + +
+
+ + _Increase + greater + win.IncreaseRating + + + _Decrease + less + win.DecreaseRating + +
+ +
+
+ + Edit _Title… + win.EditTitle + F2 + + + Edit _Comment… + win.EditComment + F3 + + PhotosExtrasDateTimePlaceholder +
+
+ + _Developer +
+ + Shotwell + win.RawDeveloper + Shotwell + + + Camera + win.RawDeveloper + Camera + +
+ +
+
+ PhotosExtrasExternalsPlaceholder +
+ + + Even_ts +
+ + _New Event + <Primary>n + win.NewEvent + + + View Eve_nt for Photo + win.CommonJumpToEvent + +
+ + + Ta_gs +
+ + Add _Tags… + <Primary>t + win.AddTags + + + Modif_y Tags… + <Primary>m + win.ModifyTags + +
+ + + + Faces +
+ FacesMenuPlaceholder + +
+ + + _Help +
+ + _Help + F1 + win.CommonHelpContents + + + _Frequently Asked Questions + win.CommonHelpFAQ + + + _Report a Problem… + win.CommonHelpReportProblem + +
+
+ + _About + win.CommonAbout + +
+ + + +
+ + ContextRemoveFaceFromPhotos + win.RemoveFaceFromPhotos + +
+ + +
+ + Rename… + win.RenameFaceSidebar + + + Delete + win.DeleteFaceSidebar + +
+ + diff --git a/ui/offline.ui b/ui/offline.ui index f419315..3daefca 100644 --- a/ui/offline.ui +++ b/ui/offline.ui @@ -238,7 +238,7 @@ win.CommonDisplaySearchbar Find True - edit-find + edit-find-symbolic False diff --git a/ui/preferences_dialog.ui b/ui/preferences_dialog.ui index 60df1c2..f020c97 100644 --- a/ui/preferences_dialog.ui +++ b/ui/preferences_dialog.ui @@ -2,12 +2,6 @@ - - 65535 - 1000 - 1000 - 1000 -